merge from hotfix

bsorrentino · Apr 11, 2017 · a8d17f6 · a8d17f6
1 parent d5b95a9
commit a8d17f6
Showing 1 changed file with 24 additions and 28 deletions.
diff --git a/test/pom.xml b/test/pom.xml
@@ -4,19 +4,15 @@
 
   <groupId>org.bsc.maven</groupId>
   <artifactId>maven-processor-plugin-test</artifactId>
-<<<<<<< HEAD
   <version>3.3.2-SNAPSHOT</version>
-=======
-  <version>3.3.1</version>
->>>>>>> hotfix/test_version
   <packaging>jar</packaging>
   <name>MAVEN PROCESSOR PLUGIN TEST- ${project.version}</name>
   <description></description>
 
   <properties>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
-    <!--  
+    <!--
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     -->
   </properties>
@@ -31,12 +27,12 @@
     </dependency>
 
   </dependencies>
-  
+
   <inceptionYear>2012</inceptionYear>
 
-  
+
 <build>
-    
+
 <pluginManagement>
     <plugins>
         <plugin>
@@ -50,11 +46,11 @@
            <version>1.1</version>
         </plugin>
     </plugins>
-        
-</pluginManagement>    
+
+</pluginManagement>
 <plugins>
-    
-<!-- 
+
+<!--
 ===================================================================
 PROCESSOR PLUGIN
 ===================================================================
@@ -68,9 +64,9 @@ PROCESSOR PLUGIN
             <dependency>
                 <groupId>org.bsc</groupId>
                 <artifactId>jaxrs-wiki-processor</artifactId>
-                <version>2.2</version> 
+                <version>2.2</version>
             </dependency>
-            
+
         </dependencies>
         <executions>
 
@@ -83,12 +79,12 @@ PROCESSOR PLUGIN
                 <phase>process-test-classes</phase>
                 <configuration>
                     <outputDirectory>${basedir}/src/site</outputDirectory>
-                        
-                    <additionalSourceDirectories>                         
+
+                    <additionalSourceDirectories>
                         <item>${user.home}/src</item>
-                        <item>./src/main/java</item>                          
-                    </additionalSourceDirectories>    
-                        
+                        <item>./src/main/java</item>
+                    </additionalSourceDirectories>
+
                     <failOnError>false</failOnError>
                     <processors>
                         <processor>org.bsc.maven.plugin.processor.test.TESTWikiProcessor</processor>
@@ -99,10 +95,10 @@ PROCESSOR PLUGIN
                         <test>true</test>
                     </options>
                 </configuration>
-                
+
 
             </execution>
-                    
+
             <execution>
 
                 <id>process</id>
@@ -114,11 +110,11 @@ PROCESSOR PLUGIN
                     <outputDirectory>${basedir}/src/site</outputDirectory>
 
                     <additionalSourceDirectories>
-                        <item>${basedir}/src/main/java</item> 
-                        <!--                           
+                        <item>${basedir}/src/main/java</item>
+                        <!--
                         <item>${user.home}/src</item>
                         -->
-                    </additionalSourceDirectories>    
+                    </additionalSourceDirectories>
 
                     <failOnError>false</failOnError>
                     <processors>
@@ -168,10 +164,10 @@ PROCESSOR PLUGIN
             </execution>
 
         </executions>
-    </plugin>    
-</plugins>    
-    
-</build>  
+    </plugin>
+</plugins>
+
+</build>
 
 <profiles>
     <profile>