RYA-151 Fixed POMs.

Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/55df2fd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/55df2fd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/55df2fd8

Branch: refs/heads/master
Commit: 55df2fd8411820dc1d82e6db3ae72bced31ff406
Parents: 3e17a25
Author: Kevin Chilton <[email protected]>
Authored: Wed Sep 14 15:58:57 2016 -0400
Committer: pujav65 <[email protected]>
Committed: Tue Sep 27 11:05:08 2016 -0400

----------------------------------------------------------------------
 extras/rya.benchmark/pom.xml | 39 ++++-----------------------------------
 pom.xml                      | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/55df2fd8/extras/rya.benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.benchmark/pom.xml b/extras/rya.benchmark/pom.xml
index 5b9eb68..f63be52 100644
--- a/extras/rya.benchmark/pom.xml
+++ b/extras/rya.benchmark/pom.xml
@@ -39,24 +39,23 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
             <scope>provided</scope>
         </dependency>
         
+        <!-- Rya -->
         <dependency>
             <groupId>org.apache.rya</groupId>
             <artifactId>rya.indexing</artifactId>
         </dependency>
         
+        <!-- Utils -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
-            <version>3.0.1</version>
         </dependency>
         
         <dependency>
@@ -64,6 +63,7 @@
             <artifactId>guava</artifactId>
         </dependency>
         
+        <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -73,31 +73,10 @@
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-minicluster</artifactId>
-            <version>${accumulo.version}</version>
             <scope>test</scope>
         </dependency>
-        
     </dependencies>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-        <!--
-            JMH version to use with this project.
-          -->
-        <jmh.version>1.13</jmh.version>
-
-        <!--
-            Java source/target to use for compilation.
-          -->
-        <javac.target>1.8</javac.target>
-
-        <!--
-            Name of the benchmark Uber-JAR to generate.
-          -->
-        <uberjar.name>benchmarks</uberjar.name>
-    </properties>
-
     <build>
         <resources>
             <resource>
@@ -107,16 +86,6 @@
     
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <compilerVersion>${javac.target}</compilerVersion>
-                    <source>${javac.target}</source>
-                    <target>${javac.target}</target>
-                </configuration>
-            </plugin>
-            
-            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
                 <executions>
@@ -167,7 +136,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>${uberjar.name}</finalName>
+                            <finalName>benchmarks</finalName>
                             <transformers>
                                 <transformer 
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.openjdk.jmh.Main</mainClass>

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/55df2fd8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 26781eb..d5a34f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,9 @@ under the License.
         <maven.min-version>3.0.4</maven.min-version>
         
         <fluo.version>1.0.0-beta-2</fluo.version>
+        
+        <jmh.version>1.13</jmh.version>
+        <jsr305.version>3.0.1</jsr305.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -553,6 +556,32 @@ under the License.
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
+            
+            <!-- JMH Benchmarking tool dependencies. -->
+            <dependency>
+                <groupId>org.openjdk.jmh</groupId>
+                <artifactId>jmh-core</artifactId>
+                <version>${jmh.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openjdk.jmh</groupId>
+                <artifactId>jmh-generator-annprocess</artifactId>
+                <version>${jmh.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>${jsr305.version}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.accumulo</groupId>
+                <artifactId>accumulo-minicluster</artifactId>
+                <version>${accumulo.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

Reply via email to