From e8f02219bb0f06670e1a61a3ebf340f5d78e4f45 Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Wed, 31 Oct 2012 12:58:16 -0700 Subject: [PATCH] Streamlined the Maven POMs, in particular the plugin configurations. The 'mvn versions:display-plugin-updates' report is now warning free, and there are no more Maven warnings reported in Eclipse. --- client/pom.xml | 38 --------------- common/pom.xml | 33 -------------- examples/pom.xml | 61 +++---------------------- examples/rand/pom.xml | 38 --------------- examples/twitter/pom.xml | 38 --------------- index-common/pom.xml | 38 +-------------- indexer/pom.xml | 21 --------- merger/pom.xml | 32 ------------- pom.xml | 99 +++++++++++++++++++++++++++++++--------- realtime/pom.xml | 38 --------------- server/pom.xml | 40 ---------------- 11 files changed, 86 insertions(+), 390 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 4478013e8ab..f5b3ffaef08 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,18 +22,8 @@ 4.0.0 com.metamx.druid druid-client - 0.1.0-SNAPSHOT druid-client druid-client - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - - - - UTF-8 - com.metamx @@ -168,18 +158,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -195,24 +174,7 @@ - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/common/pom.xml b/common/pom.xml index cbf3e74dc3c..801d005fabc 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-common - 0.1.0-SNAPSHOT druid-common druid-common - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - com.metamx @@ -38,7 +32,6 @@ - UTF-8 0.16.0 @@ -145,33 +138,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/examples/pom.xml b/examples/pom.xml index f056936fd2d..631b2e16dff 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,69 +18,22 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 - com.metamx druid-examples pom - 0.1.0-SNAPSHOT druid-examples druid-examples - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - - - UTF-8 - + + com.metamx + druid + 0.1.0-SNAPSHOT + rand twitter - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - - - - - pub-libs - pub-libs-local - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - - repo.codahale.com - http://repo.codahale.com - - - nativelibs4java - http://nativelibs4java.sourceforge.net/maven - - - thirdparty-uploads - JBoss Thirdparty Uploads - https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads - - - - - central-local - Central - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 369396c1a8e..379204d38b7 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -3,18 +3,8 @@ 4.0.0 com.metamx.druid druid-examples-rand - 0.1.0-SNAPSHOT druid-examples-rand druid-examples-rand - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - - - - UTF-8 - com.metamx @@ -159,18 +149,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -186,24 +165,7 @@ - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 2c35a040be7..a0e930229c4 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -3,18 +3,8 @@ 4.0.0 com.metamx.druid druid-examples-twitter - 0.1.0-SNAPSHOT druid-examples-twitter druid-examples-twitter - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - - - - UTF-8 - com.metamx @@ -175,18 +165,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -202,24 +181,7 @@ - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/index-common/pom.xml b/index-common/pom.xml index 9d3066ab1c8..651248848be 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -18,18 +18,13 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-index-common - 0.1.0-SNAPSHOT druid-index-common Druid Indexer - - scm:git:git://github.com/metamx/druid-index-common.git - scm:git:ssh://git@github.com/metamx/druid-index-common.git - http://github.com/metamx/druid-index-common - com.metamx @@ -63,33 +58,4 @@ test - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - - - - - UTF-8 - \ No newline at end of file diff --git a/indexer/pom.xml b/indexer/pom.xml index 1d9dbb0785e..1b45e48d946 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-indexer - 0.1.0-SNAPSHOT druid-indexer Druid Indexer - - scm:git:git://github.com/metamx/druid-indexer.git - scm:git:ssh://git@github.com/metamx/druid-indexer.git - http://github.com/metamx/druid-indexer - com.metamx @@ -78,18 +72,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -112,8 +95,4 @@ - - - UTF-8 - diff --git a/merger/pom.xml b/merger/pom.xml index 016f9f545bc..6b84d6a239a 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-merger - 0.1.0-SNAPSHOT druid-merger druid-merger - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - com.metamx @@ -77,18 +71,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -103,21 +86,6 @@ - - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - diff --git a/pom.xml b/pom.xml index f1ebad70e01..957687dcaee 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx druid @@ -32,6 +33,10 @@ http://www.github.com/metamx/druid + + 2.2.1 + + UTF-8 @@ -48,27 +53,77 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - + + + + maven-clean-plugin + 2.5 + + + maven-compiler-plugin + 2.5.1 + + 1.6 + 1.6 + + + + maven-dependency-plugin + 2.5 + + + maven-deploy-plugin + 2.7 + + + maven-help-plugin + 2.1.1 + + + maven-install-plugin + 2.3.1 + + + maven-jar-plugin + 2.4 + + + maven-resources-plugin + 2.5 + + + maven-shade-plugin + 1.7.1 + + + maven-site-plugin + 3.1 + + + maven-surefire-plugin + 2.12.2 + + + UTC + + + + + org.scala-tools + maven-scala-plugin + 2.15.2 + + + - - pub-libs - pub-libs-local - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - + + pub-libs + pub-libs-local + https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local + + repo.codahale.com http://repo.codahale.com @@ -77,9 +132,9 @@ http://nativelibs4java.sourceforge.net/maven - thirdparty-uploads - JBoss Thirdparty Uploads - https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads + thirdparty-uploads + JBoss Thirdparty Uploads + https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads diff --git a/realtime/pom.xml b/realtime/pom.xml index a39774c1eb7..874a8f12d92 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-realtime - 0.1.0-SNAPSHOT druid-realtime druid-realtime - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - com.metamx @@ -139,18 +133,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -165,20 +148,9 @@ - - org.apache.maven.plugins - maven-dependency-plugin - 2.2 - - - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - org.scala-tools maven-scala-plugin - 2.15.2 -unchecked @@ -208,16 +180,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - diff --git a/server/pom.xml b/server/pom.xml index 6097075e85d..050be3a21de 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-server - 0.1.0-SNAPSHOT druid-server druid-server - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - com.metamx @@ -178,18 +172,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -204,31 +187,8 @@ - - org.apache.maven.plugins - maven-dependency-plugin - 2.2 - - - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4