Consolidating pom changes with master.

carrotsearch · Jan 14, 2016 · abadcd4 · abadcd4
1 parent d048be7
commit abadcd4
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 47 deletions.
diff --git a/hppc/pom.xml b/hppc/pom.xml
@@ -20,12 +20,6 @@
   up execution.</description>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc-template-processor</artifactId>
@@ -34,6 +28,12 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.carrotsearch.randomizedtesting</groupId>
       <artifactId>randomizedtesting-runner</artifactId>
@@ -321,40 +321,6 @@
       <plugin>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>junit4-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>junit4-tests</id>
-            <goals>
-              <goal>junit4</goal>
-            </goals>
-            <configuration>
-              <includes>
-                <include>**/*Test.*</include>
-              </includes>
-              <excludes>
-                <exclude>**/*$*</exclude>
-                <exclude>**/Abstract*</exclude>
-              </excludes>
-
-              <parallelism>auto</parallelism>
-              <maxMemory>750m</maxMemory>
-
-              <listeners>
-                <report-text showThrowable="false" showStackTraces="false" showOutput="onError"
-
-                  showStatusOk="false" showStatusError="false" showStatusFailure="false" showStatusIgnored="false"
-
-                  showSuiteSummary="true" />
-                <report-json file="${project.build.directory}/surefire-reports/test-results.html" />
-                <report-ant-xml dir="${project.build.directory}/surefire-reports/" mavenExtensions="true" />
-              </listeners>
-
-              <assertions>
-                <enable package="com.carrotsearch" />
-              </assertions>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
 
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -110,6 +110,7 @@
     <module>hppc</module>
     <module>hppc-template-processor</module>
     <module>hppc-benchmarks</module>
+    <module>hppc-examples</module>
   </modules>
 
   <dependencyManagement>
@@ -136,7 +137,7 @@
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
-        <version>2.1.11</version>
+        <version>${version.randomizedtesting}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -249,6 +250,45 @@
           <groupId>com.carrotsearch.randomizedtesting</groupId>
           <artifactId>junit4-maven-plugin</artifactId>
           <version>${version.randomizedtesting}</version>
+          <executions>
+            <execution>
+              <id>junit4-tests</id>
+              <goals>
+                <goal>junit4</goal>
+              </goals>
+              <configuration>
+                <includes>
+                  <include>**/*Test.*</include>
+                </includes>
+                <excludes>
+                  <exclude>**/*$*</exclude>
+                  <exclude>**/Abstract*</exclude>
+                </excludes>
+
+                <parallelism>auto</parallelism>
+                <maxMemory>750m</maxMemory>
+
+                <listeners>
+                  <report-text 
+                    showThrowable="false" 
+                    showStackTraces="false" 
+                    showOutput="onError"
+                    showStatusOk="false" 
+                    showStatusError="false" 
+                    showStatusFailure="false" 
+                    showStatusIgnored="false"
+                    showSuiteSummary="true" />
+
+                  <report-json file="${project.build.directory}/surefire-reports/test-results.html" />
+                  <report-ant-xml dir="${project.build.directory}/surefire-reports/" mavenExtensions="true" />
+                </listeners>
+
+                <assertions>
+                  <enable package="com.carrotsearch" />
+                </assertions>
+              </configuration>
+            </execution>
+          </executions>          
         </plugin>
 
         <plugin>
@@ -397,12 +437,10 @@
                       </condition>
 
                       <fileset id="id:settings" dir="etc/eclipse/settings" />
-                      <copy todir="hppc-template-processor/.settings">
-                        <fileset refid="id:settings" />
-                      </copy>
-                      <copy todir="hppc/.settings">
-                        <fileset refid="id:settings" />
-                      </copy>
+                      <copy todir="hppc-template-processor/.settings"><fileset refid="id:settings" /></copy>
+                      <copy todir="hppc/.settings">                   <fileset refid="id:settings" /></copy>
+                      <copy todir="hppc-benchmarks/.settings">        <fileset refid="id:settings" /></copy>
+                      <copy todir="hppc-examples/.settings">          <fileset refid="id:settings" /></copy>
 
                       <copy todir=".">
                         <fileset dir="etc/eclipse/configs" />