diff options
| author | Eirik Nygaard <eirik@yahoo-inc.com> | 2016-06-23 09:21:10 +0200 |
|---|---|---|
| committer | Eirik Nygaard <eirik@yahoo-inc.com> | 2016-06-23 09:21:10 +0200 |
| commit | dd159ea3d5b3633052fea126375718f101c022d5 (patch) | |
| tree | 246a38b414a62f2eccc942e9b67fd4de59da4e25 | |
| parent | 1409aeacf2b57bb374383a7a11481c6b93dbf66f (diff) | |
Move parent pom to toplevel directory
114 files changed, 1226 insertions, 2201 deletions
diff --git a/annotations/pom.xml b/annotations/pom.xml index 59dd7e82ac9..84378d2aa66 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>annotations</artifactId> <packaging>jar</packaging> diff --git a/application-deploy-plugin/pom.xml b/application-deploy-plugin/pom.xml index 3a8d785b749..fbed02aa934 100644 --- a/application-deploy-plugin/pom.xml +++ b/application-deploy-plugin/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>application-deploy-plugin</artifactId> <version>6-SNAPSHOT</version> diff --git a/application-model/pom.xml b/application-model/pom.xml index f03a71032b2..388d20ea885 100644 --- a/application-model/pom.xml +++ b/application-model/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>application-model</artifactId> <packaging>container-plugin</packaging> diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index dc624bfed4d..1fed278feb1 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>application-preprocessor</artifactId> <packaging>jar</packaging> diff --git a/application/pom.xml b/application/pom.xml index 3132108a378..ff6685cec73 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>application</artifactId> <packaging>jar</packaging> diff --git a/bootstrap.sh b/bootstrap.sh index 66b399fac13..2c896ec868d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -18,14 +18,14 @@ $top/dist/getversion.pl -M $top > $top/dist/vtag.map # These modules are required to be available to maven for it to calculate the # Vespa java dependency graph. MODULES=" - parent + . annotations scalalib bundle-plugin " for module in $MODULES; do - (cd $module && mvn_install) + (cd $module && mvn_install -N) done mvn_install -am -pl config-class-plugin -rf configgen diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index 0ca63d82fec..a4850c73dbb 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>com.yahoo.container.maven.plugin</groupId> <artifactId>bundle-plugin-test</artifactId> diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index a57d1a41bf8..604d0f1e6c7 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>bundle-plugin</artifactId> <version>6-SNAPSHOT</version> diff --git a/chain/pom.xml b/chain/pom.xml index fe83d2bfe74..9d65d9fd2bb 100755 --- a/chain/pom.xml +++ b/chain/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>chain</artifactId> <packaging>jar</packaging> diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml index b8103cd0210..8830c00f89d 100644 --- a/clustercontroller-apps/pom.xml +++ b/clustercontroller-apps/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>clustercontroller-apps</artifactId> <version>6-SNAPSHOT</version> diff --git a/clustercontroller-apputil/pom.xml b/clustercontroller-apputil/pom.xml index 261757bbf6f..5dc2c2a83d9 100644 --- a/clustercontroller-apputil/pom.xml +++ b/clustercontroller-apputil/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>clustercontroller-apputil</artifactId> <version>6-SNAPSHOT</version> diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index a010d88915b..93317a54dec 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>clustercontroller-core</artifactId> <version>6-SNAPSHOT</version> diff --git a/clustercontroller-standalone/pom.xml b/clustercontroller-standalone/pom.xml index 0569a8976f5..b9ddc4c9396 100644 --- a/clustercontroller-standalone/pom.xml +++ b/clustercontroller-standalone/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>clustercontroller-standalone</artifactId> <version>6-SNAPSHOT</version> diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index 10d6c220d86..7cf7cf0fdde 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>clustercontroller-utils</artifactId> <version>6-SNAPSHOT</version> diff --git a/component/pom.xml b/component/pom.xml index 038e154f20f..15ed4a190f2 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>component</artifactId> <packaging>container-plugin</packaging> diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index f2a66275c70..d280af8dc28 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-application-package</artifactId> <packaging>container-plugin</packaging> diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index d439e7e261b..dac015ea305 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-bundle</artifactId> <packaging>container-plugin</packaging> diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index ce37260819b..9dbcb5c86bb 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-class-plugin</artifactId> <packaging>maven-plugin</packaging> diff --git a/config-lib/pom.xml b/config-lib/pom.xml index 80568a1ea26..c5c0bc2e2c9 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-lib</artifactId> <packaging>container-plugin</packaging> diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 7280ac224ee..cf016ec4ee0 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-model-api</artifactId> <version>6-SNAPSHOT</version> diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 0864a502783..da187e839c8 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-model-fat</artifactId> <packaging>bundle</packaging> diff --git a/config-model/pom.xml b/config-model/pom.xml index 565ae7ab09f..e526b12c10c 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-model</artifactId> <packaging>container-plugin</packaging> diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml index d3d37adeb86..9e7f724da4c 100644 --- a/config-provisioning/pom.xml +++ b/config-provisioning/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>com.yahoo.vespa</groupId> <artifactId>config-provisioning</artifactId> diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index eba51af8882..21d3692634f 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-proxy</artifactId> <packaging>jar</packaging> diff --git a/config/pom.xml b/config/pom.xml index 4dd4e1a37fd..ace03e11555 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config</artifactId> <packaging>container-plugin</packaging> diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 8b50f7c8d3e..77ea6b55405 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>configdefinitions</artifactId> <packaging>container-plugin</packaging> diff --git a/configgen/pom.xml b/configgen/pom.xml index d8fc4703694..7981b22baa1 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>com.yahoo.vespa</groupId> <artifactId>configgen</artifactId> diff --git a/configserver/pom.xml b/configserver/pom.xml index 1bd08e49ec8..c98cc7e7b9c 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>configserver</artifactId> <packaging>container-plugin</packaging> diff --git a/container-accesslogging/pom.xml b/container-accesslogging/pom.xml index 8ff85cae6ce..ef8ea94abec 100644 --- a/container-accesslogging/pom.xml +++ b/container-accesslogging/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-accesslogging</artifactId> <version>6-SNAPSHOT</version> diff --git a/container-core/pom.xml b/container-core/pom.xml index e9b2d18628d..9932bc63c2b 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-core</artifactId> <version>6-SNAPSHOT</version> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index ca21d564ed4..9b61e60d759 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-dev</artifactId> <version>6-SNAPSHOT</version> diff --git a/container-di/pom.xml b/container-di/pom.xml index f78cae8f434..181488a4e52 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-di</artifactId> <version>6-SNAPSHOT</version> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index f320eb371bb..c484cf98dc5 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-disc</artifactId> <version>6-SNAPSHOT</version> diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml index f8e8b7f7d67..50adb243e93 100644 --- a/container-jersey2/pom.xml +++ b/container-jersey2/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-jersey2</artifactId> <version>6-SNAPSHOT</version> diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml index 553f3bc0d8a..6e802e4a804 100644 --- a/container-messagebus/pom.xml +++ b/container-messagebus/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-messagebus</artifactId> <version>6-SNAPSHOT</version> diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 8c567c189ac..b4da1254ae0 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-search-and-docproc</artifactId> <version>6-SNAPSHOT</version> diff --git a/container-search/pom.xml b/container-search/pom.xml index eaab9079b89..b632d022922 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>container-search</artifactId> <packaging>jar</packaging> diff --git a/container-test-jars/pom.xml b/container-test-jars/pom.xml index 9d14c4b3de2..2cc9ee4d67f 100644 --- a/container-test-jars/pom.xml +++ b/container-test-jars/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>com.yahoo.container.container-test-jars</groupId> <artifactId>container-test-jars</artifactId> diff --git a/defaults/pom.xml b/defaults/pom.xml index 7909947416a..17ca6bff3c3 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>com.yahoo.vespa</groupId> <artifactId>defaults</artifactId> diff --git a/docproc/pom.xml b/docproc/pom.xml index fe7228ba47d..8cec9b6a612 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>docproc</artifactId> <packaging>jar</packaging> diff --git a/docprocs/pom.xml b/docprocs/pom.xml index 64fed1d55e2..d85a4c475dd 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>docprocs</artifactId> <packaging>container-plugin</packaging> diff --git a/document/pom.xml b/document/pom.xml index 5d882b17f25..9b096f3c89a 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>document</artifactId> <version>6-SNAPSHOT</version> diff --git a/documentapi/pom.xml b/documentapi/pom.xml index 7f103965893..d9a3052def5 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>documentapi</artifactId> <packaging>container-plugin</packaging> diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index 3e32e62d17f..8387a586701 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>documentgen-test</artifactId> <packaging>jar</packaging> diff --git a/dummy-persistence/pom.xml b/dummy-persistence/pom.xml index 3d3c398ab49..c831bbe61f8 100644 --- a/dummy-persistence/pom.xml +++ b/dummy-persistence/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>simple</groupId> <artifactId>dummy-persistence</artifactId> <!-- Also used as Bundle-SymbolicName --> diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index 157ddf1f7d6..f6269b29b01 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>fileacquirer</artifactId> <version>6-SNAPSHOT</version> diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index ea5fb5b450e..d6885bc0667 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>filedistribution</artifactId> <version>6-SNAPSHOT</version> diff --git a/filedistribution_test/pom.xml b/filedistribution_test/pom.xml index db6584b24b5..ab43a526a58 100644 --- a/filedistribution_test/pom.xml +++ b/filedistribution_test/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>filedistribution_test</artifactId> <version>6-SNAPSHOT</version> diff --git a/filedistributionmanager/pom.xml b/filedistributionmanager/pom.xml index e58112568b0..61de6d2f5a4 100644 --- a/filedistributionmanager/pom.xml +++ b/filedistributionmanager/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>filedistributionmanager</artifactId> <version>6-SNAPSHOT</version> diff --git a/fsa/pom.xml b/fsa/pom.xml index aef9682deaa..e173a836864 100644 --- a/fsa/pom.xml +++ b/fsa/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>fsa</artifactId> <packaging>container-plugin</packaging> diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index a4328091d35..d163ad5fdbd 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>indexinglanguage</artifactId> <packaging>jar</packaging> diff --git a/jaxrs_client_utils/pom.xml b/jaxrs_client_utils/pom.xml index 1c97bb7fdcc..f449b8f1fb8 100644 --- a/jaxrs_client_utils/pom.xml +++ b/jaxrs_client_utils/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>jaxrs_client_utils</artifactId> <version>6-SNAPSHOT</version> diff --git a/jaxrs_utils/pom.xml b/jaxrs_utils/pom.xml index 3f23c142e62..5dd5c9a22c1 100644 --- a/jaxrs_utils/pom.xml +++ b/jaxrs_utils/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>jaxrs_utils</artifactId> <version>6-SNAPSHOT</version> diff --git a/jdisc_container_maven_archetype_application/pom.xml b/jdisc_container_maven_archetype_application/pom.xml index cfa57ae5857..a7073ded403 100644 --- a/jdisc_container_maven_archetype_application/pom.xml +++ b/jdisc_container_maven_archetype_application/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <!-- Package name must contain _maven_archetype --> <artifactId>jdisc_container_maven_archetype_application</artifactId> diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 315a46a65c4..4704c417230 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>jdisc_core</artifactId> <version>6-SNAPSHOT</version> diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index 85b4d7c1c37..360d97ff7a7 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>parent</artifactId> diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index 15518d20c62..fdae8728ea9 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>jdisc_http_service</artifactId> <version>6-SNAPSHOT</version> diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index 90aae3b0d13..b3e147bdac5 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>jdisc_jetty</artifactId> <version>6-SNAPSHOT</version> diff --git a/jdisc_jmx_metrics/pom.xml b/jdisc_jmx_metrics/pom.xml index 75970944d7e..bc9b52adb80 100644 --- a/jdisc_jmx_metrics/pom.xml +++ b/jdisc_jmx_metrics/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>jdisc_jmx_metrics</artifactId> <version>6-SNAPSHOT</version> diff --git a/jdisc_maven_archetype_component/pom.xml b/jdisc_maven_archetype_component/pom.xml index 6e4d5221859..2926eccabcb 100644 --- a/jdisc_maven_archetype_component/pom.xml +++ b/jdisc_maven_archetype_component/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <!-- Package name must contain _maven_archetype --> <artifactId>jdisc_maven_archetype_component</artifactId> diff --git a/jdisc_messagebus_service/pom.xml b/jdisc_messagebus_service/pom.xml index 62e29e4bc5d..cf844e50a90 100644 --- a/jdisc_messagebus_service/pom.xml +++ b/jdisc_messagebus_service/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>jdisc_messagebus_service</artifactId> <version>6-SNAPSHOT</version> diff --git a/jrt/pom.xml b/jrt/pom.xml index 967d75e8937..6592cd84638 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>jrt</artifactId> <packaging>container-plugin</packaging> diff --git a/linguistics/pom.xml b/linguistics/pom.xml index baeb2457c76..3c8ae341249 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>linguistics</artifactId> <packaging>container-plugin</packaging> diff --git a/logd/pom.xml b/logd/pom.xml index 8385960066e..b8d49e21677 100644 --- a/logd/pom.xml +++ b/logd/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>logd</artifactId> <version>6-SNAPSHOT</version> diff --git a/logserver/pom.xml b/logserver/pom.xml index dc997db0386..c982a442cf5 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>logserver</artifactId> <packaging>jar</packaging> diff --git a/messagebus-disc/pom.xml b/messagebus-disc/pom.xml index 60393f48ebd..5357de9c8ed 100644 --- a/messagebus-disc/pom.xml +++ b/messagebus-disc/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>messagebus-disc</artifactId> <version>6-SNAPSHOT</version> diff --git a/messagebus/pom.xml b/messagebus/pom.xml index 16868d49e7c..a3ae2fb54c2 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>messagebus</artifactId> <version>6-SNAPSHOT</version> diff --git a/metrics/pom.xml b/metrics/pom.xml index 0aa81dff64b..af78b9e7c91 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>com.yahoo.vespa</groupId> <artifactId>metrics</artifactId> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index c89e8524fc3..6c62d3c7f46 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>node-admin</artifactId> diff --git a/node-repository/pom.xml b/node-repository/pom.xml index da48ff9eb4b..bb3661f8042 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>node-repository</artifactId> <version>6-SNAPSHOT</version> diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index 58480cf0423..b2b581a7fc6 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>orchestrator-restapi</artifactId> <version>6-SNAPSHOT</version> diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 7ad5393aa31..7647266c374 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>orchestrator</artifactId> <version>6-SNAPSHOT</version> diff --git a/parent/.gitignore b/parent/.gitignore deleted file mode 100644 index a5cfcc68fe4..00000000000 --- a/parent/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -pom.xml.build -/pom.xml.build.orig -/target diff --git a/parent/OWNERS b/parent/OWNERS deleted file mode 100644 index 702e6e3eb12..00000000000 --- a/parent/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -gjoranv -ean diff --git a/parent/org.jvnet.hudson/.gitignore b/parent/org.jvnet.hudson/.gitignore deleted file mode 100644 index ea8c4bf7f35..00000000000 --- a/parent/org.jvnet.hudson/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/parent/org.jvnet.hudson/LICENSE b/parent/org.jvnet.hudson/LICENSE deleted file mode 100644 index 2568a8342c2..00000000000 --- a/parent/org.jvnet.hudson/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ -COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - -1. Definitions. - -1.1. Contributor means each individual or entity that creates or -contributes to the creation of Modifications. - -1.2. Contributor Version means the combination of the Original -Software, prior Modifications used by a Contributor (if any), -and the Modifications made by that particular Contributor. - -1.3. Covered Software means (a) the Original Software, or (b) -Modifications, or (c) the combination of files containing -Original Software with files containing Modifications, in each -case including portions thereof. - -1.4. Executable means the Covered Software in any form other -than Source Code. - -1.5. Initial Developer means the individual or entity that first -makes Original Software available under this License. - -1.6. Larger Workmeans a work which combines Covered Software or -portions thereof with code not governed by the terms of this -License. - -1.7. License means this document. - -1.8. Licensable means having the right to grant, to the maximum -extent possible, whether at the time of the initial grant or -subsequently acquired, any and all of the rights conveyed herein. - -1.9. Modifications means the Source Code and Executable form of -any of the following: A. Any file that results from an addition -to, deletion from or modification of the contents of a file -containing Original Software or previous Modifications; B. Any -new file that contains any part of the Original Software or -previous Modification; or C. Any new file that is contributed or -otherwise made available under the terms of this License. - -1.10. Original Software means the Source Code and Executable -form of computer software code that is originally released under -this License. - -1.11. Patent Claims means any patent claim(s), now owned or -hereafter acquired, including without limitation, method, -process, and apparatus claims, in any patent Licensable by -grantor. - -1.12. Source Code means (a) the common form of computer software -code in which modifications are made and (b) associated -documentation included in or with such code. - -1.13. You (or Your) means an individual or a legal entity -exercising rights under, and complying with all of the terms of, -this License. For legal entities, You includes any entity which -controls, is controlled by, or is under common control with You. -For purposes of this definition, control means (a) the power, -direct or indirect, to cause the direction or management of such -entity, whether by contract or otherwise, or (b) ownership of -more than fifty percent (50%) of the outstanding shares or -beneficial ownership of such entity. - -2. License Grants. - -2.1. The Initial Developer Grant. Conditioned upon Your -compliance with Section 3.1 below and subject to third party -intellectual property claims, the Initial Developer hereby -grants You a world-wide, royalty-free, non-exclusive license: - -(a) under intellectual property rights (other than patent or -trademark) Licensable by Initial Developer, to use, reproduce, -modify, display, perform, sublicense and distribute the Original -Software (or portions thereof), with or without Modifications, -and/or as part of a Larger Work; and - -(b) under Patent Claims infringed by the making, using or -selling of Original Software, to make, have made, use, practice, -sell, and offer for sale, and/or otherwise dispose of the -Original Software (or portions thereof); - -(c) The licenses granted in Sections 2.1(a) and (b) are -effective on the date Initial Developer first distributes or -otherwise makes the Original Software available to a third party -under the terms of this License; - -(d) Notwithstanding Section 2.1(b) above, no patent license is -granted: (1) for code that You delete from the Original -Software, or (2) for infringements caused by: (i) the -modification of the Original Software, or (ii) the combination -of the Original Software with other software or devices. - -2.2. Contributor Grant. Conditioned upon Your compliance with -Section 3.1 below and subject to third party intellectual -property claims, each Contributor hereby grants You a -world-wide, royalty-free, non-exclusive license: - -(a) under intellectual property rights (other than patent or -trademark) Licensable by Contributor to use, reproduce, modify, -display, perform, sublicense and distribute the Modifications -created by such Contributor (or portions thereof), either on an -unmodified basis, with other Modifications, as Covered Software -and/or as part of a Larger Work; and - -(b) under Patent Claims infringed by the making, using, or -selling of Modifications made by that Contributor either alone -and/or in combination with its Contributor Version (or portions -of such combination), to make, use, sell, offer for sale, have -made, and/or otherwise dispose of: (1) Modifications made by -that Contributor (or portions thereof); and (2) the combination -of Modifications made by that Contributor with its Contributor -Version (or portions of such combination). - -(c) The licenses granted in Sections 2.2(a) and 2.2(b) -areeffective on the date Contributor first distributes or -otherwise makes the Modifications available to a third party. - -(d) Notwithstanding Section 2.2(b) above, no patent license is -granted: (1) for any code that Contributor has deleted from the -Contributor Version; (2) for infringements caused by: (i) third -party modifications of Contributor Version, or (ii) the -combination of Modifications made by that Contributor with other -software (except as part of the Contributor Version) or other -devices; or (3) under Patent Claims infringed by Covered -Software in the absence of Modifications made by that -Contributor. - -3. Distribution Obligations. - -3.1. Availability of Source Code. Any Covered Software that You -distribute or otherwise make available in Executable form must -also be made available in Source Code form and that Source Code -form must be distributed only under the terms of this License. -You must include a copy of this License with every copy of the -Source Code form of the Covered Software You distribute or -otherwise make available. You must inform recipients of any such -Covered Software in Executable form as to how they can obtain -such Covered Software in Source Code form in a reasonable manner -on or through a medium customarily used for software exchange. - -3.2. Modifications. The Modifications that You create or to -which You contribute are governed by the terms of this License. -You represent that You believe Your Modifications are Your -original creation(s) and/or You have sufficient rights to grant -the rights conveyed by this License. - -3.3. Required Notices. You must include a notice in each of Your -Modifications that identifies You as the Contributor of the -Modification. You may not remove or alter any copyright, patent -or trademark notices contained within the Covered Software, or -any notices of licensing or any descriptive text giving -attribution to any Contributor or the Initial Developer. - -3.4. Application of Additional Terms. You may not offer or -impose any terms on any Covered Software in Source Code form -that alters or restricts the applicable version of this License -or the recipients rights hereunder. You may choose to offer, and -to charge a fee for, warranty, support, indemnity or liability -obligations to one or more recipients of Covered -Software. However, you may do so only on Your own behalf, and -not on behalf of the Initial Developer or any Contributor. You -must make it absolutely clear that any such warranty, support, -indemnity or liability obligation is offered by You alone, and -You hereby agree to indemnify the Initial Developer and every -Contributor for any liability incurred by the Initial Developer -or such Contributor as a result of warranty, support, indemnity -or liability terms You offer. - -3.5. Distribution of Executable Versions. You may distribute the -Executable form of the Covered Software under the terms of this -License or under the terms of a license of Your choice, which -may contain terms different from this License, provided that You -are in compliance with the terms of this License and that the -license for the Executable form does not attempt to limit or -alter the recipients rights in the Source Code form from the -rights set forth in this License. If You distribute the Covered -Software in Executable form under a different license, You must -make it absolutely clear that any terms which differ from this -License are offered by You alone, not by the Initial Developer -or Contributor. You hereby agree to indemnify the Initial -Developer and every Contributor for any liability incurred by -the Initial Developer or such Contributor as a result of any -such terms You offer. - -3.6. Larger Works. You may create a Larger Work by combining -Covered Software with other code not governed by the terms of -this License and distribute the Larger Work as a single product. -In such a case, You must make sure the requirements of this -License are fulfilled for the Covered Software. - -4. Versions of the License. - -4.1. New Versions. Sun Microsystems, Inc. is the initial license -steward and may publish revised and/or new versions of this -License from time to time. Each version will be given a -distinguishing version number. Except as provided in Section -4.3, no one other than the license steward has the right to -modify this License. - -4.2. Effect of New Versions. You may always continue to use, -distribute or otherwise make the Covered Software available -under the terms of the version of the License under which You -originally received the Covered Software. If the Initial -Developer includes a notice in the Original Software prohibiting -it from being distributed or otherwise made available under any -subsequent version of the License, You must distribute and make -the Covered Software available under the terms of the version of -the License under which You originally received the Covered -Software. Otherwise, You may also choose to use, distribute or -otherwise make the Covered Software available under the terms of -any subsequent version of the License published by the license -steward. - -4.3. Modified Versions. When You are an Initial Developer and -You want to create a new license for Your Original Software, You -may create and use a modified version of this License if You: -(a) rename the license and remove any references to the name of -the license steward (except to note that the license differs -from this License); and (b) otherwise make it clear that the -license contains terms which differ from this License. - -5. DISCLAIMER OF WARRANTY. COVERED SOFTWARE IS PROVIDED UNDER -THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, -WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, -MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. -THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED -SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE -DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY -OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, -REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN -ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE -IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -6. TERMINATION. - -6.1. This License and the rights granted hereunder will -terminate automatically if You fail to comply with terms herein -and fail to cure such breach within 30 days of becoming aware of -the breach. Provisions which, by their nature, must remain in -effect beyond the termination of this License shall survive. - -6.2. If You assert a patent infringement claim (excluding -declaratory judgment actions) against Initial Developer or a -Contributor (the Initial Developer or Contributor against whom -You assert such claim is referred to as Participant) alleging -that the Participant Software (meaning the Contributor Version -where the Participant is a Contributor or the Original Software -where the Participant is the Initial Developer) directly or -indirectly infringes any patent, then any and all rights granted -directly or indirectly to You by such Participant, the Initial -Developer (if the Initial Developer is not the Participant) and -all Contributors under Sections 2.1 and/or 2.2 of this License -shall, upon 60 days notice from Participant terminate -prospectively and automatically at the expiration of such 60 day -notice period, unless if within such 60 day period You withdraw -Your claim with respect to the Participant Software against such -Participant either unilaterally or pursuant to a written -agreement with Participant. - -6.3. In the event of termination under Sections 6.1 or 6.2 -above, all end user licenses that have been validly granted by -You or any distributor hereunder prior to termination (excluding -licenses granted to You by any distributor) shall survive -termination. - -7. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO -LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR -OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER -CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY -SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY -INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY -CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST -PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR -MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, -EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY -OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO -LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH -PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH -LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR -LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS -EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -8. U.S. GOVERNMENT END USERS. The Covered Software is a -commercial item, as that term is defined in 48 C.F.R. 2.101 -(Oct. 1995), consisting of commercial computer software (as that -term is defined at 48 C.F.R. 252.227-7014(a)(1)) and commercial -computer software documentation as such terms are used in 48 -C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and -48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all -U.S. Government End Users acquire Covered Software with only -those rights set forth herein. This U.S. Government Rights -clause is in lieu of, and supersedes, any other FAR, DFAR, or -other clause or provision that addresses Government rights in -computer software under this License. - -9. MISCELLANEOUS. This License represents the complete agreement -concerning subject matter hereof. If any provision of this -License is held to be unenforceable, such provision shall be -reformed only to the extent necessary to make it enforceable. -This License shall be governed by the law of the jurisdiction -specified in a notice contained within the Original Software -(except to the extent applicable law, if any, provides -otherwise), excluding such jurisdictions conflict-of-law -provisions. Any litigation relating to this License shall be -subject to the jurisdiction of the courts located in the -jurisdiction and venue specified in a notice contained within -the Original Software, with the losing party responsible for -costs, including, without limitation, court costs and reasonable -attorneys fees and expenses. The application of the United -Nations Convention on Contracts for the International Sale of -Goods is expressly excluded. Any law or regulation which -provides that the language of a contract shall be construed -against the drafter shall not apply to this License. You agree -that You alone are responsible for compliance with the United -States export administration regulations (and the export control -laws and regulation of any other countries) when You use, -distribute or otherwise make available any Covered Software. - -10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and -the Contributors, each party is responsible for claims and -damages arising, directly or indirectly, out of its utilization -of rights under this License and You agree to work with Initial -Developer and Contributors to distribute such responsibility on -an equitable basis. Nothing herein is intended or shall be -deemed to constitute any admission of liability. - ----------------------------------------------------------------- - -NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND -DISTRIBUTION LICENSE (CDDL): This code is released under the -CDDL and shall be governed by the laws of the State of -California (excluding conflict-of-law provisions). Any -litigation relating to this License shall be subject to the -jurisdiction of the Federal Courts of the Northern District of -California and the state courts of the State of California, with -venue lying in Santa Clara County, California. - ----------------------------------------------------------------- diff --git a/parent/org.jvnet.hudson/pom.xml b/parent/org.jvnet.hudson/pom.xml deleted file mode 100644 index bebb4a26ac2..00000000000 --- a/parent/org.jvnet.hudson/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.jvnet.hudson</groupId> - <artifactId>annotation-indexer</artifactId> - <name>annotation-indexer</name> - <version>1.2</version> - <description> - Creates index of annotations. - </description> - - <dependencies> - <dependency> - <groupId>org.kohsuke.metainf-services</groupId> - <artifactId>metainf-services</artifactId> - <version>1.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - -</project> diff --git a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/AnnotationProcessorImpl.java b/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/AnnotationProcessorImpl.java deleted file mode 100644 index 3a7b6c2de62..00000000000 --- a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/AnnotationProcessorImpl.java +++ /dev/null @@ -1,196 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at http://www.sun.com/cddl/cddl.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is SezPoz. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun - * Microsystems, Inc. All Rights Reserved. - */ -package org.jvnet.hudson.annotation_indexer; - -import org.kohsuke.MetaInfServices; - -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.Processor; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedSourceVersion; -import static javax.lang.model.SourceVersion.RELEASE_6; -import static javax.lang.model.SourceVersion.RELEASE_7; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.Elements; -import javax.tools.Diagnostic.Kind; -import javax.tools.FileObject; -import static javax.tools.StandardLocation.CLASS_OUTPUT; -import java.io.BufferedReader; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -/** - * Creates indices of {@link Indexed} annotations. - * - * @author Kohsuke Kawaguchi - */ -@SupportedSourceVersion(RELEASE_7) -@SupportedAnnotationTypes("*") -@SuppressWarnings({"Since15"}) -@MetaInfServices(Processor.class) -public class AnnotationProcessorImpl extends AbstractProcessor { - /** - * Use of an annotation. - */ - private final class Use { - /** - * FQCN of the annotation. - */ - final String annotationName; - /** - * Strings that designate FQCNs where annotations are used, either on a class or its members. - */ - final Set<String> classes = new TreeSet<String>(); - /** - * Keeps track of elements that has the annotation. - */ - final Set<Element> originatingElements = new HashSet<Element>(); - - private Use(String annotationName) { - this.annotationName = annotationName; - } - - void add(Element elt) { - originatingElements.add(elt); - - TypeElement t; - switch (elt.getKind()) { - case CLASS: - t = (TypeElement) elt; - break; - case METHOD: - case FIELD: - t = (TypeElement) elt.getEnclosingElement(); - break; - default: - throw new AssertionError(elt.getKind()); - } - classes.add(getElementUtils().getBinaryName(t).toString()); - } - - String getIndexFileName() { - return "META-INF/annotations/" + annotationName; - } - - /** - * Loads existing index, if it exists. - */ - List<String> loadExisting() throws IOException { - List<String> elements = new ArrayList<String>(); - try { - FileObject in = processingEnv.getFiler().getResource(CLASS_OUTPUT, "", getIndexFileName()); - // Read existing annotations, for incremental compilation. - BufferedReader is = new BufferedReader(new InputStreamReader(in.openInputStream(),"UTF-8")); - try { - String line; - while ((line=is.readLine())!=null) - elements.add(line); - } finally { - is.close(); - } - } catch (FileNotFoundException x) { - // OK, created for the first time - } - return elements; - } - - void write() { - try { - FileObject out = processingEnv.getFiler().createResource(CLASS_OUTPUT, - "", getIndexFileName(), - originatingElements.toArray(new Element[originatingElements.size()])); - - PrintWriter w = new PrintWriter(new OutputStreamWriter(out.openOutputStream(),"UTF-8")); - try { - for (String el : classes) - w.println(el); - } finally { - w.close(); - } - } catch (IOException x) { - processingEnv.getMessager().printMessage(Kind.ERROR, x.toString()); - } - } - } - - private Elements getElementUtils() { - return processingEnv.getElementUtils(); - } - - @Override - public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { - if (roundEnv.processingOver()) - return false; - - // map from indexable annotation names, to actual uses - Map<String,Use> output = new HashMap<String,Use>(); - scan(annotations, roundEnv, output); - for (Use u : output.values()) - u.write(); - return false; - } - - private AnnotationMirror findAnnotationOn(Element e, String name) { - for (AnnotationMirror a : getElementUtils().getAllAnnotationMirrors(e)) - if (getElementUtils().getBinaryName((TypeElement) a.getAnnotationType().asElement()).contentEquals(name)) - return a; - return null; - } - - private void scan(Set<? extends TypeElement> annotations, - RoundEnvironment roundEnv, Map<String,Use> output) { - for (TypeElement ann : annotations) { - AnnotationMirror indexed = findAnnotationOn(ann,Indexed.class.getName()); - if (indexed == null) - continue; // not indexed - - String annName = getElementUtils().getBinaryName(ann).toString(); - Use o = output.get(annName); - if (o==null) - output.put(annName,o=new Use(annName)); - - for (Element elt : roundEnv.getElementsAnnotatedWith(ann)) { - AnnotationMirror marked = findAnnotationOn(elt,annName); - assert marked != null; - - // TODO: validator support - - o.add(elt); - } - } - } - - -} diff --git a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/FilterIterator.java b/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/FilterIterator.java deleted file mode 100644 index 6e0035ddeb0..00000000000 --- a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/FilterIterator.java +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at http://www.sun.com/cddl/cddl.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is SezPoz. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun - * Microsystems, Inc. All Rights Reserved. - */package org.jvnet.hudson.annotation_indexer; - -import java.util.Iterator; -import java.util.NoSuchElementException; - -/** - * @author Kohsuke Kawaguchi - */ -abstract class FilterIterator<T> implements Iterator<T> { - private final Iterator<? extends T> core; - private T next; - private boolean fetched; - - protected FilterIterator(Iterator<? extends T> core) { - this.core = core; - } - - protected FilterIterator(Iterable<? extends T> core) { - this(core.iterator()); - } - - private void fetch() { - while(!fetched && core.hasNext()) { - T n = core.next(); - if(filter(n)) { - next = n; - fetched = true; - } - } - } - - /** - * Filter out items in the original collection. - * - * @return - * true to leave this item and return this item from this iterator. - * false to hide this item. - */ - protected abstract boolean filter(T t); - - public boolean hasNext() { - fetch(); - return fetched; - } - - public T next() { - fetch(); - if(!fetched) throw new NoSuchElementException(); - fetched = false; - return next; - } - - public void remove() { - core.remove(); - } -} diff --git a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Index.java b/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Index.java deleted file mode 100644 index b345f6b797d..00000000000 --- a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Index.java +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at http://www.sun.com/cddl/cddl.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is SezPoz. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun - * Microsystems, Inc. All Rights Reserved. - */package org.jvnet.hudson.annotation_indexer; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.URL; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * @author Kohsuke Kawaguchi - */ -public class Index { - /** - * Lists up all the elements annotated by the given annotation and of the given {@link AnnotatedElement} subtype. - */ - public static <T extends AnnotatedElement> Iterable<T> list(Class<? extends Annotation> type, ClassLoader cl, final Class<T> subType) throws IOException { - final Iterable<AnnotatedElement> base = list(type,cl); - return new Iterable<T>() { - public Iterator<T> iterator() { - return new FilterIterator(base.iterator()) { - protected boolean filter(Object o) { - return subType.isInstance(o); - } - }; - } - }; - } - - /** - * Lists up all the elements annotated by the given annotation. - */ - public static Iterable<AnnotatedElement> list(final Class<? extends Annotation> type, final ClassLoader cl) throws IOException { - if (!type.isAnnotationPresent(Indexed.class)) - throw new IllegalArgumentException(type+" doesn't have @Indexed"); - - final Set<String> ids = new TreeSet<String>(); - - final Enumeration<URL> res = cl.getResources("META-INF/annotations/"+type.getName()); - while (res.hasMoreElements()) { - URL url = res.nextElement(); - BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8")); - String line; - while ((line=r.readLine())!=null) - ids.add(line); - } - - return new Iterable<AnnotatedElement>() { - public Iterator<AnnotatedElement> iterator() { - return new Iterator<AnnotatedElement>() { - /** - * Next element to return. - */ - private AnnotatedElement next; - - private Iterator<String> iditr = ids.iterator(); - - private List<AnnotatedElement> lookaheads = new LinkedList<AnnotatedElement>(); - - public boolean hasNext() { - fetch(); - return next!=null; - } - - public AnnotatedElement next() { - fetch(); - AnnotatedElement r = next; - next = null; - return r; - } - - public void remove() { - throw new UnsupportedOperationException(); - } - - private void fetch() { - while (next==null) { - if (!lookaheads.isEmpty()) { - next = lookaheads.remove(0); - return; - } - - if (!iditr.hasNext()) return; - String name = iditr.next(); - - try { - Class<?> c = cl.loadClass(name); - - if (c.isAnnotationPresent(type)) - lookaheads.add(c); - listAnnotatedElements(c.getDeclaredMethods()); - listAnnotatedElements(c.getDeclaredFields()); - } catch (ClassNotFoundException e) { - LOGGER.log(Level.FINE, "Failed to load: "+name,e); - } - } - } - - private void listAnnotatedElements(AnnotatedElement[] elements) { - for (AnnotatedElement m : elements) { - // this means we don't correctly handle - if (m.isAnnotationPresent(type)) - lookaheads.add(m); - } - } - }; - } - }; - } - - private static final Logger LOGGER = Logger.getLogger(Index.class.getName()); -} diff --git a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Indexed.java b/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Indexed.java deleted file mode 100644 index 25be039f44c..00000000000 --- a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Indexed.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at http://www.sun.com/cddl/cddl.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is SezPoz. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun - * Microsystems, Inc. All Rights Reserved. - */ -package org.jvnet.hudson.annotation_indexer; - -import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Target; - -/** - * Marks annotations that should be indexed during compilation. - * - * @author Kohsuke Kawaguchi - */ -@Documented -@Retention(RUNTIME) -@Target(ANNOTATION_TYPE) -public @interface Indexed { - Class<? extends Validator>[] validators() default {}; -} diff --git a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Validator.java b/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Validator.java deleted file mode 100644 index 4015d2588f8..00000000000 --- a/parent/org.jvnet.hudson/src/main/java/org/jvnet/hudson/annotation_indexer/Validator.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at http://www.sun.com/cddl/cddl.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is SezPoz. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun - * Microsystems, Inc. All Rights Reserved. - */ -package org.jvnet.hudson.annotation_indexer; - -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.ProcessingEnvironment; -import javax.lang.model.element.Element; - -/** - * Checkes the usage of {@link Indexed} annotations at compile-time. - * - * @author Kohsuke Kawaguchi - * @see Indexed - */ -public interface Validator { - /** - * Checks the occurrence of the {@link Indexed} annotation - * and report any error. Useful for early error detection. - */ - void check(Element use, RoundEnvironment e, ProcessingEnvironment env); -} diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index 9d9586d4a7c..00000000000 --- a/parent/pom.xml +++ /dev/null @@ -1,1123 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<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> - <groupId>com.yahoo.vespa</groupId> - <artifactId>parent</artifactId> - <packaging>pom</packaging> - <version>6-SNAPSHOT</version> - <name>parent</name> - <description>Parent artifact for all Vespa maven projects.</description> - <url>http://yahoo.github.io/vespa</url> - - <licenses> - <license> - <name>The Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - - <developers> - <developer> - <name>Yahoo Inc.</name> - <url>https://github.com/yahoo</url> - </developer> - </developers> - - <distributionManagement> - <repository> - <id>bintray-vespa-repo</id> - <url>https://api.bintray.com/maven/yahoo/maven/vespa;publish=1</url> - </repository> - </distributionManagement> - - <scm> - <connection>scm:git:git@github.com:yahoo/vespa.git</connection> - <developerConnection>scm:git:git@github.com:yahoo/vespa.git</developerConnection> - <url>git@github.com:yahoo/vespa.git</url> - </scm> - - <build> - <finalName>${project.artifactId}</finalName> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>2.7</version> - </extension> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0</version> - </extension> - </extensions> - <pluginManagement> - <plugins> - <plugin> - <groupId>com.github.goldin</groupId> - <artifactId>copy-maven-plugin</artifactId> - <version>0.2.5</version> - </plugin> - <plugin> - <groupId>com.infradna.tool</groupId> - <artifactId>bridge-method-injector</artifactId> - <version>1.4</version> - </plugin> - <plugin> - <groupId>org.antlr</groupId> - <artifactId>antlr3-maven-plugin</artifactId> - <version>3.5.2</version> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.4.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <showWarnings>true</showWarnings> - <optimize>true</optimize> - <showDeprecation>false</showDeprecation> - <compilerArgs> - <arg>-Xlint:all</arg> - </compilerArgs> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:${doclint} -Xdoclint:-missing</additionalparam> - </configuration> - <version>2.9</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>3.3</version> - <configuration> - <!-- see http://jira.codehaus.org/browse/MNG-5346 --> - <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> - </configuration> - <executions> - <execution> - <id>mojo-descriptor</id> - <goals> - <goal>descriptor</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.5</version> - <configuration> - <escapeString>\</escapeString> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> - <configuration> - <includePom>true</includePom> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.16</version> - <configuration> - <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile> - <systemPropertyVariables> - <java.io.tmpdir>${project.build.directory}</java.io.tmpdir> - </systemPropertyVariables> - <excludes> - <exclude>**/*SystemTest.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.16</version> - <configuration> - <alwaysGenerateSurefireReport>false</alwaysGenerateSurefireReport> - <showSuccess>false</showSuccess> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.9.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <version>1.0-alpha-2</version> - </plugin> - <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <version>2.15.2</version> - </plugin> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <configGenVersion>${project.version}</configGenVersion> - <useCommonAssemblyIds>true</useCommonAssemblyIds> - </configuration> - </plugin> - - <!-- Eclipse-specific stuff, wrong place, but only option, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=350414 --> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <versionRange>[2.15.2,)</versionRange> - <goals> - <goal>add-source</goal> - <goal>testCompile</goal> - <goal>compile</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - <runOnConfiguration>true</runOnConfiguration> - </execute> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <versionRange>[1.0-alpha-2,)</versionRange> - <goals> - <goal>write-project-properties</goal> - <goal>read-project-properties</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - <runOnConfiguration>true</runOnConfiguration> - </execute> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <versionRange>[1.1,)</versionRange> - <goals> - <goal>java</goal> - <goal>exec</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - <runOnConfiguration>true</runOnConfiguration> - </execute> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <versionRange>[1.3,)</versionRange> - <goals> - <goal>run</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - <runOnConfiguration>true</runOnConfiguration> - </execute> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <versionRange>[2.4,)</versionRange> - <goals> - <goal>javacc</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - <runOnConfiguration>true</runOnConfiguration> - </execute> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.apache.maven.plugins - </groupId> - <artifactId> - maven-jar-plugin - </artifactId> - <versionRange> - [0,) - </versionRange> - <goals> - <goal>jar</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - <runOnConfiguration>true</runOnConfiguration> - </execute> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.yahoo.vespa - </groupId> - <artifactId> - container-maven-plugin - </artifactId> - <versionRange> - [0,) - </versionRange> - <goals> - <goal>generateSources</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - <runOnConfiguration>true</runOnConfiguration> - </execute> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.antlr</groupId> - <artifactId> - antlr3-maven-plugin - </artifactId> - <versionRange>[0,)</versionRange> - <goals> - <goal>antlr</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - <runOnConfiguration>true</runOnConfiguration> - </execute> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - <profiles> - <profile> - <id>attach-sources</id> - <activation> - <property> - <name>!skipSources</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>generate-javadoc</id> - <activation> - <property> - <name>!skipJavadoc</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>package</phase> - <goals> - <goal>javadoc</goal> - </goals> - </execution> - </executions> - <configuration> - <additionalparam>-Xdoclint:${doclint} -Xdoclint:-missing</additionalparam> - <failOnError>${javadoc.failOnError}</failOnError> - <quiet>true</quiet> - <show>private</show> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <includePluginDependencies>true</includePluginDependencies> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/scala</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-test-source</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>src/test/scala</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>systemtests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>none</exclude> - </excludes> - <includes> - <include>**/*SystemTest.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>2.7</version> - </dependency> - <dependency> - <groupId>com.github.cverges.expect4j</groupId> - <artifactId>expect4j</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.8</version> - </dependency> - <dependency> - <groupId>io.airlift</groupId> - <artifactId>airline</artifactId> - <version>0.7</version> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.3.1</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>5.0.3</version> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - <version>1.3.9</version> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>1.3.9</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>18.0</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava-testlib</artifactId> - <version>18.0</version> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>3.0</version> - <classifier>no_aop</classifier> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assistedinject</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>2.4.1</version> - </dependency> - <dependency> - <groupId>com.googlecode.jmockit</groupId> - <artifactId>jmockit</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>com.goldmansachs</groupId> - <artifactId>gs-collections</artifactId> - <version>6.1.0</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-jaxb-annotations</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-base</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-xml-provider</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jdk8</artifactId> - <version>${jackson2.version}</version> - </dependency> - <dependency> - <groupId>com.infradna.tool</groupId> - <artifactId>bridge-method-annotation</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>com.ning</groupId> - <artifactId>async-http-client</artifactId> - <version>1.7.17</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>1.13</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>1.13</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - <version>1.13</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - <version>1.13</version> - </dependency> - <dependency> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-guice</artifactId> - <version>1.13</version> - </dependency> - <dependency> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-multipart</artifactId> - <version>1.13</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>commons-daemon</groupId> - <artifactId>commons-daemon</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.5.6</version> - </dependency> - <!-- Explicitly included to get Zookeeper version 3.4.8, - can be excluded if you want the Zookeeper version - used by curator by default - --> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.8</version> - </dependency> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - <!-- WARNING: If you change this version, you also need to update - zkfacade/src/main/java/org/apache/curator/**/package-info.java - using something like - find zkfacade/src/main/java/org/apache/curator -name package-info.java | \ - xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 2, minor = 9, micro = 1/g' - --> - <version>${curator.version}</version> - </dependency> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-test</artifactId> - <version>${curator.version}</version> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>3.6.5.Final</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit-dep</artifactId> - <version>4.11</version> - </dependency> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr-runtime</artifactId> - <version>3.5.2</version> - </dependency> - <dependency> - <groupId>org.apache.aries.spifly</groupId> - <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> - <version>${aries.spifly.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>4.2.1</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>4.2.1</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>fluent-hc</artifactId> - <version>4.3.6</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.3.6</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.3.3</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>4.3.6</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>3.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>3.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>3.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <version>3.2</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>3.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-interactivity-api</artifactId> - <version>1.0-alpha-5</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-junit4</artifactId> - <version>2.16</version> - </dependency> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-providers</artifactId> - <version>2.16</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>org.cthul</groupId> - <artifactId>cthul-matchers</artifactId> - <version>1.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-server</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-servlet</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.grizzly</groupId> - <artifactId>grizzly-websockets</artifactId> - <version>2.3.2</version> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <version>1.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>uk.co.datumedge</groupId> - <artifactId>hamcrest-json</artifactId> - <version>0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>4.3.0</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>4.3.0</version> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>${scala.version}</version> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-parser-combinators_${scala.major-version}</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-xml_${scala.major-version}</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.major-version}</artifactId> - <version>2.2.2</version> - </dependency> - <dependency> - <groupId>org.json4s</groupId> - <artifactId>json4s-native_${scala.major-version}</artifactId> - <version>3.3.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.5</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>1.7.5</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.5</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>1.7.5</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>4.0.6.RELEASE</version> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.9.10</version> - </dependency> - <dependency> - <groupId>org.twdata.maven</groupId> - <artifactId>mojo-executor</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>net.jpountz.lz4</groupId> - <artifactId>lz4</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>net.spy</groupId> - <artifactId>spymemcached</artifactId> - <version>2.10.1</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.11.0</version> - </dependency> - <!-- jersey 2 support --> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>${javax.ws.rs-api.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-multipart</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-proxy-client</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey2.version}</version> - </dependency> - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>57.1</version> - </dependency> - </dependencies> - </dependencyManagement> - <properties> - <javax.ws.rs-api.version>2.0</javax.ws.rs-api.version> - <aries.spifly.version>1.0.8</aries.spifly.version> - <aries.util.version>1.0.0</aries.util.version> - <asm-debug-all.version>5.0.3</asm-debug-all.version> - <curator.version>2.9.1</curator.version> - <jackson2.version>2.5.3</jackson2.version> - <jersey2.version>2.10.1</jersey2.version> - <jetty.version>9.3.8.v20160314</jetty.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <test.hide>true</test.hide> - <doclint>all</doclint> - <scala.major-version>2.11</scala.major-version> - <scala.version>${scala.major-version}.4</scala.version> - </properties> -</project> diff --git a/persistence/pom.xml b/persistence/pom.xml index 3d887b6bf31..57c6093d6b9 100644 --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>persistence</artifactId> <packaging>container-plugin</packaging> @@ -1,116 +1,1229 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <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> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespa-java-modules</artifactId> - <version>6-SNAPSHOT</version> - <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> + <groupId>com.yahoo.vespa</groupId> + <artifactId>parent</artifactId> + <packaging>pom</packaging> + <version>6-SNAPSHOT</version> + <name>parent</name> + <description>Parent artifact for all Vespa maven projects.</description> + <url>http://yahoo.github.io/vespa</url> - <modules> - <module>annotations</module> - <module>application</module> - <module>application-deploy-plugin</module> - <module>application-model</module> - <module>application-preprocessor</module> - <module>bundle-plugin</module> - <module>chain</module> - <module>clustercontroller-apps</module> - <module>clustercontroller-apputil</module> - <module>clustercontroller-core</module> - <module>clustercontroller-standalone</module> - <module>clustercontroller-utils</module> - <module>component</module> - <module>config-application-package</module> - <module>configdefinitions</module> - <module>configgen</module> - <module>config-bundle</module> - <module>config-class-plugin</module> - <module>config-lib</module> - <module>config-model-api</module> - <module>config-model-fat</module> - <module>config-model</module> - <module>config</module> - <module>config-provisioning</module> - <module>config-proxy</module> - <module>configserver</module> - <module>config_test</module> - <module>container-core</module> - <module>container-accesslogging</module> - <module>container-dev</module> - <module>container-di</module> - <module>container-disc</module> - <module>container-jersey2</module> - <module>container-messagebus</module> - <module>container-search-and-docproc</module> - <module>container-search</module> - <module>container-test-jars</module> - <module>defaults</module> - <module>docproc</module> - <module>docprocs</module> - <module>documentapi</module> - <module>document</module> - <module>documentgen-test</module> - <module>dummy-persistence</module> - <module>fileacquirer</module> - <module>filedistributionmanager</module> - <module>filedistribution</module> - <module>filedistribution_test</module> - <module>fsa</module> - <module>indexinglanguage</module> - <module>jaxrs_client_utils</module> - <module>jaxrs_utils</module> - <module>jdisc_container_maven_archetype_application</module> - <module>jdisc_core</module> - <module>jdisc_core_test</module> - <module>jdisc_http_service</module> - <module>jdisc_jetty</module> - <module>jdisc_jmx_metrics</module> - <module>jdisc_maven_archetype_component</module> - <module>jdisc_messagebus_service</module> - <module>jrt</module> - <module>libmlr</module> - <module>lifecycle_mapping</module> - <module>linguistics</module> - <module>logd</module> - <module>logserver</module> - <module>messagebus-disc</module> - <module>messagebus</module> - <module>metrics</module> - <module>node-repository</module> - <module>node-admin</module> - <module>orchestrator-restapi</module> - <module>orchestrator</module> - <module>parent</module> - <module>persistence</module> - <module>predicate-search</module> - <module>predicate-search-core</module> - <module>processing</module> - <module>provided-dependencies</module> - <module>searchcore</module> - <module>searchlib</module> - <module>searchsummary</module> - <module>serviceview</module> - <module>service-monitor</module> - <module>simplemetrics</module> - <module>socket_test</module> - <module>standalone-container</module> - <module>statistics</module> - <module>storage</module> - <module>testutil</module> - <module>vdslib</module> - <module>vespaclient-core</module> - <module>vespaclient-container-plugin</module> - <module>vespa-application-maven-plugin</module> - <module>vespa-documentgen-plugin</module> - <module>vespa_feed_perf</module> - <module>vespa-http-client</module> - <module>vespa_jersey2</module> - <module>vespajlib</module> - <module>vespalog</module> - <module>vsm</module> - <module>yolean</module> - <module>zkfacade</module> - <module>scalalib</module> - </modules> + <licenses> + <license> + <name>The Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + + <developers> + <developer> + <name>Yahoo Inc.</name> + <url>https://github.com/yahoo</url> + </developer> + </developers> + + <distributionManagement> + <repository> + <id>bintray-vespa-repo</id> + <url>https://api.bintray.com/maven/yahoo/maven/vespa;publish=1</url> + </repository> + </distributionManagement> + + <scm> + <connection>scm:git:git@github.com:yahoo/vespa.git</connection> + <developerConnection>scm:git:git@github.com:yahoo/vespa.git</developerConnection> + <url>git@github.com:yahoo/vespa.git</url> + </scm> + + <build> + <finalName>${project.artifactId}</finalName> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>2.7</version> + </extension> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0</version> + </extension> + </extensions> + <pluginManagement> + <plugins> + <plugin> + <groupId>com.github.goldin</groupId> + <artifactId>copy-maven-plugin</artifactId> + <version>0.2.5</version> + </plugin> + <plugin> + <groupId>com.infradna.tool</groupId> + <artifactId>bridge-method-injector</artifactId> + <version>1.4</version> + </plugin> + <plugin> + <groupId>org.antlr</groupId> + <artifactId>antlr3-maven-plugin</artifactId> + <version>3.5.2</version> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.4.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + <showWarnings>true</showWarnings> + <optimize>true</optimize> + <showDeprecation>false</showDeprecation> + <compilerArgs> + <arg>-Xlint:all</arg> + </compilerArgs> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.8</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <updateReleaseInfo>true</updateReleaseInfo> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <additionalparam>-Xdoclint:${doclint} -Xdoclint:-missing</additionalparam> + </configuration> + <version>2.9</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>3.3</version> + <configuration> + <!-- see http://jira.codehaus.org/browse/MNG-5346 --> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <id>mojo-descriptor</id> + <goals> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.7</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.5</version> + <configuration> + <escapeString>\</escapeString> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + <configuration> + <includePom>true</includePom> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.16</version> + <configuration> + <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile> + <systemPropertyVariables> + <java.io.tmpdir>${project.build.directory}</java.io.tmpdir> + </systemPropertyVariables> + <excludes> + <exclude>**/*SystemTest.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.16</version> + <configuration> + <alwaysGenerateSurefireReport>false</alwaysGenerateSurefireReport> + <showSuccess>false</showSuccess> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.9.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + </plugin> + <plugin> + <groupId>org.scala-tools</groupId> + <artifactId>maven-scala-plugin</artifactId> + <version>2.15.2</version> + </plugin> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <configGenVersion>${project.version}</configGenVersion> + <useCommonAssemblyIds>true</useCommonAssemblyIds> + </configuration> + </plugin> + + <!-- Eclipse-specific stuff, wrong place, but only option, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=350414 --> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.scala-tools</groupId> + <artifactId>maven-scala-plugin</artifactId> + <versionRange>[2.15.2,)</versionRange> + <goals> + <goal>add-source</goal> + <goal>testCompile</goal> + <goal>compile</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <versionRange>[1.0-alpha-2,)</versionRange> + <goals> + <goal>write-project-properties</goal> + <goal>read-project-properties</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <versionRange>[1.1,)</versionRange> + <goals> + <goal>java</goal> + <goal>exec</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <versionRange>[1.3,)</versionRange> + <goals> + <goal>run</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <versionRange>[2.4,)</versionRange> + <goals> + <goal>javacc</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.apache.maven.plugins + </groupId> + <artifactId> + maven-jar-plugin + </artifactId> + <versionRange> + [0,) + </versionRange> + <goals> + <goal>jar</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + com.yahoo.vespa + </groupId> + <artifactId> + container-maven-plugin + </artifactId> + <versionRange> + [0,) + </versionRange> + <goals> + <goal>generateSources</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.antlr</groupId> + <artifactId> + antlr3-maven-plugin + </artifactId> + <versionRange>[0,)</versionRange> + <goals> + <goal>antlr</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> + <profile> + <id>attach-sources</id> + <activation> + <property> + <name>!skipSources</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>generate-javadoc</id> + <activation> + <property> + <name>!skipJavadoc</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>generate-javadoc</id> + <phase>package</phase> + <goals> + <goal>javadoc</goal> + </goals> + </execution> + </executions> + <configuration> + <additionalparam>-Xdoclint:${doclint} -Xdoclint:-missing</additionalparam> + <failOnError>${javadoc.failOnError}</failOnError> + <quiet>true</quiet> + <show>private</show> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>coverage</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <configuration> + <includePluginDependencies>true</includePluginDependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/scala</source> + </sources> + </configuration> + </execution> + <execution> + <id>add-test-source</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>src/test/scala</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>systemtests</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>none</exclude> + </excludes> + <includes> + <include>**/*SystemTest.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>2.7</version> + </dependency> + <dependency> + <groupId>com.github.cverges.expect4j</groupId> + <artifactId>expect4j</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>io.airlift</groupId> + <artifactId>airline</artifactId> + <version>0.7</version> + </dependency> + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>3.3.1</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>5.0.3</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + <version>1.3.9</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>1.3.9</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>18.0</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-testlib</artifactId> + <version>18.0</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>3.0</version> + <classifier>no_aop</classifier> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-assistedinject</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>com.googlecode.jmockit</groupId> + <artifactId>jmockit</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>com.goldmansachs</groupId> + <artifactId>gs-collections</artifactId> + <version>6.1.0</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-base</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-xml-provider</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jdk8</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <groupId>com.infradna.tool</groupId> + <artifactId>bridge-method-annotation</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>com.ning</groupId> + <artifactId>async-http-client</artifactId> + <version>1.7.17</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + <version>1.13</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + <version>1.13</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + <version>1.13</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + <version>1.13</version> + </dependency> + <dependency> + <groupId>com.sun.jersey.contribs</groupId> + <artifactId>jersey-guice</artifactId> + <version>1.13</version> + </dependency> + <dependency> + <groupId>com.sun.jersey.contribs</groupId> + <artifactId>jersey-multipart</artifactId> + <version>1.13</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>commons-daemon</groupId> + <artifactId>commons-daemon</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.5.6</version> + </dependency> + <!-- Explicitly included to get Zookeeper version 3.4.8, + can be excluded if you want the Zookeeper version + used by curator by default + --> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.4.8</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-recipes</artifactId> + <!-- WARNING: If you change this version, you also need to update + zkfacade/src/main/java/org/apache/curator/**/package-info.java + using something like + find zkfacade/src/main/java/org/apache/curator -name package-info.java | \ + xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 2, minor = 9, micro = 1/g' + --> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-test</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <version>3.6.5.Final</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit-dep</artifactId> + <version>4.11</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr-runtime</artifactId> + <version>3.5.2</version> + </dependency> + <dependency> + <groupId>org.apache.aries.spifly</groupId> + <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> + <version>${aries.spifly.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>4.2.1</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>4.2.1</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>fluent-hc</artifactId> + <version>4.3.6</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.6</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3.3</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>4.3.6</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.2.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interactivity-api</artifactId> + <version>1.0-alpha-5</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-junit4</artifactId> + <version>2.16</version> + </dependency> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-providers</artifactId> + <version>2.16</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>org.cthul</groupId> + <artifactId>cthul-matchers</artifactId> + <version>1.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-servlet</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.grizzly</groupId> + <artifactId>grizzly-websockets</artifactId> + <version>2.3.2</version> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>uk.co.datumedge</groupId> + <artifactId>hamcrest-json</artifactId> + <version>0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.5</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>4.3.0</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>4.3.0</version> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-compiler</artifactId> + <version>${scala.version}</version> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>${scala.version}</version> + </dependency> + <dependency> + <groupId>org.scala-lang.modules</groupId> + <artifactId>scala-parser-combinators_${scala.major-version}</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.scala-lang.modules</groupId> + <artifactId>scala-xml_${scala.major-version}</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_${scala.major-version}</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.json4s</groupId> + <artifactId>json4s-native_${scala.major-version}</artifactId> + <version>3.3.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>1.7.5</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>1.7.5</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.5</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>1.7.5</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>4.0.6.RELEASE</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.9.10</version> + </dependency> + <dependency> + <groupId>org.twdata.maven</groupId> + <artifactId>mojo-executor</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>net.jpountz.lz4</groupId> + <artifactId>lz4</artifactId> + <version>1.3.0</version> + </dependency> + <dependency> + <groupId>net.spy</groupId> + <artifactId>spymemcached</artifactId> + <version>2.10.1</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.11.0</version> + </dependency> + <!-- jersey 2 support --> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${javax.ws.rs-api.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> + <version>${jersey2.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet</artifactId> + <version>${jersey2.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + <version>${jersey2.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-multipart</artifactId> + <version>${jersey2.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.ext</groupId> + <artifactId>jersey-proxy-client</artifactId> + <version>${jersey2.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey2.version}</version> + </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>57.1</version> + </dependency> + </dependencies> + </dependencyManagement> + + <properties> + <javax.ws.rs-api.version>2.0</javax.ws.rs-api.version> + <aries.spifly.version>1.0.8</aries.spifly.version> + <aries.util.version>1.0.0</aries.util.version> + <asm-debug-all.version>5.0.3</asm-debug-all.version> + <curator.version>2.9.1</curator.version> + <jackson2.version>2.5.3</jackson2.version> + <jersey2.version>2.10.1</jersey2.version> + <jetty.version>9.3.8.v20160314</jetty.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <test.hide>true</test.hide> + <doclint>all</doclint> + <scala.major-version>2.11</scala.major-version> + <scala.version>${scala.major-version}.4</scala.version> + </properties> + + <modules> + <module>annotations</module> + <module>application</module> + <module>application-deploy-plugin</module> + <module>application-model</module> + <module>application-preprocessor</module> + <module>bundle-plugin</module> + <module>chain</module> + <module>clustercontroller-apps</module> + <module>clustercontroller-apputil</module> + <module>clustercontroller-core</module> + <module>clustercontroller-standalone</module> + <module>clustercontroller-utils</module> + <module>component</module> + <module>config-application-package</module> + <module>configdefinitions</module> + <module>configgen</module> + <module>config-bundle</module> + <module>config-class-plugin</module> + <module>config-lib</module> + <module>config-model-api</module> + <module>config-model-fat</module> + <module>config-model</module> + <module>config</module> + <module>config-provisioning</module> + <module>config-proxy</module> + <module>configserver</module> + <module>config_test</module> + <module>container-core</module> + <module>container-accesslogging</module> + <module>container-dev</module> + <module>container-di</module> + <module>container-disc</module> + <module>container-jersey2</module> + <module>container-messagebus</module> + <module>container-search-and-docproc</module> + <module>container-search</module> + <module>container-test-jars</module> + <module>defaults</module> + <module>docproc</module> + <module>docprocs</module> + <module>documentapi</module> + <module>document</module> + <module>documentgen-test</module> + <module>dummy-persistence</module> + <module>fileacquirer</module> + <module>filedistributionmanager</module> + <module>filedistribution</module> + <module>filedistribution_test</module> + <module>fsa</module> + <module>indexinglanguage</module> + <module>jaxrs_client_utils</module> + <module>jaxrs_utils</module> + <module>jdisc_container_maven_archetype_application</module> + <module>jdisc_core</module> + <module>jdisc_core_test</module> + <module>jdisc_http_service</module> + <module>jdisc_jetty</module> + <module>jdisc_jmx_metrics</module> + <module>jdisc_maven_archetype_component</module> + <module>jdisc_messagebus_service</module> + <module>jrt</module> + <module>libmlr</module> + <module>lifecycle_mapping</module> + <module>linguistics</module> + <module>logd</module> + <module>logserver</module> + <module>messagebus-disc</module> + <module>messagebus</module> + <module>metrics</module> + <module>node-repository</module> + <module>node-admin</module> + <module>orchestrator-restapi</module> + <module>orchestrator</module> + <module>persistence</module> + <module>predicate-search</module> + <module>predicate-search-core</module> + <module>processing</module> + <module>provided-dependencies</module> + <module>searchcore</module> + <module>searchlib</module> + <module>searchsummary</module> + <module>serviceview</module> + <module>service-monitor</module> + <module>simplemetrics</module> + <module>socket_test</module> + <module>standalone-container</module> + <module>statistics</module> + <module>storage</module> + <module>testutil</module> + <module>vdslib</module> + <module>vespaclient-core</module> + <module>vespaclient-container-plugin</module> + <module>vespa-application-maven-plugin</module> + <module>vespa-documentgen-plugin</module> + <module>vespa_feed_perf</module> + <module>vespa-http-client</module> + <module>vespa_jersey2</module> + <module>vespajlib</module> + <module>vespalog</module> + <module>vsm</module> + <module>yolean</module> + <module>zkfacade</module> + <module>scalalib</module> + </modules> </project> diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index ad5d6002b66..546d1f5b514 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>predicate-search-core</artifactId> <version>6-SNAPSHOT</version> diff --git a/predicate-search/pom.xml b/predicate-search/pom.xml index fe81578c4d7..9906a46654b 100644 --- a/predicate-search/pom.xml +++ b/predicate-search/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>predicate-search</artifactId> <version>6-SNAPSHOT</version> diff --git a/processing/pom.xml b/processing/pom.xml index 3cc44b66e05..a5f25d0aa0f 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>processing</artifactId> <packaging>jar</packaging> diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 332fff2a62f..0300ef1d9c4 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>provided-dependencies</artifactId> <packaging>jar</packaging> diff --git a/scalalib/pom.xml b/scalalib/pom.xml index a9b0cade639..94706777f8d 100644 --- a/scalalib/pom.xml +++ b/scalalib/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>scalalib</artifactId> <packaging>jar</packaging> diff --git a/searchcore/pom.xml b/searchcore/pom.xml index 6654c75ba26..04d9f3d0021 100644 --- a/searchcore/pom.xml +++ b/searchcore/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>searchcore</artifactId> <version>6-SNAPSHOT</version> diff --git a/searchlib/pom.xml b/searchlib/pom.xml index 565370de634..88361289509 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>searchlib</artifactId> <packaging>container-plugin</packaging> diff --git a/searchsummary/pom.xml b/searchsummary/pom.xml index 0676ac78527..461a808d232 100644 --- a/searchsummary/pom.xml +++ b/searchsummary/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>searchsummary</artifactId> <version>6-SNAPSHOT</version> diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 89cb8a2b719..960cbd3605b 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>service-monitor</artifactId> <packaging>container-plugin</packaging> diff --git a/serviceview/pom.xml b/serviceview/pom.xml index bdca519f2b6..8ec82ca2bd2 100644 --- a/serviceview/pom.xml +++ b/serviceview/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>serviceview</artifactId> <packaging>container-plugin</packaging> diff --git a/simplemetrics/pom.xml b/simplemetrics/pom.xml index 2ce63747ff5..7f3388c08ca 100644 --- a/simplemetrics/pom.xml +++ b/simplemetrics/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>simplemetrics</artifactId> <packaging>container-plugin</packaging> diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index eb5665760c4..538a885b031 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>standalone-container</artifactId> <version>6-SNAPSHOT</version> diff --git a/statistics/pom.xml b/statistics/pom.xml index 09c81dccb71..e00b611581a 100644 --- a/statistics/pom.xml +++ b/statistics/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>statistics</artifactId> <version>6-SNAPSHOT</version> diff --git a/storage/pom.xml b/storage/pom.xml index b4c8e430f04..ffbc30853b6 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>storage</artifactId> <version>6-SNAPSHOT</version> diff --git a/testutil/pom.xml b/testutil/pom.xml index cd20d0db597..0d2aa8a4dbf 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>testutil</artifactId> <packaging>jar</packaging> diff --git a/vdslib/pom.xml b/vdslib/pom.xml index 994fe8ddf5e..0f769fe5b3f 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vdslib</artifactId> <packaging>container-plugin</packaging> diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 1ad7a335d47..a70525e67de 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespa-application-maven-plugin</artifactId> <version>6-SNAPSHOT</version> diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index f75637e1978..0c5b957c14b 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespa-documentgen-plugin</artifactId> <packaging>maven-plugin</packaging> diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index b4ae744734e..ad352cfe4cd 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespa-http-client</artifactId> <version>6-SNAPSHOT</version> diff --git a/vespa_application_maven_archetype_plugin/pom.xml b/vespa_application_maven_archetype_plugin/pom.xml index e1c2fb8e89a..4f9c8ae444d 100644 --- a/vespa_application_maven_archetype_plugin/pom.xml +++ b/vespa_application_maven_archetype_plugin/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <!-- Package name must contain _maven_archetype --> <artifactId>vespa_application_maven_archetype_plugin</artifactId> diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index c78d18f055a..35f292d5f16 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -13,7 +13,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespa_feed_perf</artifactId> <version>6-SNAPSHOT</version> diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index d510e1f92d5..5d65eadec40 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -9,7 +9,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespa_jersey2</artifactId> <version>6-SNAPSHOT</version> diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index 017216c3cbd..422565f55ae 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespaclient-container-plugin</artifactId> <version>6-SNAPSHOT</version> diff --git a/vespaclient-core/pom.xml b/vespaclient-core/pom.xml index 01705141ee0..660d3326f49 100644 --- a/vespaclient-core/pom.xml +++ b/vespaclient-core/pom.xml @@ -7,7 +7,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespaclient-core</artifactId> <version>6-SNAPSHOT</version> diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index 38028810afb..0282cc94ff6 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespajlib</artifactId> <packaging>container-plugin</packaging> diff --git a/vespalog/pom.xml b/vespalog/pom.xml index 5a39f43b1c3..e25d4e66a56 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vespalog</artifactId> <version>6-SNAPSHOT</version> diff --git a/vsm/pom.xml b/vsm/pom.xml index f0932d0ffc6..5962dc5f61d 100644 --- a/vsm/pom.xml +++ b/vsm/pom.xml @@ -8,7 +8,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>vsm</artifactId> <version>6-SNAPSHOT</version> diff --git a/yolean/pom.xml b/yolean/pom.xml index c832f5e7f46..75809187eba 100644 --- a/yolean/pom.xml +++ b/yolean/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>yolean</artifactId> <version>6-SNAPSHOT</version> diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index d35d1f6b006..46070faa23a 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>zkfacade</artifactId> <packaging>container-plugin</packaging> |