Merge branch 'dev_propertyplugin'

devonfw · Dec 14, 2016 · 9b8a77b · 9b8a77b
2 parents d511996 + 599bcdf
commit 9b8a77b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/cobigen/cobigen-propertyplugin/pom.xml b/cobigen/cobigen-propertyplugin/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cobigen-propertyplugin</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <name>CobiGen - Property File Plug-In</name>
   <parent>
     <groupId>com.capgemini</groupId>
@@ -22,6 +22,7 @@
       <groupId>com.capgemini</groupId>
       <artifactId>cobigen-core-test</artifactId>
       <version>3.0.0</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/...gen-propertyplugin/src/main/java/com/capgemini/cobigen/propertyplugin/PropertyMerger.java b/...gen-propertyplugin/src/main/java/com/capgemini/cobigen/propertyplugin/PropertyMerger.java
@@ -23,10 +23,7 @@
 
 /**
  * The {@link PropertyMerger} merges two property files. One being provided as the base file and the second
- * being provided as the file contents of the
- *
- * @author mbrunnli (11.03.2013)
- * @uthor sbasnet(06.05.2014)
+ * being provided as the file contents of the patch.
  */
 public class PropertyMerger implements Merger {
 

diff --git a/...propertyplugin/src/test/java/com/capgemini/cobigen/propertyplugin/PropertyMergerTest.java b/...propertyplugin/src/test/java/com/capgemini/cobigen/propertyplugin/PropertyMergerTest.java
@@ -10,10 +10,7 @@
 import junit.framework.TestCase;
 
 /**
- *
- * * Testing of PropertyMerger of its override property
- *
- * @author sbasnet(06.05.2014)
+ * Testing of PropertyMerger of its override property
  */
 public class PropertyMergerTest extends TestCase {