From da8793e9b549169d343cdaf3fc9790c67b4a032c Mon Sep 17 00:00:00 2001 From: Henning Schmiedehausen Date: Mon, 4 Feb 2013 23:21:37 -0800 Subject: [PATCH] move to airbase --- CHANGES | 15 + NEWS | 86 +++ bootstrap/pom.xml | 37 +- configuration/pom.xml | 28 +- dbpool/pom.xml | 32 +- discovery/pom.xml | 31 +- event/pom.xml | 51 +- http-client/pom.xml | 64 +- http-server/pom.xml | 52 +- jaxrs/pom.xml | 37 +- jmx-http-rpc/pom.xml | 37 +- jmx-http/pom.xml | 37 +- jmx/pom.xml | 37 +- json/pom.xml | 26 +- launcher/pom.xml | 10 +- library/pom.xml | 420 ------------- log/pom.xml | 42 +- node/pom.xml | 48 +- packaging/pom.xml | 7 +- pom.xml | 594 ++++++++---------- rack-launcher/pom.xml | 10 +- rack-packaging/pom.xml | 5 + rack-server-base/pom.xml | 142 +---- .../src/license/LICENSE-HEADER.txt | 6 +- rack/pom.xml | 29 +- rest-server-base/pom.xml | 547 ---------------- sample-server-archetype-builder/pom.xml | 73 +-- .../.build-airlift | 0 sample-server/pom.xml | 35 +- skeleton-server-archetype-builder/pom.xml | 72 +-- skeleton-server/.build-airlift | 0 skeleton-server/pom.xml | 38 +- src/license/LICENSE-HEADER.txt | 15 + stats/pom.xml | 46 +- testing/pom.xml | 38 +- trace-token/pom.xml | 26 +- units/pom.xml | 25 +- 37 files changed, 603 insertions(+), 2195 deletions(-) delete mode 100644 library/pom.xml rename license-header.txt => rack-server-base/src/license/LICENSE-HEADER.txt (84%) delete mode 100644 rest-server-base/pom.xml rename rest-server-base/profile-activate-72946194395.do.not.remove => sample-server/.build-airlift (100%) create mode 100644 skeleton-server/.build-airlift create mode 100644 src/license/LICENSE-HEADER.txt diff --git a/CHANGES b/CHANGES index 48ee61664a..c275dddc98 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,21 @@ * 0.71 - JMXAgent now uses NodeInfo to find IP address to bind to. +- Use airbase to build. +- Upgrade to Jetty 8.1.9 +- Upgrade to Guava 13.0.1 +- Upgrade to Apache BVal 0.5 +- Upgrade to slf4j 1.7.2 +- Upgrade to logback 1.0.9 +- Upgrade to Jersey 1.17 +- Upgrade to Joda Time 2.1 +- Upgrade to JCommander 1.30 +- Upgrade to MySQL Connector 5.1.23 +- Upgrade to h2 1.3.170 +- Upgrade to TestNG 6.8 +- Upgrade to Mockito 1.9.5 +- Upgrade to Hamcrest 1.3 + * 0.70 diff --git a/NEWS b/NEWS index 56dde99b66..12badc9b50 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,89 @@ +Airlift 0.71 + +* New build system + +Removed the library POM. Uses the airbase project as base pom for building. + +* Global dependency upgrades + +- Jetty to 8.1.9 +- Guava to 14.0 +- BVal to 0.5 +- slf4j to 1.7.2 +- logback to 1.0.9 +- Jersey to 1.17.1 +- Joda Time to 2.1 +- TestNG to 6.8 +- Mockito to 1.9.5 +- Hamcrest to 1.3 + +* Specific dependency upgrades + +- JMX: jcommander to 1.30 +- DBPool: mysql connector to 5.1.23 +- DBPool: h2 to 1.3.170 +- httpclient: httpclient to 4.2.3 +- httpclient: httpcore to 4.2.3 + +* Dependency changes + +com.google.code.findbugs:jsr305 was replaced with com.google.code.findbugs:annotations + +The jsr305 jar contains only the JSR 305 annotations while the +annotations jar also contains additional, Findbugs specific +annotations. + +* Replacing the library and rest-server-base pom with airbase + +Projects using the airlift/library and airlift/rest-server-base poms as their +parent must switch to use airbase (https://github.com/airlift/airbase/). + +Replace the parent section with + + + io.airlift + airbase + ... latest version ... + + +when replacing the rest-server-base, it must also activate the airlift +packaging by creating a file called `.build-airlift` in the directory +of the module or sub-module that should be packaged as an airlift +packaged project. + +As airbase provides packaging independently, the version of airlift +used for packaging and launcher is controlled with +`dep.packaging.version`. To ensure that a project uses the same +version for airbase while building and packaging, factoring out the +version of airlift in the parent pom is recommended: + + + 0.71-SNAPSHOT + ${dep.airlift.version} + + ... + + + ... + + io.airlift + bootstrap + ${dep.airlift.version} + + + + io.airlift + configuration + ${dep.airlift.version} + + ... + + + +`dep.airlift.version` is picked up when the project is built and +`dep.packaging.version` is used when the project is packaged. + + Airlift 0.70 * Upgrade to Jackson 2.1.x diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 13434ffd4a..0bf954c4ce 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift bootstrap jar - 0.71-SNAPSHOT bootstrap @@ -13,6 +11,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -29,11 +31,6 @@ jmx - - io.airlift - testing - - com.google.guava guava @@ -49,31 +46,17 @@ guice + + io.airlift + testing + test + + org.testng testng test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/configuration/pom.xml b/configuration/pom.xml index e4defbbbb5..91cc0b0ffe 100644 --- a/configuration/pom.xml +++ b/configuration/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift configuration jar - 0.71-SNAPSHOT configuration @@ -13,6 +11,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + javax.validation @@ -37,7 +39,6 @@ cglib cglib-nodep - 2.2.2 @@ -49,27 +50,8 @@ io.airlift testing + true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/dbpool/pom.xml b/dbpool/pom.xml index bb6cff097c..60dc5d0a15 100644 --- a/dbpool/pom.xml +++ b/dbpool/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift dbpool jar - 0.71-SNAPSHOT dbpool @@ -13,6 +11,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -34,6 +36,11 @@ units + + javax.validation + validation-api + + com.google.guava guava @@ -52,14 +59,12 @@ mysql mysql-connector-java - 5.1.15 true com.h2database h2 - 1.3.154 true @@ -78,28 +83,9 @@ org.mockito mockito-core - 1.8.5 test - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/discovery/pom.xml b/discovery/pom.xml index 18bd1396a5..1765793191 100644 --- a/discovery/pom.xml +++ b/discovery/pom.xml @@ -1,11 +1,8 @@ 4.0.0 - - io.airlift discovery-experimental jar - 0.71-SNAPSHOT io.airlift @@ -13,6 +10,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -47,6 +48,7 @@ io.airlift testing + test @@ -90,8 +92,8 @@ - org.eclipse.jetty.orbit - javax.servlet + javax.servlet + javax.servlet-api test @@ -113,23 +115,4 @@ test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/event/pom.xml b/event/pom.xml index a60a966160..bff68872ab 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -1,11 +1,8 @@ 4.0.0 - - io.airlift event-experimental jar - 0.71-SNAPSHOT io.airlift @@ -13,6 +10,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -24,11 +25,6 @@ node - - io.airlift - configuration - - io.airlift http-client-experimental @@ -39,16 +35,6 @@ discovery-experimental - - io.airlift - json - - - - io.airlift - testing - - io.airlift units @@ -95,13 +81,14 @@ - javax.validation - validation-api + io.airlift + testing + test - org.eclipse.jetty.orbit - javax.servlet + javax.servlet + javax.servlet-api test @@ -123,24 +110,4 @@ test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/http-client/pom.xml b/http-client/pom.xml index 5651d7a6aa..303a34a25d 100644 --- a/http-client/pom.xml +++ b/http-client/pom.xml @@ -1,11 +1,8 @@ 4.0.0 - - io.airlift http-client-experimental jar - 0.71-SNAPSHOT io.airlift @@ -13,11 +10,14 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.netty netty - 3.6.2.Final @@ -40,21 +40,14 @@ configuration - - io.airlift - testing - - org.apache.httpcomponents httpclient - 4.2.2 org.apache.httpcomponents httpcore - 4.2.2 @@ -67,12 +60,6 @@ validation-api - - com.google.code.findbugs - jsr305 - 1.3.9 - - javax.inject javax.inject @@ -91,7 +78,6 @@ com.google.inject.extensions guice-multibindings - 3.0 @@ -99,9 +85,21 @@ guava + + com.google.code.findbugs + annotations + + org.testng testng + test + + + + io.airlift + testing + test @@ -111,8 +109,14 @@ - org.eclipse.jetty.orbit - javax.servlet + org.eclipse.jetty + jetty-util + test + + + + javax.servlet + javax.servlet-api test @@ -122,24 +126,4 @@ test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/http-server/pom.xml b/http-server/pom.xml index 58436952f4..ea0b63c41d 100644 --- a/http-server/pom.xml +++ b/http-server/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift http-server jar - 0.71-SNAPSHOT http-server @@ -13,6 +11,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -49,11 +51,6 @@ node - - io.airlift - json - - io.airlift stats @@ -64,11 +61,6 @@ http-client-experimental - - io.airlift - testing - - javax.inject javax.inject @@ -100,14 +92,13 @@ - org.eclipse.jetty.orbit - javax.servlet + javax.servlet + javax.servlet-api commons-lang commons-lang - 2.6 @@ -117,8 +108,7 @@ com.google.code.findbugs - jsr305 - 1.3.9 + annotations @@ -156,6 +146,12 @@ joda-time + + io.airlift + testing + test + + org.testng testng @@ -165,36 +161,14 @@ commons-codec commons-codec - 1.4 test org.mockito mockito-core - 1.8.5 test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index b168e75139..5c3440b485 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift jaxrs jar - 0.71-SNAPSHOT jaxrs @@ -13,6 +11,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -50,8 +52,8 @@ - org.eclipse.jetty.orbit - javax.servlet + javax.servlet + javax.servlet-api @@ -64,11 +66,6 @@ guice - - com.google.inject.extensions - guice-servlet - - com.sun.jersey.contribs jersey-guice @@ -110,7 +107,6 @@ org.mockito mockito-core - 1.8.5 test @@ -120,26 +116,5 @@ test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/jmx-http-rpc/pom.xml b/jmx-http-rpc/pom.xml index 2f991e69da..9e36d566e7 100644 --- a/jmx-http-rpc/pom.xml +++ b/jmx-http-rpc/pom.xml @@ -1,11 +1,8 @@ 4.0.0 - - io.airlift jmx-http-rpc-experimental jar - 0.71-SNAPSHOT io.airlift @@ -13,6 +10,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -60,8 +61,14 @@ - org.eclipse.jetty.orbit - javax.servlet + javax.servlet + javax.servlet-api + + + + io.airlift + testing + test @@ -76,24 +83,4 @@ test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/jmx-http/pom.xml b/jmx-http/pom.xml index 79966b5c29..9fdc836d0b 100644 --- a/jmx-http/pom.xml +++ b/jmx-http/pom.xml @@ -1,35 +1,33 @@ + 4.0.0 + jmx-http-experimental + jar + airlift io.airlift 0.71-SNAPSHOT - 4.0.0 - - io.airlift - jmx-http-experimental - jar - 0.71-SNAPSHOT + + ${project.parent.basedir} + io.airlift discovery-experimental - 0.71-SNAPSHOT io.airlift json - 0.71-SNAPSHOT com.google.inject guice - 3.0 @@ -50,7 +48,6 @@ com.sun.jersey jersey-core - 1.9.1 @@ -58,24 +55,4 @@ guava - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/jmx/pom.xml b/jmx/pom.xml index 608be089d3..dd71740815 100644 --- a/jmx/pom.xml +++ b/jmx/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift jmx jar - 0.71-SNAPSHOT jmx @@ -13,12 +11,21 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift log + + io.airlift + node + + io.airlift configuration @@ -44,15 +51,9 @@ guice - - com.google.inject.extensions - guice-multibindings - - com.beust jcommander - 1.12 test @@ -62,25 +63,5 @@ test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/json/pom.xml b/json/pom.xml index 79443f90e6..89d746e44c 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -1,11 +1,8 @@ 4.0.0 - - io.airlift json jar - 0.71-SNAPSHOT io.airlift @@ -13,6 +10,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + com.google.inject @@ -71,23 +72,4 @@ test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/launcher/pom.xml b/launcher/pom.xml index b9feb4406c..6a64bb1f66 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -1,11 +1,9 @@ 4.0.0 - io.airlift launcher - pom - 0.71-SNAPSHOT launcher + pom io.airlift @@ -13,11 +11,14 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + maven-assembly-plugin - 2.2 package-tgz @@ -26,6 +27,7 @@ single + true src/main/assemblies/packaging.xml diff --git a/library/pom.xml b/library/pom.xml deleted file mode 100644 index bf93161d7b..0000000000 --- a/library/pom.xml +++ /dev/null @@ -1,420 +0,0 @@ - - - 4.0.0 - io.airlift - library - 0.71-SNAPSHOT - pom - Library POM - Library POM - http://github.com/airlift/airlift - - 2010 - - Airlift - - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html - repo - - - - - - mattstep - Matt Stephenson - mattstep@mattstep.net - - - - - UTF-8 - - - - scm:git:git://github.com/airlift/airlift.git - scm:git:git@github.com:airlift/airlift.git - http://github.com/airlift/airlift/tree/master - - - - 3.0 - - - - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - io.airlift - bootstrap - 0.71-SNAPSHOT - - - - io.airlift - configuration - 0.71-SNAPSHOT - - - - io.airlift - dbpool - 0.71-SNAPSHOT - - - - io.airlift - discovery-experimental - 0.71-SNAPSHOT - - - - io.airlift - event-experimental - 0.71-SNAPSHOT - - - - io.airlift - jaxrs - 0.71-SNAPSHOT - - - - io.airlift - http-server - 0.71-SNAPSHOT - - - - io.airlift - http-client-experimental - 0.71-SNAPSHOT - - - - io.airlift - json - 0.71-SNAPSHOT - - - - io.airlift - jmx - 0.71-SNAPSHOT - - - - io.airlift - jmx-http-rpc-experimental - 0.71-SNAPSHOT - - - - io.airlift - launcher - 0.71-SNAPSHOT - bin - tar.gz - - - - io.airlift - log - 0.71-SNAPSHOT - - - - io.airlift - node - 0.71-SNAPSHOT - - - - io.airlift - stats - 0.71-SNAPSHOT - - - - io.airlift - units - 0.71-SNAPSHOT - - - - io.airlift - testing - 0.71-SNAPSHOT - - - - io.airlift - trace-token - 0.71-SNAPSHOT - - - - io.airlift - jmx-http-experimental - 0.71-SNAPSHOT - - - - org.slf4j - slf4j-api - 1.6.2 - - - - ch.qos.logback - logback-classic - 0.9.30 - - - - ch.qos.logback - logback-core - 0.9.30 - - - - javax.inject - javax.inject - 1 - - - - com.sun.jersey - jersey-core - 1.9.1 - - - - com.sun.jersey.contribs - jersey-guice - 1.9.1 - - - - com.sun.jersey.contribs - jersey-multipart - 1.9.1 - - - - com.sun.jersey - jersey-server - 1.9.1 - - - - org.weakref - jmxutils - 1.13 - - - - joda-time - joda-time - 2.0 - - - - javax.validation - validation-api - 1.0.0.GA - - - - org.apache.bval - bval-jsr303 - 0.3-incubating - - - - com.google.guava - guava - 12.0 - - - - com.google.inject - guice - 3.0 - - - - com.google.inject.extensions - guice-multibindings - 3.0 - - - - com.google.inject.extensions - guice-servlet - 3.0 - - - - com.fasterxml.jackson.core - jackson-annotations - 2.1.2 - - - - com.fasterxml.jackson.core - jackson-core - 2.1.3 - - - - com.fasterxml.jackson.core - jackson-databind - 2.1.3 - - - - com.fasterxml.jackson.datatype - jackson-datatype-guava - 2.1.2 - - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.1.2 - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - 2.1.2 - - - - org.testng - testng - 6.2.1 - - - - org.eclipse.jetty - jetty-server - 8.1.1.v20120215 - - - - org.eclipse.jetty - jetty-servlet - 8.1.1.v20120215 - - - - org.eclipse.jetty - jetty-util - 8.1.1.v20120215 - - - - org.eclipse.jetty - jetty-servlets - 8.1.1.v20120215 - - - - org.eclipse.jetty - jetty-security - 8.1.1.v20120215 - - - - org.eclipse.jetty - jetty-jmx - 8.1.1.v20120215 - - - - org.eclipse.jetty - jetty-http - 8.1.1.v20120215 - - - - org.eclipse.jetty.orbit - javax.servlet - 3.0.0.v201112011016 - - - - com.google.code.findbugs - jsr305 - 1.3.9 - - - - com.ning - async-http-client - 1.6.5 - - - - - - - sonatype-oss-release - - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - - diff --git a/log/pom.xml b/log/pom.xml index 5e1b379e77..596aca21e7 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift log jar - 0.71-SNAPSHOT log @@ -13,27 +11,25 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift configuration - - io.airlift - testing - - org.slf4j jul-to-slf4j - 1.6.2 org.slf4j log4j-over-slf4j - 1.6.2 + runtime @@ -66,6 +62,12 @@ jmxutils + + io.airlift + testing + test + + org.testng testng @@ -75,36 +77,14 @@ org.hamcrest hamcrest-core - 1.1 test org.mockito mockito-core - 1.8.5 test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/node/pom.xml b/node/pom.xml index c74a582a2a..7886cb960d 100644 --- a/node/pom.xml +++ b/node/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift node jar - 0.71-SNAPSHOT node @@ -13,27 +11,21 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift configuration - - io.airlift - testing - - com.google.guava guava - - com.google.inject.extensions - guice-multibindings - - com.google.inject guice @@ -49,31 +41,23 @@ validation-api + + com.google.inject.extensions + guice-multibindings + test + + + + io.airlift + testing + test + + org.testng testng test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/packaging/pom.xml b/packaging/pom.xml index 0892ce267c..a817fc7f50 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -1,14 +1,17 @@ 4.0.0 - io.airlift packaging - 0.71-SNAPSHOT packaging + jar io.airlift airlift 0.71-SNAPSHOT + + + ${project.parent.basedir} + diff --git a/pom.xml b/pom.xml index e562e2e392..fece48704c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,12 +12,21 @@ io.airlift - library - 0.71-SNAPSHOT - library/pom.xml + airbase + 3-SNAPSHOT 2010 + + + false + true + true + + ${project.version} + ${project.version} + + Airlift @@ -65,6 +74,11 @@ Mark Kent mkent@proofpoint.com + + hgschmie + Henning Schmiedehausen + henning@schmiedehausen.org + mtraverso Martin Traverso @@ -77,371 +91,271 @@ - - UTF-8 - - scm:git:git://github.com/airlift/airlift.git scm:git:git@github.com:airlift/airlift.git http://github.com/airlift/airlift/tree/master - - 3.0 - + + + bootstrap + configuration + dbpool + discovery + event + http-client + http-server + jaxrs + jmx-http-rpc + jmx-http + jmx + json + launcher + log + node + packaging + rack-launcher + rack-packaging + rack + stats + testing + trace-token + units - - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - - + + rack-server-base - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0.1 - - - enforce-versions - - enforce - - - - - 3.0.0 - - - 1.7 - - - - com.google.collections:google-collections - com.google.guava:guava - - - com.google.guava:guava:[10.0.1,) - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - com.ning.maven.plugins - maven-duplicate-finder-plugin - 1.0.3 - - - - - - - com.sun.jersey - jersey-server - 1.9.1 - - - com.sun.jersey - jersey-core - 1.9.1 - - - com.sun.jersey.contribs - jersey-multipart - 1.9.1 - - - - META-INF/jersey-module-version - - - - - - - - commons-beanutils - commons-beanutils-core - 1.8.3 - - - commons-collections - commons-collections - 3.2.1 - - - - org.apache.commons.collections.ArrayStack - org.apache.commons.collections.Buffer - org.apache.commons.collections.BufferUnderflowException - org.apache.commons.collections.FastHashMap - - - - - - - about\.html - - - - - - org.jruby - jruby-complete - - - - true - - - - verify - - check - - - - - + + skeleton-server + sample-server - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - + + skeleton-server-archetype-builder + sample-server-archetype-builder + - - org.apache.maven.plugins - maven-surefire-plugin - 2.8.1 - - - -XX:-UseSplitVerifier - - + + + + io.airlift + bootstrap + ${dep.airlift.version} + - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - true - - - - create-source-jar - - jar-no-fork - - - - + + io.airlift + configuration + ${dep.airlift.version} + - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - + + io.airlift + dbpool + ${dep.airlift.version} + - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.2 - - true - true - - + + io.airlift + discovery-experimental + ${dep.airlift.version} + + + io.airlift + event-experimental + ${dep.airlift.version} + - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - xml - - - + + io.airlift + http-client-experimental + ${dep.airlift.version} + - - org.apache.maven.plugins - maven-install-plugin - 2.3.1 - + + io.airlift + http-server + ${dep.airlift.version} + - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - + + io.airlift + jaxrs + ${dep.airlift.version} + - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - + + io.airlift + jmx-http-rpc-experimental + ${dep.airlift.version} + + + + io.airlift + jmx-http-experimental + ${dep.airlift.version} + + + + io.airlift + jmx + ${dep.airlift.version} + + + + io.airlift + json + ${dep.airlift.version} + + + + io.airlift + launcher + ${dep.airlift.version} + bin + tar.gz + + + + io.airlift + log + ${dep.airlift.version} + + + + io.airlift + node + ${dep.airlift.version} + + + + io.airlift + packaging + ${dep.airlift.version} + + + + io.airlift + rack-launcher-experimental + ${dep.airlift.version} + bin + tar.gz + + + + io.airlift + rack-packaging-experimental + ${dep.airlift.version} + + + + io.airlift + rack-experimental + ${dep.airlift.version} + + + + io.airlift + stats + ${dep.airlift.version} + + + + io.airlift + testing + ${dep.airlift.version} + + + + io.airlift + trace-token + ${dep.airlift.version} + + + + io.airlift + units + ${dep.airlift.version} + + + + commons-lang + commons-lang + 2.6 + + + commons-codec + commons-codec + 1.7 + + + + org.apache.httpcomponents + httpclient + 4.2.3 + + + + org.apache.httpcomponents + httpcore + 4.2.3 + + + + io.netty + netty + 3.6.2.Final + + + + mysql + mysql-connector-java + 5.1.23 + + + + com.h2database + h2 + 1.3.170 + + + + com.beust + jcommander + 1.30 + + + + org.jruby + jruby-complete + 1.6.2 + + + + + + + + - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - - -quiet - - - -J-Xmx1024m - - - - attach-javadocs - - jar - - - + io.airlift + bundler-packaging-plugin + 1.1 - org.apache.maven.plugins - maven-release-plugin - 2.2.2 - - forked-path - -Psonatype-oss-release - false - false - true - clean install - true - @{project.version} - + maven-antrun-plugin + 1.7 - - com.mycila.maven-license-plugin - maven-license-plugin - 1.9.0 - - true -
license-header.txt
- - SLASHSTAR_STYLE - - - **/README.txt - **/config.properties - **/log.properties - **/src/test/resources/gems/** - **/*.html - - + org.apache.maven.plugins + maven-invoker-plugin + 1.5 - - - - sonatype-oss-release - - true - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - - - - library - rack - rack-launcher - rack-packaging - rack-server-base - testing - launcher - packaging - log - node - event - json - http-client - http-server - jaxrs - jmx - jmx-http - jmx-http-rpc - bootstrap - configuration - discovery - stats - units - dbpool - rest-server-base - sample-server - skeleton-server - sample-server-archetype-builder - skeleton-server-archetype-builder - trace-token - diff --git a/rack-launcher/pom.xml b/rack-launcher/pom.xml index 1e36c3bbd0..d11695cfb0 100644 --- a/rack-launcher/pom.xml +++ b/rack-launcher/pom.xml @@ -1,12 +1,10 @@ 4.0.0 - io.airlift rack-launcher-experimental - jar - 0.71-SNAPSHOT rack-launcher Launcher Script for the Platform Rack Server + pom io.airlift @@ -14,11 +12,14 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + maven-assembly-plugin - 2.2 package-tgz @@ -27,6 +28,7 @@ single + true src/main/assemblies/packaging.xml diff --git a/rack-packaging/pom.xml b/rack-packaging/pom.xml index 998d049efc..4be9a14c0e 100644 --- a/rack-packaging/pom.xml +++ b/rack-packaging/pom.xml @@ -6,6 +6,11 @@ 0.71-SNAPSHOT rack-packaging Assembly for building a galaxy binary for the Platform Rack Server + jar + + + ${project.parent.basedir} + io.airlift diff --git a/rack-server-base/pom.xml b/rack-server-base/pom.xml index 8bd322d5be..19ec6ced06 100644 --- a/rack-server-base/pom.xml +++ b/rack-server-base/pom.xml @@ -1,130 +1,52 @@ 4.0.0 - io.airlift rack-server-base-experimental - 0.71-SNAPSHOT pom rack-server-base Airlift Rack Server base POM http://github.com/airlift/airlift - 2010 - - Airlift - - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html - repo - - - - - - dain - Dain Sundstrom - dain@iq80.com - - - randgalt - Jordan Zimmerman - jordan@proofpoint.com - - - mattstep - Matt Stephenson - mattstep@mattstep.net - - - mtraverso - Martin Traverso - mtraverso@gmail.com - - + + io.airlift + airlift + 0.71-SNAPSHOT + - UTF-8 + ${project.parent.version} - - scm:git:git://github.com/airlift/airlift.git - scm:git:git@github.com:airlift/airlift.git - http://github.com/airlift/airlift/tree/master - - - - 3.0 - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - io.airlift rack-experimental - 0.71-SNAPSHOT io.airlift rack-launcher-experimental - 0.71-SNAPSHOT bin tar.gz + runtime - child-project-profile - + build-rack - profile-activate-72946194395.do.not.remove + .build-rack - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - - - io.airlift bundler-packaging-plugin - 1.1 + package @@ -138,7 +60,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 @@ -163,21 +84,19 @@ org.apache.maven.plugins maven-assembly-plugin - 2.2 false distribution - gnu io.airlift rack-packaging-experimental - 0.71-SNAPSHOT + ${dep.airlift.version} @@ -195,7 +114,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.5 attach-distribution-tar.gz @@ -230,44 +148,6 @@ - - - org.apache.maven.plugins - maven-release-plugin - 2.2.2 - - forked-path - false - false - true - @{project.version} - - - - - - - - sonatype-oss-release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - diff --git a/license-header.txt b/rack-server-base/src/license/LICENSE-HEADER.txt similarity index 84% rename from license-header.txt rename to rack-server-base/src/license/LICENSE-HEADER.txt index 8e65f88c7c..07e231e067 100644 --- a/license-header.txt +++ b/rack-server-base/src/license/LICENSE-HEADER.txt @@ -1,13 +1,15 @@ -Copyright 2010 Proofpoint, Inc. +Copyright (C) ${inceptionYear} Facebook, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 +http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + diff --git a/rack/pom.xml b/rack/pom.xml index 9139ec4d1a..735152234b 100644 --- a/rack/pom.xml +++ b/rack/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift rack-experimental jar - 0.71-SNAPSHOT rack The Platform Rack Server @@ -14,6 +12,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -78,7 +80,6 @@ org.jruby jruby-complete - 1.6.2 @@ -92,8 +93,8 @@ - org.eclipse.jetty.orbit - javax.servlet + javax.servlet + javax.servlet-api @@ -136,7 +137,6 @@ org.mockito mockito-core - 1.8.5 test @@ -156,22 +156,5 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/rest-server-base/pom.xml b/rest-server-base/pom.xml deleted file mode 100644 index e3448ad342..0000000000 --- a/rest-server-base/pom.xml +++ /dev/null @@ -1,547 +0,0 @@ - - - 4.0.0 - io.airlift - rest-server-base - 0.71-SNAPSHOT - pom - REST Server Base POM - Airlift REST server base POM - http://github.com/airlift/airlift - - - io.airlift - library - 0.71-SNAPSHOT - ../library/pom.xml - - - 2010 - - Airlift - - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html - repo - - - - - - dain - Dain Sundstrom - dain@iq80.com - - - mattstep - Matt Stephenson - mattstep@mattstep.net - - - randgalt - Jordan Zimmerman - jordan@proofpoint.com - - - mtraverso - Martin Traverso - mtraverso@gmail.com - - - - - UTF-8 - - - - scm:git:git://github.com/airlift/airlift.git - scm:git:git@github.com:airlift/airlift.git - http://github.com/airlift/airlift/tree/master - - - - 3.0 - - - - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - - - - - - - - false - com.mycila.maven-license-plugin - maven-license-plugin - 1.9.0 - -
license-header.txt
- - SLASHSTAR_STYLE - - - **/README.txt - **/config.properties - **/log.properties - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - - - - - - - - child-project-profile - - - - profile-activate-72946194395.do.not.remove - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0.1 - - - enforce-versions - - enforce - - - - - 3.0.0 - - - 1.7 - - - - - com.google.collections:google-collections - com.google.guava:guava - - - com.google.guava:guava:[10.0.1,) - - - - main-class - main-class property not defined - .+ - main-class property is empty - - - true - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - true - - - - create-source-jar - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - - ${main-class} - true - false - - - ${project.version} - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2 - - - false - - distribution - - - - - io.airlift - packaging - 0.71-SNAPSHOT - - - - - - package - package - - single - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.5 - - - attach-distribution-tar.gz - package - - attach-artifact - - - - - ${project.build.directory}/${project.artifactId}-${project.version}-distribution.tar.gz - tar.gz - - - - - - attach-readme - package - - attach-artifact - - - - - README.txt - txt - readme - - - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - xml - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.2 - - true - true - - - - - org.apache.maven.plugins - maven-install-plugin - 2.3.1 - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.8.1 - - - -XX:-UseSplitVerifier - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - - org.apache.maven.plugins - maven-release-plugin - 2.2.2 - - forked-path - -Pchild-project-release - clean install - false - false - true - @{project.version} - - - - - com.ning.maven.plugins - maven-duplicate-finder-plugin - 1.0.3 - - - - - - - com.sun.jersey - jersey-server - 1.9.1 - - - com.sun.jersey - jersey-core - 1.9.1 - - - com.sun.jersey.contribs - jersey-multipart - 1.9.1 - - - - META-INF/jersey-module-version - - - - - - - - commons-beanutils - commons-beanutils-core - 1.8.3 - - - commons-collections - commons-collections - 3.2.1 - - - - org.apache.commons.collections.ArrayStack - org.apache.commons.collections.Buffer - org.apache.commons.collections.BufferUnderflowException - org.apache.commons.collections.FastHashMap - - - - - - - - org.apache.httpcomponents - httpclient - 4.0.1 - - - org.apache.httpcomponents - httpcore - 4.2-beta1 - - - - org.apache.http.annotation.GuardedBy - org.apache.http.annotation.Immutable - org.apache.http.annotation.NotThreadSafe - org.apache.http.annotation.ThreadSafe - - - - - - - about\.html - - - - - - org.jruby - jruby-complete - - - - true - - - - verify - - check - - - - - - - - - - child-project-release - - true - - - - - parent-project-profile - - - profile-activate-72946194395.do.not.remove - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.2.2 - - forked-path - -Psonatype-oss-release - false - false - true - clean install - @{project.version} - - - - - - - sonatype-oss-release - - true - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - diff --git a/sample-server-archetype-builder/pom.xml b/sample-server-archetype-builder/pom.xml index dcf079579d..4558340867 100644 --- a/sample-server-archetype-builder/pom.xml +++ b/sample-server-archetype-builder/pom.xml @@ -12,6 +12,7 @@ + ${project.parent.basedir} sample-server @@ -20,7 +21,6 @@ maven-antrun-plugin - 1.6 make-clean-copy-of-project @@ -36,6 +36,7 @@ + @@ -50,7 +51,6 @@ maven-invoker-plugin - 1.5 generate-archetype @@ -81,7 +81,6 @@ maven-antrun-plugin - 1.6 munge-generated-pom @@ -101,11 +100,15 @@ ../rest-server-base/pom.xml]]> + + ${project.parent.basedir}]]> + + io.airlift.sample.Main]]> ${package}.Main]]> - + ]]> ${]]> @@ -165,33 +168,6 @@ http://github.com/airlift/airlift/tree/master - - - sonatype-oss-release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - - - - - - ]]> @@ -206,7 +182,6 @@ maven-invoker-plugin - 1.5 pom.xml @@ -255,38 +230,4 @@ - - - sonatype-oss-release - - - - maven-invoker-plugin - 1.5 - - ${project.build.directory}/archetype - true - - sonatype-oss-release - - - - - deploy-archetype - deploy - - run - - - - deploy - - - - - - - - - diff --git a/rest-server-base/profile-activate-72946194395.do.not.remove b/sample-server/.build-airlift similarity index 100% rename from rest-server-base/profile-activate-72946194395.do.not.remove rename to sample-server/.build-airlift diff --git a/sample-server/pom.xml b/sample-server/pom.xml index d6ab45234b..5eed3edf5c 100644 --- a/sample-server/pom.xml +++ b/sample-server/pom.xml @@ -1,35 +1,20 @@ 4.0.0 - io.airlift sample-server - 0.71-SNAPSHOT sample-server io.airlift - rest-server-base + airlift 0.71-SNAPSHOT - ../rest-server-base/pom.xml + ${project.parent.basedir} io.airlift.sample.Main - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - javax.validation @@ -46,14 +31,9 @@ guava - - com.google.inject.extensions - guice-multibindings - - com.google.code.findbugs - jsr305 + annotations @@ -146,15 +126,6 @@ http-client-experimental - - - io.airlift - launcher - bin - tar.gz - - - org.testng diff --git a/skeleton-server-archetype-builder/pom.xml b/skeleton-server-archetype-builder/pom.xml index 5a9964d50c..0e18667d89 100644 --- a/skeleton-server-archetype-builder/pom.xml +++ b/skeleton-server-archetype-builder/pom.xml @@ -12,6 +12,7 @@ + ${project.parent.basedir} skeleton-server @@ -20,7 +21,6 @@ maven-antrun-plugin - 1.6 make-clean-copy-of-project @@ -36,6 +36,7 @@ + @@ -50,7 +51,6 @@ maven-invoker-plugin - 1.5 generate-archetype @@ -81,7 +81,6 @@ maven-antrun-plugin - 1.6 munge-generated-pom @@ -97,14 +96,14 @@ - ../rest-server-base/pom.xml]]> + ${project.parent.basedir}]]> io.airlift.skeleton.Main]]> ${package}.Main]]> - + ]]> ${]]> @@ -164,33 +163,6 @@ http://github.com/airlift/airlift/tree/master - - - sonatype-oss-release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - true - - - - - - - - - ]]> @@ -202,10 +174,8 @@ - maven-invoker-plugin - 1.5 pom.xml @@ -254,38 +224,4 @@ - - - sonatype-oss-release - - - - maven-invoker-plugin - 1.5 - - ${project.build.directory}/archetype - true - - sonatype-oss-release - - - - - deploy-archetype - deploy - - run - - - - deploy - - - - - - - - - diff --git a/skeleton-server/.build-airlift b/skeleton-server/.build-airlift new file mode 100644 index 0000000000..e69de29bb2 diff --git a/skeleton-server/pom.xml b/skeleton-server/pom.xml index 337be453af..2689850437 100644 --- a/skeleton-server/pom.xml +++ b/skeleton-server/pom.xml @@ -1,35 +1,20 @@ 4.0.0 - io.airlift skeleton-server - 0.71-SNAPSHOT skeleton-server io.airlift - rest-server-base + airlift 0.71-SNAPSHOT - ../rest-server-base/pom.xml + ${project.parent.basedir} io.airlift.skeleton.Main - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - io.airlift @@ -41,11 +26,6 @@ json - - io.airlift - configuration - - io.airlift bootstrap @@ -106,11 +86,6 @@ guice - - com.google.guava - guava - - io.airlift jmx-http-experimental @@ -121,15 +96,6 @@ http-client-experimental - - - io.airlift - launcher - bin - tar.gz - - - org.testng diff --git a/src/license/LICENSE-HEADER.txt b/src/license/LICENSE-HEADER.txt new file mode 100644 index 0000000000..bdbd047a9f --- /dev/null +++ b/src/license/LICENSE-HEADER.txt @@ -0,0 +1,15 @@ +Copyright (C) ${inceptionYear} Proofpoint, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + diff --git a/stats/pom.xml b/stats/pom.xml index 6a8ad43391..2a18de7591 100644 --- a/stats/pom.xml +++ b/stats/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift stats jar - 0.71-SNAPSHOT stats @@ -13,6 +11,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + io.airlift @@ -20,25 +22,24 @@ - io.airlift - log - test + org.weakref + jmxutils - org.weakref - jmxutils + com.google.guava + guava - org.apache.commons - commons-math - 2.2 + com.google.code.findbugs + annotations - com.google.guava - guava + io.airlift + log + test @@ -46,31 +47,12 @@ testing test + org.testng testng test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/testing/pom.xml b/testing/pom.xml index 1a94e593bc..1be87a0d46 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -1,58 +1,40 @@ 4.0.0 - io.airlift testing jar testing - 0.71-SNAPSHOT io.airlift airlift 0.71-SNAPSHOT + + ${project.parent.basedir} + + com.google.guava guava - - org.testng - testng - - javax.validation validation-api - 1.0.0.GA org.apache.bval bval-jsr303 - 0.3-incubating - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - + + org.testng + testng + true + + diff --git a/trace-token/pom.xml b/trace-token/pom.xml index 1f41d6d194..90db2088e1 100644 --- a/trace-token/pom.xml +++ b/trace-token/pom.xml @@ -1,9 +1,8 @@ - io.airlift + 4.0.0 trace-token jar - 0.71-SNAPSHOT io.airlift @@ -11,7 +10,9 @@ 0.71-SNAPSHOT - 4.0.0 + + ${project.parent.basedir} + @@ -25,23 +26,4 @@ test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/units/pom.xml b/units/pom.xml index 2fce20c22f..c59ab2a205 100644 --- a/units/pom.xml +++ b/units/pom.xml @@ -1,10 +1,8 @@ 4.0.0 - io.airlift units jar - 0.71-SNAPSHOT units @@ -13,6 +11,10 @@ 0.71-SNAPSHOT + + ${project.parent.basedir} + + javax.validation @@ -53,24 +55,5 @@ test - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - -