Use C* driver and Guava version from parent + mvn tidy:pom

hawkular · Jun 15, 2015 · d4cf1a9 · d4cf1a9
1 parent 89a8a5b
commit d4cf1a9
Show file tree

Hide file tree

Showing 18 changed files with 103 additions and 118 deletions.
diff --git a/api/metrics-api-jaxrs/pom.xml b/api/metrics-api-jaxrs/pom.xml
@@ -45,7 +45,6 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
   <dependencies>
 
     <dependency>
@@ -229,4 +228,3 @@
     </profile>
   </profiles>
 </project>
-
diff --git a/clients/common/pom.xml b/clients/common/pom.xml
@@ -27,6 +27,7 @@
     <groupId>org.hawkular.metrics</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
+
   <artifactId>clients-common</artifactId>
 
   <dependencies>
@@ -36,5 +37,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/clients/pom.xml b/clients/pom.xml
@@ -25,6 +25,7 @@
     <groupId>org.hawkular.metrics</groupId>
     <version>0.3.5-SNAPSHOT</version>
   </parent>
+
   <artifactId>clients</artifactId>
   <packaging>pom</packaging>
 
@@ -35,5 +36,4 @@
     <module>common</module>
     <module>ptranslator</module>
   </modules>
-
 </project>
diff --git a/clients/ptranslator/pom.xml b/clients/ptranslator/pom.xml
@@ -304,5 +304,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/containers/cassandra-docker/pom.xml b/containers/cassandra-docker/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
@@ -18,7 +19,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -29,10 +29,15 @@
   </parent>
 
   <artifactId>cassandra-docker</artifactId>
-  <name>Cassandra Docker Image</name>
   <version>0.3.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <name>Cassandra Docker Image</name>
+
+  <properties>
+    <docker.baseimage>jboss/base-jdk:8</docker.baseimage>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.hawkular.metrics</groupId>
@@ -41,10 +46,6 @@
     </dependency>
   </dependencies>
 
-  <properties>
-    <docker.baseimage>jboss/base-jdk:8</docker.baseimage>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
@@ -115,5 +116,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/containers/cassandra-seed-provider/pom.xml b/containers/cassandra-seed-provider/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
@@ -18,7 +19,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -29,9 +29,10 @@
   </parent>
 
   <artifactId>cassandra-seed-provider</artifactId>
-  <name>Cassandra Seed Provider</name>
   <version>0.3.5-SNAPSHOT</version>
 
+  <name>Cassandra Seed Provider</name>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cassandra</groupId>
@@ -43,5 +44,4 @@
   <build>
     <finalName>cassandra-seed-provider</finalName>
   </build>
-
 </project>
diff --git a/containers/container-tests/pom.xml b/containers/container-tests/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
@@ -18,7 +19,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -29,10 +29,15 @@
   </parent>
 
   <artifactId>hawkular-container-tests</artifactId>
-  <name>Hawkular Metrics Container Tests</name>
   <version>0.3.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
+  <name>Hawkular Metrics Container Tests</name>
+
+  <properties>
+    <maven.test.skip>true</maven.test.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>io.fabric8</groupId>
@@ -65,10 +70,6 @@
 
   </dependencies>
 
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
-
   <profiles>
     <profile>
       <id>container-tests</id>
@@ -77,5 +78,4 @@
       </properties>
     </profile>
   </profiles>
-
 </project>
diff --git a/containers/hawkular-metrics-docker/pom.xml b/containers/hawkular-metrics-docker/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
@@ -18,7 +19,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -29,10 +29,15 @@
   </parent>
 
   <artifactId>hawkular-metrics-docker</artifactId>
-  <name>Hawkular Metrics Docker Image</name>
   <version>0.3.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <name>Hawkular Metrics Docker Image</name>
+
+  <properties>
+    <docker.baseimage>jboss/wildfly:8.2.0.Final</docker.baseimage>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.hawkular.metrics</groupId>
@@ -43,10 +48,6 @@
 
   </dependencies>
 
-  <properties>
-    <docker.baseimage>jboss/wildfly:8.2.0.Final</docker.baseimage>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
@@ -117,5 +118,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/containers/kubernetes/pom.xml b/containers/kubernetes/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
@@ -18,7 +19,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -29,9 +29,10 @@
   </parent>
 
   <artifactId>hawkular-metrics-kubernetes-app</artifactId>
-  <name>Hawkular Metrics Kuberenetes Application</name>
   <version>0.3.5-SNAPSHOT</version>
 
+  <name>Hawkular Metrics Kuberenetes Application</name>
+
   <properties>
     <!-- Properties for the fabric8-maven-plugin -->
     <fabric8.generateJson>false</fabric8.generateJson>
@@ -69,5 +70,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
diff --git a/containers/pom.xml b/containers/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
@@ -18,7 +19,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -28,18 +28,10 @@
   </parent>
 
   <artifactId>hawkular-metrics-containers</artifactId>
-  <name>Hawkular Metric Containers</name>
   <version>0.3.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <properties>
-    <cassandra.version>2.1.3</cassandra.version>
-    <fabric8.version>2.0.39</fabric8.version>
-    <docker.user>hawkular</docker.user>
-    <hawkular-metrics.image>${docker.user}/hawkular-metrics:${project.version}</hawkular-metrics.image>
-    <cassandra.build>devel</cassandra.build>
-    <cassandra.image>${docker.user}/cassandra:${cassandra.version}-${cassandra.build}</cassandra.image>
-  </properties>
+  <name>Hawkular Metric Containers</name>
 
   <modules>
     <module>kubernetes</module>
@@ -49,4 +41,12 @@
     <module>container-tests</module>
   </modules>
 
+  <properties>
+    <cassandra.version>2.1.3</cassandra.version>
+    <fabric8.version>2.0.39</fabric8.version>
+    <docker.user>hawkular</docker.user>
+    <hawkular-metrics.image>${docker.user}/hawkular-metrics:${project.version}</hawkular-metrics.image>
+    <cassandra.build>devel</cassandra.build>
+    <cassandra.image>${docker.user}/cassandra:${cassandra.version}-${cassandra.build}</cassandra.image>
+  </properties>
 </project>
diff --git a/core/metrics-core-api/pom.xml b/core/metrics-core-api/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>com.datastax.cassandra</groupId>
       <artifactId>cassandra-driver-core</artifactId>
-      <version>${datastax.driver.version}</version>
     </dependency>
 
     <!-- test -->
@@ -72,5 +71,4 @@
     </dependency>
 
   </dependencies>
-
 </project>
diff --git a/core/metrics-core-impl/pom.xml b/core/metrics-core-impl/pom.xml
@@ -57,7 +57,6 @@
     <dependency>
       <groupId>com.datastax.cassandra</groupId>
       <artifactId>cassandra-driver-core</artifactId>
-      <version>${datastax.driver.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.codahale.metrics</groupId>
@@ -175,7 +174,7 @@
               <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>${google.guava.version}</version>
+                <version>${version.com.google.guava}</version>
               </dependency>
               <dependency>
                 <groupId>org.codehaus.groovy</groupId>
@@ -185,7 +184,7 @@
               <dependency>
                 <groupId>com.datastax.cassandra</groupId>
                 <artifactId>cassandra-driver-core</artifactId>
-                <version>${datastax.driver.version}</version>
+                <version>${version.com.datastax.cassandra}</version>
               </dependency>
             </dependencies>
             <executions>
@@ -210,5 +209,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/load-tests/pom.xml b/load-tests/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
@@ -18,7 +19,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -28,9 +28,10 @@
   </parent>
 
   <artifactId>hawkular-metrics-load-tests</artifactId>
-  <name>Hawkular Metrics Load Tests</name>
   <packaging>pom</packaging>
 
+  <name>Hawkular Metrics Load Tests</name>
+
   <properties>
     <version.io.gatling>2.1.6</version.io.gatling>
   </properties>
@@ -57,5 +58,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>