From 204b3893c22eed78f85f5b40ada3f0690fbcd70e Mon Sep 17 00:00:00 2001 From: gjoranv Date: Tue, 28 Nov 2017 14:37:47 +0100 Subject: Split parent + container-dependency-versions from root pom. - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. --- container-search/pom.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'container-search') diff --git a/container-search/pom.xml b/container-search/pom.xml index f622567acde..8e41a576a27 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent container-search jar -- cgit v1.2.3 From 1c5eb1dafb6419158cf848d5acfea62d0a5824fc Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 29 Nov 2017 15:06:46 +0100 Subject: Revert "Gjoranv/split parent" --- annotations/pom.xml | 1 - application-deploy-plugin/pom.xml | 1 - application-model/pom.xml | 1 - application-preprocessor/pom.xml | 1 - application/pom.xml | 1 - athenz-identity-provider-service/pom.xml | 1 - bootstrap.sh | 10 +- bundle-plugin-test/pom.xml | 1 - bundle-plugin/pom.xml | 1 - chain/pom.xml | 1 - clustercontroller-apps/pom.xml | 1 - clustercontroller-apputil/pom.xml | 1 - clustercontroller-core/pom.xml | 1 - clustercontroller-standalone/pom.xml | 1 - clustercontroller-utils/pom.xml | 1 - component/pom.xml | 1 - config-application-package/pom.xml | 1 - config-bundle/pom.xml | 1 - config-class-plugin/pom.xml | 1 - config-lib/pom.xml | 1 - config-model-api/pom.xml | 1 - config-model-fat/pom.xml | 1 - config-model/pom.xml | 1 - config-provisioning/pom.xml | 1 - config-proxy/pom.xml | 1 - config/pom.xml | 1 - configdefinitions/pom.xml | 1 - configgen/pom.xml | 1 - configserver/pom.xml | 1 - container-accesslogging/pom.xml | 1 - container-core/pom.xml | 1 - container-dependencies-enforcer/pom.xml | 45 +- container-dependency-versions/pom.xml | 369 ------------ container-dev/pom.xml | 1 - container-di/pom.xml | 1 - container-disc/pom.xml | 1 - container-jersey2/pom.xml | 1 - container-messagebus/pom.xml | 1 - container-search-and-docproc/pom.xml | 1 - container-search/pom.xml | 1 - container-test-jars/pom.xml | 1 - container-test/pom.xml | 1 - container/pom.xml | 1 - controller-api/pom.xml | 1 - controller-server/pom.xml | 1 - defaults/pom.xml | 7 +- docker-api/pom.xml | 1 - docproc/pom.xml | 1 - docprocs/pom.xml | 1 - document/pom.xml | 1 - documentapi/pom.xml | 1 - documentgen-test/pom.xml | 1 - fileacquirer/pom.xml | 1 - filedistribution/pom.xml | 3 +- filedistribution_test/pom.xml | 1 - filedistributionmanager/pom.xml | 1 - fsa/pom.xml | 1 - indexinglanguage/pom.xml | 1 - jaxrs_client_utils/pom.xml | 1 - jaxrs_utils/pom.xml | 1 - jdisc_core/pom.xml | 1 - jdisc_core_test/pom.xml | 1 - jdisc_http_service/pom.xml | 1 - jdisc_jetty/pom.xml | 1 - jdisc_messagebus_service/pom.xml | 1 - jrt/pom.xml | 1 - linguistics/pom.xml | 2 - logd/pom.xml | 1 - logserver/pom.xml | 1 - maven-plugins/pom.xml | 1 - messagebus-disc/pom.xml | 1 - messagebus/pom.xml | 1 - metrics/pom.xml | 1 - node-admin/pom.xml | 1 - node-maintainer/pom.xml | 1 - node-repository/pom.xml | 1 - orchestrator-restapi/pom.xml | 1 - orchestrator/pom.xml | 1 - parent/pom.xml | 758 ------------------------- pom.xml | 942 ++++++++++++++++++++++++++++++- predicate-search-core/pom.xml | 1 - predicate-search/pom.xml | 1 - processing/pom.xml | 1 - provided-dependencies/pom.xml | 1 - searchcore/pom.xml | 1 - searchlib/pom.xml | 1 - searchsummary/pom.xml | 1 - service-monitor/pom.xml | 2 - serviceview/pom.xml | 1 - simplemetrics/pom.xml | 1 - socket_test/pom.xml | 1 - standalone-container/pom.xml | 1 - statistics/pom.xml | 1 - storage/pom.xml | 1 - testutil/pom.xml | 2 - vdslib/pom.xml | 1 - vespa-application-maven-plugin/pom.xml | 1 - vespa-documentgen-plugin/pom.xml | 1 - vespa-hadoop/pom.xml | 1 - vespa-http-client/pom.xml | 1 - vespa_feed_perf/pom.xml | 1 - vespa_jersey2/pom.xml | 1 - vespaclient-container-plugin/pom.xml | 1 - vespaclient-core/pom.xml | 1 - vespaclient-java/pom.xml | 1 - vespajlib/pom.xml | 1 - vespalog/pom.xml | 1 - vsm/pom.xml | 1 - yolean/pom.xml | 1 - zkfacade/pom.xml | 1 - 110 files changed, 965 insertions(+), 1275 deletions(-) delete mode 100644 container-dependency-versions/pom.xml delete mode 100644 parent/pom.xml (limited to 'container-search') diff --git a/annotations/pom.xml b/annotations/pom.xml index 78f65b6d2b7..146eb5e9be2 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent annotations jar diff --git a/application-deploy-plugin/pom.xml b/application-deploy-plugin/pom.xml index d402257fc7c..3cae7cf7831 100644 --- a/application-deploy-plugin/pom.xml +++ b/application-deploy-plugin/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent application-deploy-plugin 6-SNAPSHOT diff --git a/application-model/pom.xml b/application-model/pom.xml index 5ea1ef7cd3b..13a2d3ea49b 100644 --- a/application-model/pom.xml +++ b/application-model/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent application-model container-plugin diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index 22fd1688957..4fa319a881a 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent application-preprocessor jar diff --git a/application/pom.xml b/application/pom.xml index 5445d57bf9f..17e9ece3543 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent application jar diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 82de5511238..c87589d7be2 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -11,7 +11,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent diff --git a/bootstrap.sh b/bootstrap.sh index b71af73c529..075da74b7c7 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -44,16 +44,8 @@ $top/dist/getversion.pl -M $top > $top/dist/vtag.map # The 'default' mode also builds some modules needed by C++ code. # The 'full' mode also builds modules needed by C++ tests. -# must install parent poms first: +# must install parent pom first: echo "Downloading all dependencies. This may take a few minutes with an empty Maven cache." -( - cd container-dependency-versions - mvn_install -) -( - cd parent - mvn_install -) mvn_install -N # and build plugins first: diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index b52f52b9b87..8d8bf48cc07 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent com.yahoo.vespa bundle-plugin-test diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index d92df4eb78f..02f0ed2ccf5 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent bundle-plugin 6-SNAPSHOT diff --git a/chain/pom.xml b/chain/pom.xml index da6cdd37ce4..a3096d37748 100755 --- a/chain/pom.xml +++ b/chain/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent chain jar diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml index e882a2ebd79..26f466eb208 100644 --- a/clustercontroller-apps/pom.xml +++ b/clustercontroller-apps/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent clustercontroller-apps 6-SNAPSHOT diff --git a/clustercontroller-apputil/pom.xml b/clustercontroller-apputil/pom.xml index b2657840d7a..68adc82596f 100644 --- a/clustercontroller-apputil/pom.xml +++ b/clustercontroller-apputil/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent clustercontroller-apputil 6-SNAPSHOT diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 059da070f3e..499dee0d1de 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent clustercontroller-core 6-SNAPSHOT diff --git a/clustercontroller-standalone/pom.xml b/clustercontroller-standalone/pom.xml index 2c3d77692bc..f51555a92b6 100644 --- a/clustercontroller-standalone/pom.xml +++ b/clustercontroller-standalone/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent clustercontroller-standalone 6-SNAPSHOT diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index 16efc57bf7c..f151a623ff9 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent clustercontroller-utils 6-SNAPSHOT diff --git a/component/pom.xml b/component/pom.xml index b9b0a76839a..92f852e4ba0 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent component container-plugin diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 5881401d940..90d4a2d9af6 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config-application-package container-plugin diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index 53c763e0097..7121756ce68 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config-bundle container-plugin diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index b0345c5fa32..5b3149a13da 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config-class-plugin maven-plugin diff --git a/config-lib/pom.xml b/config-lib/pom.xml index aa2a5cbad01..2ed993dd052 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config-lib container-plugin diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index dabe702d910..6618612df31 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config-model-api 6-SNAPSHOT diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 2efed91e73d..a4bbba0e6e8 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config-model-fat bundle diff --git a/config-model/pom.xml b/config-model/pom.xml index 2f85b559e5f..0fdc09e1a61 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config-model container-plugin diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml index db804606290..ebe7d460989 100644 --- a/config-provisioning/pom.xml +++ b/config-provisioning/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent com.yahoo.vespa config-provisioning diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index ea51d5089ca..0aadb1bbb12 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config-proxy jar diff --git a/config/pom.xml b/config/pom.xml index 0f7ab6720c0..f73c5b7bfd8 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent config container-plugin diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 5a754c100fa..92980a18899 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent configdefinitions container-plugin diff --git a/configgen/pom.xml b/configgen/pom.xml index 2175fe6cc87..6e550ec7321 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent configgen jar diff --git a/configserver/pom.xml b/configserver/pom.xml index 288a52eb9d8..30d92dc7650 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent configserver container-plugin diff --git a/container-accesslogging/pom.xml b/container-accesslogging/pom.xml index 0c352818870..45d7b4a2ed2 100644 --- a/container-accesslogging/pom.xml +++ b/container-accesslogging/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-accesslogging 6-SNAPSHOT diff --git a/container-core/pom.xml b/container-core/pom.xml index 20e8a11a9fd..c608f35f26c 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-core 6-SNAPSHOT diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 3b5377ee5d8..61495384744 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-dependencies-enforcer @@ -82,36 +81,36 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:[2.5.4, ${jackson2.version}]:jar:provided com.fasterxml.jackson.module:jackson-module-jaxb-annotations:[2.5.4, ${jackson2.version}]:jar:provided - com.google.code.findbugs:annotations:[${findbugs.version}]:jar:provided - com.google.code.findbugs:jsr305:[${findbugs.version}]:jar:provided - com.google.guava:guava:[${guava.version}]:jar:provided - com.google.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided - com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar:provided - com.google.inject:guice:[${guice.version}]:jar:provided:no_aop + com.google.code.findbugs:annotations:[1.3.9]:jar:provided + com.google.code.findbugs:jsr305:[1.3.9]:jar:provided + com.google.guava:guava:[18.0]:jar:provided + com.google.inject.extensions:guice-assistedinject:[3.0]:jar:provided + com.google.inject.extensions:guice-multibindings:[3.0]:jar:provided + com.google.inject:guice:[3.0]:jar:provided:no_aop commons-codec:commons-codec:[1.4]:jar:provided commons-daemon:commons-daemon:[1.0.3]:jar:provided commons-logging:commons-logging:[1.1.1]:jar:provided - javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided + javax.annotation:javax.annotation-api:[1.2]:jar:provided javax.inject:javax.inject:[1]:jar:provided javax.servlet:javax.servlet-api:[3.1.0]:jar:provided - javax.validation:validation-api:[${javax.validation-api.version}]:jar:provided + javax.validation:validation-api:[1.1.0.Final]:jar:provided javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided net.jcip:jcip-annotations:[1.0]:jar:provided net.jpountz.lz4:lz4:[1.3.0]:jar:provided - org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided + org.apache.felix:org.apache.felix.framework:[4.2.1]:jar:provided org.apache.felix:org.apache.felix.log:[1.0.1]:jar:provided - org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided + org.apache.felix:org.apache.felix.main:[4.2.1]:jar:provided org.apache.httpcomponents:httpclient:[4.3.6]:jar:provided org.apache.httpcomponents:httpcore:[4.3.3]:jar:provided org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:provided org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:provided - org.glassfish.hk2.external:aopalliance-repackaged:[${hk2.version}]:jar:provided - org.glassfish.hk2.external:javax.inject:[${hk2.version}]:jar:provided - org.glassfish.hk2:hk2-api:[${hk2.version}]:jar:provided - org.glassfish.hk2:hk2-locator:[${hk2.version}]:jar:provided - org.glassfish.hk2:hk2-utils:[${hk2.version}]:jar:provided - org.glassfish.hk2:osgi-resource-locator:[${hk2.osgi-resource-locator.version}]:jar:provided + org.glassfish.hk2.external:aopalliance-repackaged:[2.5.0-b05]:jar:provided + org.glassfish.hk2.external:javax.inject:[2.5.0-b05]:jar:provided + org.glassfish.hk2:hk2-api:[2.5.0-b05]:jar:provided + org.glassfish.hk2:hk2-locator:[2.5.0-b05]:jar:provided + org.glassfish.hk2:hk2-utils:[2.5.0-b05]:jar:provided + org.glassfish.hk2:osgi-resource-locator:[1.0.1]:jar:provided org.glassfish.jersey.bundles.repackaged:jersey-guava:[${jersey2.version}]:jar:provided org.glassfish.jersey.containers:jersey-container-servlet-core:[${jersey2.version}]:jar:provided org.glassfish.jersey.containers:jersey-container-servlet:[${jersey2.version}]:jar:provided @@ -123,13 +122,13 @@ org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided - org.javassist:javassist:[${javassist.version}]:jar:provided + org.javassist:javassist:[3.20.0-GA]:jar:provided org.json:json:[20090211]:jar:provided - org.jvnet.mimepull:mimepull:[${mimepull.version}]:jar:provided - org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided - org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided - org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided - org.slf4j:slf4j-jdk14:[${slf4j.version}]:jar:provided + org.jvnet.mimepull:mimepull:[1.9.6]:jar:provided + org.slf4j:jcl-over-slf4j:[1.7.5]:jar:provided + org.slf4j:log4j-over-slf4j:[1.7.5]:jar:provided + org.slf4j:slf4j-api:[1.7.5]:jar:provided + org.slf4j:slf4j-jdk14:[1.7.5]:jar:provided xml-apis:xml-apis:[1.4.01]:jar:provided diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml deleted file mode 100644 index 5007e91c916..00000000000 --- a/container-dependency-versions/pom.xml +++ /dev/null @@ -1,369 +0,0 @@ - - - - 4.0.0 - com.yahoo.vespa - container-dependency-versions - pom - 6-SNAPSHOT - Dependency versions for all Vespa maven projects. - https://github.com/vespa-engine - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - - - aopalliance - aopalliance - 1.0 - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson2.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson2.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson2.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson2.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson2.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson2.version} - - - com.google.code.findbugs - annotations - ${findbugs.version} - - - com.google.code.findbugs - jsr305 - ${findbugs.version} - - - com.google.guava - guava - ${guava.version} - - - com.google.inject.extensions - guice-assistedinject - ${guice.version} - - - com.google.inject.extensions - guice-multibindings - ${guice.version} - - - com.google.inject - guice - ${guice.version} - - - com.google.inject - guice - ${guice.version} - no_aop - - - commons-codec - commons-codec - 1.4 - - - commons-daemon - commons-daemon - 1.0.3 - - - - commons-logging - commons-logging - 1.1.1 - - - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} - - - javax.inject - javax.inject - 1 - - - javax.servlet - javax.servlet-api - 3.1.0 - - - javax.validation - validation-api - ${javax.validation-api.version} - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} - - - net.jcip - jcip-annotations - 1.0 - - - net.jpountz.lz4 - lz4 - 1.3.0 - - - org.apache.felix - org.apache.felix.framework - ${felix.version} - - - org.apache.felix - org.apache.felix.log - 1.0.1 - - - org.apache.felix - org.apache.felix.main - ${felix.version} - - - org.apache.httpcomponents - httpclient - 4.3.6 - - - org.apache.httpcomponents - httpcore - 4.3.3 - - - org.eclipse.jetty - jetty-http - ${jetty.version} - - - org.eclipse.jetty - jetty-io - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.glassfish.hk2.external - aopalliance-repackaged - ${hk2.version} - - - org.glassfish.hk2.external - javax.inject - ${hk2.version} - - - org.glassfish.hk2 - hk2-api - ${hk2.version} - - - org.glassfish.hk2 - hk2-locator - ${hk2.version} - - - org.glassfish.hk2 - hk2-utils - ${hk2.version} - - - org.glassfish.hk2 - osgi-resource-locator - ${hk2.osgi-resource-locator.version} - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - ${jersey2.version} - - - org.glassfish.jersey.containers - jersey-container-servlet-core - ${jersey2.version} - - - org.glassfish.jersey.containers - jersey-container-servlet - ${jersey2.version} - - - org.glassfish.jersey.core - jersey-client - ${jersey2.version} - - - org.glassfish.jersey.core - jersey-common - ${jersey2.version} - - - org.glassfish.jersey.core - jersey-server - ${jersey2.version} - - - org.glassfish.jersey.ext - jersey-entity-filtering - ${jersey2.version} - - - org.glassfish.jersey.ext - jersey-proxy-client - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-jaxb - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-multipart - ${jersey2.version} - - - org.javassist - javassist - ${javassist.version} - - - org.json - json - 20090211 - - - org.jvnet.mimepull - mimepull - ${mimepull.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-jdk14 - ${slf4j.version} - - - xml-apis - xml-apis - 1.4.01 - - - - - - 4.2.1 - 1.3.9 - 18.0 - 3.0 - 9.4.6.v20170531 - 1.7.5 - - - - - 2.5.0-b05 - 1.0.1 - 2.8.3 - 3.20.0-GA - 1.2 - 1.1.0.Final - 2.0.1 - 2.23.2 - 1.9.6 - - - diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 80a109345ac..d02ec233d96 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -10,7 +10,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-dev 6-SNAPSHOT diff --git a/container-di/pom.xml b/container-di/pom.xml index caa66193fca..cf6a9e54daa 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-di 6-SNAPSHOT diff --git a/container-disc/pom.xml b/container-disc/pom.xml index dcdd2898c0b..ad86b3ffcff 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-disc 6-SNAPSHOT diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml index 2e69d11c2d9..8f579e49876 100644 --- a/container-jersey2/pom.xml +++ b/container-jersey2/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-jersey2 6-SNAPSHOT diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml index 7b9805ac9f4..6058063daf3 100644 --- a/container-messagebus/pom.xml +++ b/container-messagebus/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-messagebus 6-SNAPSHOT diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index ea00ee1f98c..fb2794670a2 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-search-and-docproc 6-SNAPSHOT diff --git a/container-search/pom.xml b/container-search/pom.xml index 8e41a576a27..f622567acde 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-search jar diff --git a/container-test-jars/pom.xml b/container-test-jars/pom.xml index 431da458932..dcde18fc8cf 100644 --- a/container-test-jars/pom.xml +++ b/container-test-jars/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent com.yahoo.vespa.container-test-jars container-test-jars diff --git a/container-test/pom.xml b/container-test/pom.xml index b0ee9417381..7aaffed652e 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -11,7 +11,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container-test 6-SNAPSHOT diff --git a/container/pom.xml b/container/pom.xml index e340fed4d59..4726071db55 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -11,7 +11,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent container 6-SNAPSHOT diff --git a/controller-api/pom.xml b/controller-api/pom.xml index 97a239572f6..51666da0c03 100644 --- a/controller-api/pom.xml +++ b/controller-api/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent controller-api container-plugin diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 16f639489c9..0cfcbc40601 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent controller-server container-plugin diff --git a/defaults/pom.xml b/defaults/pom.xml index 1a184f46396..2f3f06780e7 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -5,10 +5,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.yahoo.vespa - parent - 6-SNAPSHOT - ../parent + com.yahoo.vespa + parent + 6-SNAPSHOT com.yahoo.vespa defaults diff --git a/docker-api/pom.xml b/docker-api/pom.xml index 20451b2d622..fc374a12dd2 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent docker-api diff --git a/docproc/pom.xml b/docproc/pom.xml index 3a4f8f0c9c5..09635201e51 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent docproc jar diff --git a/docprocs/pom.xml b/docprocs/pom.xml index 01b3c343604..1b209ec39ee 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent docprocs container-plugin diff --git a/document/pom.xml b/document/pom.xml index 4dbe44e8439..81b21487314 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent document 6-SNAPSHOT diff --git a/documentapi/pom.xml b/documentapi/pom.xml index 5c0c78304c1..c94337e8873 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent documentapi container-plugin diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index cf47027f13b..53b49cf1473 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent documentgen-test jar diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index f57d9d1ccc9..eb040eddffb 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent fileacquirer 6-SNAPSHOT diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 1b4fa06919a..10b77b540e7 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -9,8 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent - + filedistribution 6-SNAPSHOT diff --git a/filedistribution_test/pom.xml b/filedistribution_test/pom.xml index 0feb32f7368..c270eabb6cf 100644 --- a/filedistribution_test/pom.xml +++ b/filedistribution_test/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent filedistribution_test 6-SNAPSHOT diff --git a/filedistributionmanager/pom.xml b/filedistributionmanager/pom.xml index 75785965f11..9e3ecf95ecb 100644 --- a/filedistributionmanager/pom.xml +++ b/filedistributionmanager/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent filedistributionmanager 6-SNAPSHOT diff --git a/fsa/pom.xml b/fsa/pom.xml index 466637c8ba8..a49845105cf 100644 --- a/fsa/pom.xml +++ b/fsa/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent fsa container-plugin diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index af45256b884..70cb9f6d8d0 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent indexinglanguage jar diff --git a/jaxrs_client_utils/pom.xml b/jaxrs_client_utils/pom.xml index b9a97db8cb6..1c4bdde21a8 100644 --- a/jaxrs_client_utils/pom.xml +++ b/jaxrs_client_utils/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent jaxrs_client_utils 6-SNAPSHOT diff --git a/jaxrs_utils/pom.xml b/jaxrs_utils/pom.xml index 1aa505f99ed..249cbda992b 100644 --- a/jaxrs_utils/pom.xml +++ b/jaxrs_utils/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent jaxrs_utils 6-SNAPSHOT diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 85f44ae3188..fb8200eb610 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent jdisc_core 6-SNAPSHOT diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index c89c4300500..92e7a39fee0 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent com.yahoo.vespa.jdisc_core parent diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index 83e5d540b05..d8c0b0bc29c 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent jdisc_http_service 6-SNAPSHOT diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index b88751f1390..4e739aae8cc 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent jdisc_jetty 6-SNAPSHOT diff --git a/jdisc_messagebus_service/pom.xml b/jdisc_messagebus_service/pom.xml index f5741ad7ded..e9531a73861 100644 --- a/jdisc_messagebus_service/pom.xml +++ b/jdisc_messagebus_service/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent jdisc_messagebus_service 6-SNAPSHOT diff --git a/jrt/pom.xml b/jrt/pom.xml index b940e6c6cb0..0d6be56fdab 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent jrt container-plugin diff --git a/linguistics/pom.xml b/linguistics/pom.xml index 3b33e100d6f..328742f483a 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent linguistics container-plugin @@ -60,7 +59,6 @@ com.google.inject guice provided - no_aop diff --git a/logd/pom.xml b/logd/pom.xml index 962ae2f2d43..e21931efc5a 100644 --- a/logd/pom.xml +++ b/logd/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent logd 6-SNAPSHOT diff --git a/logserver/pom.xml b/logserver/pom.xml index 6d714014d22..6acdd8ed1d7 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent logserver jar diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 41ff9c23af8..2f7343e753c 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent com.yahoo.vespa bundle-plugins diff --git a/messagebus-disc/pom.xml b/messagebus-disc/pom.xml index f2e001166b2..46158b0ca60 100644 --- a/messagebus-disc/pom.xml +++ b/messagebus-disc/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent messagebus-disc 6-SNAPSHOT diff --git a/messagebus/pom.xml b/messagebus/pom.xml index 2c6b1c4fe46..7fb44787cdf 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent messagebus 6-SNAPSHOT diff --git a/metrics/pom.xml b/metrics/pom.xml index fd7128db021..ec64d0d392c 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent com.yahoo.vespa metrics diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 607b71154b9..f7691cda3f7 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent node-admin diff --git a/node-maintainer/pom.xml b/node-maintainer/pom.xml index 4305778878e..d56e12d92c6 100644 --- a/node-maintainer/pom.xml +++ b/node-maintainer/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent node-maintainer diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 714ca9a644c..09b0d3df3d9 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent node-repository 6-SNAPSHOT diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index 4629b69c01c..db823f3fb15 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent orchestrator-restapi 6-SNAPSHOT diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index b770a767be6..c50f9ddcb29 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent orchestrator 6-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index 0daf82efe6d..00000000000 --- a/parent/pom.xml +++ /dev/null @@ -1,758 +0,0 @@ - - - - 4.0.0 - parent - pom - 6-SNAPSHOT - parent - Parent artifact for all Vespa maven projects. - https://github.com/vespa-engine - - - com.yahoo.vespa - container-dependency-versions - 6-SNAPSHOT - ../container-dependency-versions - - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - Vespa - https://github.com/vespa-engine - - - - - - bintray-vespa-repo - https://api.bintray.com/maven/yahoo/maven/vespa;publish=1 - - - - - - - - false - - bintray-yahoo-maven - bintray - https://yahoo.bintray.com/maven - - - - - scm:git:git@github.com:vespa-engine/vespa.git - scm:git:git@github.com:vespa-engine/vespa.git - git@github.com:vespa-engine/vespa.git - - - - ${project.artifactId} - - - org.apache.maven.wagon - wagon-ssh-external - 2.7 - - - org.apache.maven.archetype - archetype-packaging - 2.0 - - - - - - org.antlr - antlr3-maven-plugin - ${antlr.version} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - org.apache.felix - maven-bundle-plugin - 2.4.0 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - true - true - false - - -Xlint:all - -Xlint:-serial - -Xlint:-try - -Xlint:-processing - -Xlint:-varargs - -Werror - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - true - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:${doclint} -Xdoclint:-missing - - 2.10.4 - - - org.apache.maven.plugins - maven-plugin-plugin - 3.5 - - - true - - - - mojo-descriptor - - descriptor - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - \ - - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - ${test.hide} - - ${project.build.directory} - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${surefire.version} - - false - false - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - org.codehaus.mojo - javacc-maven-plugin - 2.6 - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - net.alchim31.maven - scala-maven-plugin - 3.2.2 - - - -unchecked - -deprecation - -feature - -Xfatal-warnings - - - - - com.yahoo.vespa - bundle-plugin - ${project.version} - - ${project.version} - true - - - - - - - - attach-sources - - - !skipSources - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - - generate-javadoc - - - !skipJavadoc - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - generate-javadoc - package - - javadoc - - - - - -Xdoclint:${doclint} -Xdoclint:-missing - ${javadoc.failOnError} - true - private - - - - - - - coverage - - - - org.codehaus.mojo - exec-maven-plugin - - true - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - src/main/scala - - - - - add-test-source - generate-test-sources - - add-test-source - - - - src/test/scala - - - - - - - - - - sign-artifacts - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 2.7 - - - com.github.cverges.expect4j - expect4j - 1.6 - - - org.apache.commons - commons-compress - 1.11 - - - org.apache.commons - commons-exec - 1.3 - - - io.airlift - airline - 0.7 - - - org.ow2.asm - asm - 5.2 - - - com.google.guava - guava-testlib - 18.0 - - - com.google.protobuf - protobuf-java - 2.4.1 - - - com.googlecode.jmockit - jmockit - 1.2 - - - com.goldmansachs - gs-collections - 6.1.0 - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-xml-provider - ${jackson2.version} - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson2.version} - - - com.infradna.tool - bridge-method-annotation - 1.4 - - - commons-cli - commons-cli - 1.3.1 - - - commons-collections - commons-collections - 3.2.1 - - - commons-configuration - commons-configuration - 1.6 - - - commons-io - commons-io - 2.4 - - - commons-lang - commons-lang - ${commons-lang.version} - - - commons-net - commons-net - 2.0 - - - commons-pool - commons-pool - 1.5.6 - - - - org.apache.zookeeper - zookeeper - 3.4.10 - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-test - ${curator.version} - - - junit - junit - 4.12 - - - org.antlr - antlr-runtime - ${antlr.version} - - - org.antlr - antlr4-runtime - ${antlr4.version} - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - ${aries.spifly.version} - - - org.apache.commons - commons-lang3 - 3.1 - - - org.apache.httpcomponents - fluent-hc - 4.3.6 - - - org.apache.httpcomponents - httpmime - 4.3.6 - - - org.apache.maven - maven-artifact - 3.5.0 - - - org.apache.maven - maven-core - 3.5.0 - - - org.apache.maven - maven-model - 3.5.0 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.5 - - - org.apache.maven - maven-plugin-api - 3.5.0 - - - org.apache.maven - maven-project - 2.2.1 - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.surefire - surefire-junit4 - ${surefire.version} - - - org.apache.maven.surefire - surefire-providers - ${surefire.version} - pom - - - org.codehaus.jettison - jettison - 1.3.1 - - - org.cthul - cthul-matchers - 1.0 - test - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - org.eclipse.jetty - jetty-jmx - ${jetty.version} - - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.hamcrest - hamcrest-library - 1.3 - test - - - uk.co.datumedge - hamcrest-json - 0.2 - test - - - org.hdrhistogram - HdrHistogram - 2.1.8 - - - org.mockito - mockito-all - 1.9.5 - - - org.mockito - mockito-core - 1.9.5 - test - - - org.osgi - org.osgi.compendium - 4.3.0 - - - org.osgi - org.osgi.core - 4.3.0 - - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang.modules - scala-parser-combinators_${scala.major-version} - 1.0.1 - - - org.scala-lang.modules - scala-xml_${scala.major-version} - 1.0.2 - - - org.scalatest - scalatest_${scala.major-version} - 2.2.2 - - - org.springframework - spring-test - 4.0.6.RELEASE - - - org.testng - testng - 6.10 - - - org.twdata.maven - mojo-executor - 2.3.0 - - - net.spy - spymemcached - 2.10.1 - - - xerces - xercesImpl - 2.11.0 - - - org.bouncycastle - bcpkix-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - - - com.ibm.icu - icu4j - 57.1 - - - com.yahoo.athenz - athenz-zms-java-client - ${athenz.version} - - - com.yahoo.athenz - athenz-zts-java-client - ${athenz.version} - - - - - - 3.5.2 - 4.5 - 1.0.8 - 1.0.0 - 5.0.3 - - 1.7.28 - 1.58 - 2.6 - - 2.9.1 - UTF-8 - UTF-8 - true - all - 2.11 - ${scala.major-version}.4 - 2.19.1 - - - diff --git a/pom.xml b/pom.xml index eb1f954ce13..2b7c1abc0d4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,11 @@ 4.0.0 com.yahoo.vespa - vespa + parent pom 6-SNAPSHOT - Aggregator pom for vespa. + parent + Parent artifact for all Vespa maven projects. https://github.com/vespa-engine @@ -23,6 +24,941 @@ + + + bintray-vespa-repo + https://api.bintray.com/maven/yahoo/maven/vespa;publish=1 + + + + + + + + false + + bintray-yahoo-maven + bintray + https://yahoo.bintray.com/maven + + + + + scm:git:git@github.com:vespa-engine/vespa.git + scm:git:git@github.com:vespa-engine/vespa.git + git@github.com:vespa-engine/vespa.git + + + + ${project.artifactId} + + + org.apache.maven.wagon + wagon-ssh-external + 2.7 + + + org.apache.maven.archetype + archetype-packaging + 2.0 + + + + + + org.antlr + antlr3-maven-plugin + ${antlr.version} + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + org.apache.felix + maven-bundle-plugin + 2.4.0 + + + org.apache.maven.plugins + maven-assembly-plugin + 2.4 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + true + true + false + + -Xlint:all + -Xlint:-serial + -Xlint:-try + -Xlint:-processing + -Xlint:-varargs + -Werror + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.5 + + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + true + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:${doclint} -Xdoclint:-missing + + 2.10.4 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.5 + + + true + + + + mojo-descriptor + + descriptor + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + \ + + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + ${test.hide} + + ${project.build.directory} + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${surefire.version} + + false + false + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + org.codehaus.mojo + javacc-maven-plugin + 2.6 + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + net.alchim31.maven + scala-maven-plugin + 3.2.2 + + + -unchecked + -deprecation + -feature + -Xfatal-warnings + + + + + com.yahoo.vespa + bundle-plugin + ${project.version} + + ${project.version} + true + + + + + + + + attach-sources + + + !skipSources + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + + + generate-javadoc + + + !skipJavadoc + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + generate-javadoc + package + + javadoc + + + + + -Xdoclint:${doclint} -Xdoclint:-missing + ${javadoc.failOnError} + true + private + + + + + + + coverage + + + + org.codehaus.mojo + exec-maven-plugin + + true + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + src/main/scala + + + + + add-test-source + generate-test-sources + + add-test-source + + + + src/test/scala + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 2.7 + + + com.github.cverges.expect4j + expect4j + 1.6 + + + org.apache.commons + commons-compress + 1.11 + + + org.apache.commons + commons-exec + 1.3 + + + io.airlift + airline + 0.7 + + + aopalliance + aopalliance + 1.0 + + + org.ow2.asm + asm + 5.2 + + + com.google.code.findbugs + annotations + 1.3.9 + + + com.google.code.findbugs + jsr305 + 1.3.9 + + + com.google.guava + guava + 18.0 + + + com.google.guava + guava-testlib + 18.0 + + + com.google.inject + guice + 3.0 + + + com.google.inject + guice + 3.0 + no_aop + + + com.google.inject.extensions + guice-assistedinject + 3.0 + + + com.google.inject.extensions + guice-multibindings + 3.0 + + + com.google.protobuf + protobuf-java + 2.4.1 + + + com.googlecode.jmockit + jmockit + 1.2 + + + com.goldmansachs + gs-collections + 6.1.0 + + + com.fasterxml.jackson.core + jackson-core + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson2.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-xml-provider + ${jackson2.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson2.version} + + + com.infradna.tool + bridge-method-annotation + 1.4 + + + commons-cli + commons-cli + 1.3.1 + + + commons-codec + commons-codec + 1.4 + + + commons-collections + commons-collections + 3.2.1 + + + commons-configuration + commons-configuration + 1.6 + + + commons-daemon + commons-daemon + 1.0.3 + + + commons-io + commons-io + 2.4 + + + commons-lang + commons-lang + ${commons-lang.version} + + + + commons-logging + commons-logging + 1.1.1 + + + commons-net + commons-net + 2.0 + + + commons-pool + commons-pool + 1.5.6 + + + + org.apache.zookeeper + zookeeper + 3.4.10 + + + org.apache.curator + curator-recipes + ${curator.version} + + + org.apache.curator + curator-test + ${curator.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + + + junit + junit + 4.12 + + + org.antlr + antlr-runtime + ${antlr.version} + + + org.antlr + antlr4-runtime + ${antlr4.version} + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + ${aries.spifly.version} + + + org.apache.commons + commons-lang3 + 3.1 + + + org.apache.felix + org.apache.felix.framework + 4.2.1 + + + org.apache.felix + org.apache.felix.log + 1.0.1 + + + org.apache.felix + org.apache.felix.main + 4.2.1 + + + org.apache.httpcomponents + fluent-hc + 4.3.6 + + + org.apache.httpcomponents + httpclient + 4.3.6 + + + org.apache.httpcomponents + httpcore + 4.3.3 + + + org.apache.httpcomponents + httpmime + 4.3.6 + + + org.apache.maven + maven-artifact + 3.5.0 + + + org.apache.maven + maven-core + 3.5.0 + + + org.apache.maven + maven-model + 3.5.0 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.5 + + + org.apache.maven + maven-plugin-api + 3.5.0 + + + org.apache.maven + maven-project + 2.2.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + org.apache.maven.surefire + surefire-junit4 + ${surefire.version} + + + org.apache.maven.surefire + surefire-providers + ${surefire.version} + pom + + + org.codehaus.jettison + jettison + 1.3.1 + + + org.cthul + cthul-matchers + 1.0 + test + + + org.eclipse.jetty + jetty-continuation + ${jetty.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.eclipse.jetty + jetty-http + ${jetty.version} + + + org.eclipse.jetty + jetty-jmx + ${jetty.version} + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.hamcrest + hamcrest-library + 1.3 + test + + + uk.co.datumedge + hamcrest-json + 0.2 + test + + + org.hdrhistogram + HdrHistogram + 2.1.8 + + + org.json + json + 20090211 + + + org.mockito + mockito-all + 1.9.5 + + + org.mockito + mockito-core + 1.9.5 + test + + + org.osgi + org.osgi.compendium + 4.3.0 + + + org.osgi + org.osgi.core + 4.3.0 + + + org.scala-lang + scala-library + ${scala.version} + + + org.scala-lang.modules + scala-parser-combinators_${scala.major-version} + 1.0.1 + + + org.scala-lang.modules + scala-xml_${scala.major-version} + 1.0.2 + + + org.scalatest + scalatest_${scala.major-version} + 2.2.2 + + + org.slf4j + jcl-over-slf4j + 1.7.5 + + + org.slf4j + log4j-over-slf4j + 1.7.5 + + + org.slf4j + slf4j-api + 1.7.5 + + + org.slf4j + slf4j-jdk14 + 1.7.5 + + + org.springframework + spring-test + 4.0.6.RELEASE + + + org.testng + testng + 6.10 + + + org.twdata.maven + mojo-executor + 2.3.0 + + + net.jcip + jcip-annotations + 1.0 + + + net.jpountz.lz4 + lz4 + 1.3.0 + + + net.spy + spymemcached + 2.10.1 + + + xerces + xercesImpl + 2.11.0 + + + org.bouncycastle + bcpkix-jdk15on + ${bouncycastle.version} + + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs-api.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey2.version} + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey2.version} + + + org.glassfish.jersey.ext + jersey-proxy-client + ${jersey2.version} + + + org.glassfish.jersey.core + jersey-client + ${jersey2.version} + + + com.ibm.icu + icu4j + 57.1 + + + com.yahoo.athenz + athenz-zms-java-client + ${athenz.version} + + + com.yahoo.athenz + athenz-zts-java-client + ${athenz.version} + + + + + + 2.0.1 + 3.5.2 + 4.5 + 1.0.8 + 1.0.0 + 5.0.3 + + 1.7.28 + 1.58 + 2.6 + + 2.9.1 + 2.8.3 + 2.23.2 + 9.4.6.v20170531 + UTF-8 + UTF-8 + true + all + 2.11 + ${scala.major-version}.4 + 2.19.1 + + application application-deploy-plugin @@ -53,7 +989,6 @@ container-core container-accesslogging container-dependencies-enforcer - container-dependency-versions container-dev container-di container-disc @@ -98,7 +1033,6 @@ node-maintainer orchestrator-restapi orchestrator - parent predicate-search predicate-search-core processing diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index ebeca5d3562..ea2995c4770 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent predicate-search-core 6-SNAPSHOT diff --git a/predicate-search/pom.xml b/predicate-search/pom.xml index 3cf52609b17..ca79544c766 100644 --- a/predicate-search/pom.xml +++ b/predicate-search/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent predicate-search 6-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 404e58334f8..15aa984cbd2 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent processing jar diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 50ba91b3768..18cdd294b87 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent provided-dependencies jar diff --git a/searchcore/pom.xml b/searchcore/pom.xml index 107586d0d97..f31617cfe53 100644 --- a/searchcore/pom.xml +++ b/searchcore/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent searchcore 6-SNAPSHOT diff --git a/searchlib/pom.xml b/searchlib/pom.xml index a3ebf712873..c669903c3da 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent searchlib container-plugin diff --git a/searchsummary/pom.xml b/searchsummary/pom.xml index e5ead509803..97a29655ad1 100644 --- a/searchsummary/pom.xml +++ b/searchsummary/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent searchsummary 6-SNAPSHOT diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 6fe4b4e2b18..c63bdf35574 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent service-monitor container-plugin @@ -67,7 +66,6 @@ com.google.inject guice provided - no_aop com.fasterxml.jackson.core diff --git a/serviceview/pom.xml b/serviceview/pom.xml index 4f6d5fa34f5..c3620ecfc9d 100644 --- a/serviceview/pom.xml +++ b/serviceview/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent serviceview container-plugin diff --git a/simplemetrics/pom.xml b/simplemetrics/pom.xml index 27d45d7611d..d027fda82ce 100644 --- a/simplemetrics/pom.xml +++ b/simplemetrics/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent simplemetrics container-plugin diff --git a/socket_test/pom.xml b/socket_test/pom.xml index 39bbc04611c..60d8b3713e9 100644 --- a/socket_test/pom.xml +++ b/socket_test/pom.xml @@ -12,7 +12,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent jar diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 816708a4fe2..9300181e00b 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent standalone-container 6-SNAPSHOT diff --git a/statistics/pom.xml b/statistics/pom.xml index e2d97989448..7bbef0ea3c0 100644 --- a/statistics/pom.xml +++ b/statistics/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent statistics 6-SNAPSHOT diff --git a/storage/pom.xml b/storage/pom.xml index ecfb69eb19c..49b103cbe34 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent storage 6-SNAPSHOT diff --git a/testutil/pom.xml b/testutil/pom.xml index 95da44c610e..9f98f40c2d0 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent testutil jar @@ -24,7 +23,6 @@ com.google.inject guice provided - no_aop org.hamcrest diff --git a/vdslib/pom.xml b/vdslib/pom.xml index 979fcb5f1dd..48681b8ce83 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vdslib container-plugin diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 6bfaf55d7e1..2464c8208ad 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespa-application-maven-plugin 6-SNAPSHOT diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index 04a1b3e68b4..4e96a0475f7 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespa-documentgen-plugin maven-plugin diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index 45c28d8665a..b9fbd589525 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespa-hadoop 6-SNAPSHOT diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index 7f40beddf9f..15d72b7c1c2 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespa-http-client 6-SNAPSHOT diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index 9ca51c39227..f54b2df9b8a 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -13,7 +13,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespa_feed_perf 6-SNAPSHOT diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index a225838c0f0..3250cd8a41f 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespa_jersey2 6-SNAPSHOT diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index b5757b68da3..59895438038 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespaclient-container-plugin 6-SNAPSHOT diff --git a/vespaclient-core/pom.xml b/vespaclient-core/pom.xml index e3491d41dff..bdb15825fbb 100644 --- a/vespaclient-core/pom.xml +++ b/vespaclient-core/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespaclient-core 6-SNAPSHOT diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 7fa941fbed3..8cde41d53d7 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespaclient-java 6-SNAPSHOT diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index f3d1c42c39e..1f98a5e4c02 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespajlib container-plugin diff --git a/vespalog/pom.xml b/vespalog/pom.xml index e59f5b4dc47..6cea5ab83d9 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vespalog 6-SNAPSHOT diff --git a/vsm/pom.xml b/vsm/pom.xml index 1d131b2912e..8c5b006aeec 100644 --- a/vsm/pom.xml +++ b/vsm/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent vsm 6-SNAPSHOT diff --git a/yolean/pom.xml b/yolean/pom.xml index 53289ffe9bc..d64ea29a95c 100644 --- a/yolean/pom.xml +++ b/yolean/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent yolean 6-SNAPSHOT diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 69efa1fe31c..45ba8c32372 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent zkfacade container-plugin -- cgit v1.2.3 From cd3972fded8a5f694cd6f9ab3717240f19f36639 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Tue, 28 Nov 2017 14:37:47 +0100 Subject: Split parent + container-dependency-versions from root pom. - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. --- annotations/pom.xml | 1 + application-deploy-plugin/pom.xml | 1 + application-model/pom.xml | 1 + application-preprocessor/pom.xml | 1 + application/pom.xml | 1 + athenz-identity-provider-service/pom.xml | 1 + bundle-plugin-test/pom.xml | 1 + bundle-plugin/pom.xml | 1 + chain/pom.xml | 1 + clustercontroller-apps/pom.xml | 1 + clustercontroller-apputil/pom.xml | 1 + clustercontroller-core/pom.xml | 1 + clustercontroller-standalone/pom.xml | 1 + clustercontroller-utils/pom.xml | 1 + component/pom.xml | 1 + config-application-package/pom.xml | 1 + config-bundle/pom.xml | 1 + config-class-plugin/pom.xml | 1 + config-lib/pom.xml | 1 + config-model-api/pom.xml | 1 + config-model-fat/pom.xml | 1 + config-model/pom.xml | 1 + config-provisioning/pom.xml | 1 + config-proxy/pom.xml | 1 + config/pom.xml | 1 + configdefinitions/pom.xml | 1 + configgen/pom.xml | 1 + configserver/pom.xml | 1 + container-accesslogging/pom.xml | 1 + container-core/pom.xml | 1 + container-dependencies-enforcer/pom.xml | 1 + container-dependency-versions/pom.xml | 369 ++++++++++++ container-dev/pom.xml | 1 + container-di/pom.xml | 1 + container-disc/pom.xml | 1 + container-jersey2/pom.xml | 1 + container-messagebus/pom.xml | 1 + container-search-and-docproc/pom.xml | 1 + container-search/pom.xml | 1 + container-test-jars/pom.xml | 1 + container-test/pom.xml | 1 + container/pom.xml | 1 + controller-api/pom.xml | 1 + controller-server/pom.xml | 1 + defaults/pom.xml | 7 +- docker-api/pom.xml | 1 + docproc/pom.xml | 1 + docprocs/pom.xml | 1 + document/pom.xml | 1 + documentapi/pom.xml | 1 + documentgen-test/pom.xml | 1 + fileacquirer/pom.xml | 1 + filedistribution/pom.xml | 3 +- filedistribution_test/pom.xml | 1 + filedistributionmanager/pom.xml | 1 + fsa/pom.xml | 1 + indexinglanguage/pom.xml | 1 + jaxrs_client_utils/pom.xml | 1 + jaxrs_utils/pom.xml | 1 + jdisc_core/pom.xml | 1 + jdisc_core_test/pom.xml | 1 + jdisc_http_service/pom.xml | 1 + jdisc_jetty/pom.xml | 1 + jdisc_messagebus_service/pom.xml | 1 + jrt/pom.xml | 1 + linguistics/pom.xml | 1 + logd/pom.xml | 1 + logserver/pom.xml | 1 + maven-plugins/pom.xml | 1 + messagebus-disc/pom.xml | 1 + messagebus/pom.xml | 1 + metrics/pom.xml | 1 + node-admin/pom.xml | 1 + node-maintainer/pom.xml | 1 + node-repository/pom.xml | 1 + orchestrator-restapi/pom.xml | 1 + orchestrator/pom.xml | 1 + parent/pom.xml | 758 +++++++++++++++++++++++++ pom.xml | 942 +------------------------------ predicate-search-core/pom.xml | 1 + predicate-search/pom.xml | 1 + processing/pom.xml | 1 + provided-dependencies/pom.xml | 1 + searchcore/pom.xml | 1 + searchlib/pom.xml | 1 + searchsummary/pom.xml | 1 + service-monitor/pom.xml | 1 + serviceview/pom.xml | 1 + simplemetrics/pom.xml | 1 + socket_test/pom.xml | 1 + standalone-container/pom.xml | 1 + statistics/pom.xml | 1 + storage/pom.xml | 1 + testutil/pom.xml | 1 + vdslib/pom.xml | 1 + vespa-application-maven-plugin/pom.xml | 1 + vespa-documentgen-plugin/pom.xml | 1 + vespa-hadoop/pom.xml | 1 + vespa-http-client/pom.xml | 1 + vespa_feed_perf/pom.xml | 1 + vespa_jersey2/pom.xml | 1 + vespaclient-container-plugin/pom.xml | 1 + vespaclient-core/pom.xml | 1 + vespaclient-java/pom.xml | 1 + vespajlib/pom.xml | 1 + vespalog/pom.xml | 1 + vsm/pom.xml | 1 + yolean/pom.xml | 1 + zkfacade/pom.xml | 1 + 109 files changed, 1241 insertions(+), 942 deletions(-) create mode 100644 container-dependency-versions/pom.xml create mode 100644 parent/pom.xml (limited to 'container-search') diff --git a/annotations/pom.xml b/annotations/pom.xml index 146eb5e9be2..3321dddaf8c 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml annotations jar diff --git a/application-deploy-plugin/pom.xml b/application-deploy-plugin/pom.xml index 3cae7cf7831..501dee385a6 100644 --- a/application-deploy-plugin/pom.xml +++ b/application-deploy-plugin/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml application-deploy-plugin 6-SNAPSHOT diff --git a/application-model/pom.xml b/application-model/pom.xml index 13a2d3ea49b..801c72e9194 100644 --- a/application-model/pom.xml +++ b/application-model/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml application-model container-plugin diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index 4fa319a881a..6ffff09e548 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml application-preprocessor jar diff --git a/application/pom.xml b/application/pom.xml index 17e9ece3543..8103226e55d 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml application jar diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index c87589d7be2..bfd02d54d43 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -11,6 +11,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index 8d8bf48cc07..3dd5be00add 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa bundle-plugin-test diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 02f0ed2ccf5..47a06a1ee76 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml bundle-plugin 6-SNAPSHOT diff --git a/chain/pom.xml b/chain/pom.xml index a3096d37748..01a64a93609 100755 --- a/chain/pom.xml +++ b/chain/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml chain jar diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml index 26f466eb208..bdc6059a816 100644 --- a/clustercontroller-apps/pom.xml +++ b/clustercontroller-apps/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-apps 6-SNAPSHOT diff --git a/clustercontroller-apputil/pom.xml b/clustercontroller-apputil/pom.xml index 68adc82596f..42c7690eab6 100644 --- a/clustercontroller-apputil/pom.xml +++ b/clustercontroller-apputil/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-apputil 6-SNAPSHOT diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 499dee0d1de..99cf4df643b 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-core 6-SNAPSHOT diff --git a/clustercontroller-standalone/pom.xml b/clustercontroller-standalone/pom.xml index f51555a92b6..f435cd9d7c4 100644 --- a/clustercontroller-standalone/pom.xml +++ b/clustercontroller-standalone/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-standalone 6-SNAPSHOT diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index f151a623ff9..287a85089ca 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-utils 6-SNAPSHOT diff --git a/component/pom.xml b/component/pom.xml index 92f852e4ba0..18bfd000a84 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml component container-plugin diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 90d4a2d9af6..629c02de1e8 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-application-package container-plugin diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index 7121756ce68..07262141801 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-bundle container-plugin diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index 5b3149a13da..71a20782d85 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-class-plugin maven-plugin diff --git a/config-lib/pom.xml b/config-lib/pom.xml index 2ed993dd052..31648958fa6 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-lib container-plugin diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 6618612df31..743164afb16 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-model-api 6-SNAPSHOT diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index a4bbba0e6e8..0526c2f6581 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-model-fat bundle diff --git a/config-model/pom.xml b/config-model/pom.xml index 0fdc09e1a61..729d1a2ef9b 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-model container-plugin diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml index ebe7d460989..05f94973017 100644 --- a/config-provisioning/pom.xml +++ b/config-provisioning/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa config-provisioning diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 0aadb1bbb12..a266f68efe2 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-proxy jar diff --git a/config/pom.xml b/config/pom.xml index f73c5b7bfd8..cfa3a692181 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config container-plugin diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 92980a18899..487c43ed3b3 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml configdefinitions container-plugin diff --git a/configgen/pom.xml b/configgen/pom.xml index 6e550ec7321..e8de114f8d5 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml configgen jar diff --git a/configserver/pom.xml b/configserver/pom.xml index 30d92dc7650..f5aa8ea3118 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml configserver container-plugin diff --git a/container-accesslogging/pom.xml b/container-accesslogging/pom.xml index 45d7b4a2ed2..b4c7094a50a 100644 --- a/container-accesslogging/pom.xml +++ b/container-accesslogging/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-accesslogging 6-SNAPSHOT diff --git a/container-core/pom.xml b/container-core/pom.xml index c608f35f26c..1be10215419 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-core 6-SNAPSHOT diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 61495384744..94f7613e692 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-dependencies-enforcer diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml new file mode 100644 index 00000000000..5007e91c916 --- /dev/null +++ b/container-dependency-versions/pom.xml @@ -0,0 +1,369 @@ + + + + 4.0.0 + com.yahoo.vespa + container-dependency-versions + pom + 6-SNAPSHOT + Dependency versions for all Vespa maven projects. + https://github.com/vespa-engine + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + + + aopalliance + aopalliance + 1.0 + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson2.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson2.version} + + + com.google.code.findbugs + annotations + ${findbugs.version} + + + com.google.code.findbugs + jsr305 + ${findbugs.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.inject.extensions + guice-assistedinject + ${guice.version} + + + com.google.inject.extensions + guice-multibindings + ${guice.version} + + + com.google.inject + guice + ${guice.version} + + + com.google.inject + guice + ${guice.version} + no_aop + + + commons-codec + commons-codec + 1.4 + + + commons-daemon + commons-daemon + 1.0.3 + + + + commons-logging + commons-logging + 1.1.1 + + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + + + javax.inject + javax.inject + 1 + + + javax.servlet + javax.servlet-api + 3.1.0 + + + javax.validation + validation-api + ${javax.validation-api.version} + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs-api.version} + + + net.jcip + jcip-annotations + 1.0 + + + net.jpountz.lz4 + lz4 + 1.3.0 + + + org.apache.felix + org.apache.felix.framework + ${felix.version} + + + org.apache.felix + org.apache.felix.log + 1.0.1 + + + org.apache.felix + org.apache.felix.main + ${felix.version} + + + org.apache.httpcomponents + httpclient + 4.3.6 + + + org.apache.httpcomponents + httpcore + 4.3.3 + + + org.eclipse.jetty + jetty-http + ${jetty.version} + + + org.eclipse.jetty + jetty-io + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.glassfish.hk2.external + aopalliance-repackaged + ${hk2.version} + + + org.glassfish.hk2.external + javax.inject + ${hk2.version} + + + org.glassfish.hk2 + hk2-api + ${hk2.version} + + + org.glassfish.hk2 + hk2-locator + ${hk2.version} + + + org.glassfish.hk2 + hk2-utils + ${hk2.version} + + + org.glassfish.hk2 + osgi-resource-locator + ${hk2.osgi-resource-locator.version} + + + org.glassfish.jersey.bundles.repackaged + jersey-guava + ${jersey2.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey2.version} + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey2.version} + + + org.glassfish.jersey.core + jersey-client + ${jersey2.version} + + + org.glassfish.jersey.core + jersey-common + ${jersey2.version} + + + org.glassfish.jersey.core + jersey-server + ${jersey2.version} + + + org.glassfish.jersey.ext + jersey-entity-filtering + ${jersey2.version} + + + org.glassfish.jersey.ext + jersey-proxy-client + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-jaxb + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey2.version} + + + org.javassist + javassist + ${javassist.version} + + + org.json + json + 20090211 + + + org.jvnet.mimepull + mimepull + ${mimepull.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-jdk14 + ${slf4j.version} + + + xml-apis + xml-apis + 1.4.01 + + + + + + 4.2.1 + 1.3.9 + 18.0 + 3.0 + 9.4.6.v20170531 + 1.7.5 + + + + + 2.5.0-b05 + 1.0.1 + 2.8.3 + 3.20.0-GA + 1.2 + 1.1.0.Final + 2.0.1 + 2.23.2 + 1.9.6 + + + diff --git a/container-dev/pom.xml b/container-dev/pom.xml index d02ec233d96..f62bbd22690 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -10,6 +10,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-dev 6-SNAPSHOT diff --git a/container-di/pom.xml b/container-di/pom.xml index cf6a9e54daa..abc652d6e6e 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-di 6-SNAPSHOT diff --git a/container-disc/pom.xml b/container-disc/pom.xml index ad86b3ffcff..38b4bfc2ff5 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-disc 6-SNAPSHOT diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml index 8f579e49876..26dfa762032 100644 --- a/container-jersey2/pom.xml +++ b/container-jersey2/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-jersey2 6-SNAPSHOT diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml index 6058063daf3..1daf1df6fcb 100644 --- a/container-messagebus/pom.xml +++ b/container-messagebus/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-messagebus 6-SNAPSHOT diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index fb2794670a2..9b4419ae2b6 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-search-and-docproc 6-SNAPSHOT diff --git a/container-search/pom.xml b/container-search/pom.xml index f622567acde..0df502cf21a 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-search jar diff --git a/container-test-jars/pom.xml b/container-test-jars/pom.xml index dcde18fc8cf..804ca5eb879 100644 --- a/container-test-jars/pom.xml +++ b/container-test-jars/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa.container-test-jars container-test-jars diff --git a/container-test/pom.xml b/container-test/pom.xml index 7aaffed652e..26f02767062 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -11,6 +11,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-test 6-SNAPSHOT diff --git a/container/pom.xml b/container/pom.xml index 4726071db55..3793a3508a4 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -11,6 +11,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container 6-SNAPSHOT diff --git a/controller-api/pom.xml b/controller-api/pom.xml index 51666da0c03..5ef130a22ba 100644 --- a/controller-api/pom.xml +++ b/controller-api/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml controller-api container-plugin diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 0cfcbc40601..b033286b82a 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml controller-server container-plugin diff --git a/defaults/pom.xml b/defaults/pom.xml index 2f3f06780e7..4d1a08aacc2 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -5,9 +5,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.yahoo.vespa - parent - 6-SNAPSHOT + com.yahoo.vespa + parent + 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa defaults diff --git a/docker-api/pom.xml b/docker-api/pom.xml index fc374a12dd2..449a94fb621 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml docker-api diff --git a/docproc/pom.xml b/docproc/pom.xml index 09635201e51..1043de32128 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml docproc jar diff --git a/docprocs/pom.xml b/docprocs/pom.xml index 1b209ec39ee..16259a861c7 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml docprocs container-plugin diff --git a/document/pom.xml b/document/pom.xml index 81b21487314..10f71218422 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml document 6-SNAPSHOT diff --git a/documentapi/pom.xml b/documentapi/pom.xml index c94337e8873..3781dfd93ac 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml documentapi container-plugin diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index 53b49cf1473..d009ef3d592 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml documentgen-test jar diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index eb040eddffb..6449b8c620f 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml fileacquirer 6-SNAPSHOT diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 10b77b540e7..b0bdaff518f 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -9,7 +9,8 @@ com.yahoo.vespa parent 6-SNAPSHOT - + ../parent/pom.xml + filedistribution 6-SNAPSHOT diff --git a/filedistribution_test/pom.xml b/filedistribution_test/pom.xml index c270eabb6cf..5cc113c6453 100644 --- a/filedistribution_test/pom.xml +++ b/filedistribution_test/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml filedistribution_test 6-SNAPSHOT diff --git a/filedistributionmanager/pom.xml b/filedistributionmanager/pom.xml index 9e3ecf95ecb..9f037814a12 100644 --- a/filedistributionmanager/pom.xml +++ b/filedistributionmanager/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml filedistributionmanager 6-SNAPSHOT diff --git a/fsa/pom.xml b/fsa/pom.xml index a49845105cf..2a56069f82e 100644 --- a/fsa/pom.xml +++ b/fsa/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml fsa container-plugin diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 70cb9f6d8d0..f0aba8d9476 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml indexinglanguage jar diff --git a/jaxrs_client_utils/pom.xml b/jaxrs_client_utils/pom.xml index 1c4bdde21a8..e3de5b8163d 100644 --- a/jaxrs_client_utils/pom.xml +++ b/jaxrs_client_utils/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jaxrs_client_utils 6-SNAPSHOT diff --git a/jaxrs_utils/pom.xml b/jaxrs_utils/pom.xml index 249cbda992b..1753d016ec3 100644 --- a/jaxrs_utils/pom.xml +++ b/jaxrs_utils/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jaxrs_utils 6-SNAPSHOT diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index fb8200eb610..55da222994f 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jdisc_core 6-SNAPSHOT diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index 92e7a39fee0..a1a96463ffc 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa.jdisc_core parent diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index d8c0b0bc29c..a1482669b39 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jdisc_http_service 6-SNAPSHOT diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index 4e739aae8cc..0f8a5ba19e2 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jdisc_jetty 6-SNAPSHOT diff --git a/jdisc_messagebus_service/pom.xml b/jdisc_messagebus_service/pom.xml index e9531a73861..6201f413b9a 100644 --- a/jdisc_messagebus_service/pom.xml +++ b/jdisc_messagebus_service/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jdisc_messagebus_service 6-SNAPSHOT diff --git a/jrt/pom.xml b/jrt/pom.xml index 0d6be56fdab..cf3da2ab7ce 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jrt container-plugin diff --git a/linguistics/pom.xml b/linguistics/pom.xml index 328742f483a..b89369b42dc 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml linguistics container-plugin diff --git a/logd/pom.xml b/logd/pom.xml index e21931efc5a..a1a107bc20c 100644 --- a/logd/pom.xml +++ b/logd/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml logd 6-SNAPSHOT diff --git a/logserver/pom.xml b/logserver/pom.xml index 6acdd8ed1d7..55c5c443cfb 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml logserver jar diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 2f7343e753c..0aabe630a63 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa bundle-plugins diff --git a/messagebus-disc/pom.xml b/messagebus-disc/pom.xml index 46158b0ca60..89741dce82b 100644 --- a/messagebus-disc/pom.xml +++ b/messagebus-disc/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml messagebus-disc 6-SNAPSHOT diff --git a/messagebus/pom.xml b/messagebus/pom.xml index 7fb44787cdf..7c37bccbd9a 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml messagebus 6-SNAPSHOT diff --git a/metrics/pom.xml b/metrics/pom.xml index ec64d0d392c..628ab66552d 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa metrics diff --git a/node-admin/pom.xml b/node-admin/pom.xml index f7691cda3f7..983e4d3a832 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml node-admin diff --git a/node-maintainer/pom.xml b/node-maintainer/pom.xml index d56e12d92c6..1fe3eb23857 100644 --- a/node-maintainer/pom.xml +++ b/node-maintainer/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml node-maintainer diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 09b0d3df3d9..6673ea487a1 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml node-repository 6-SNAPSHOT diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index db823f3fb15..310512812e2 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml orchestrator-restapi 6-SNAPSHOT diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index c50f9ddcb29..ae22b6718f9 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml orchestrator 6-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 00000000000..e01612218ff --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,758 @@ + + + + 4.0.0 + parent + pom + 6-SNAPSHOT + parent + Parent artifact for all Vespa maven projects. + https://github.com/vespa-engine + + + com.yahoo.vespa + container-dependency-versions + 6-SNAPSHOT + ../container-dependency-versions/pom.xml + + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + Vespa + https://github.com/vespa-engine + + + + + + bintray-vespa-repo + https://api.bintray.com/maven/yahoo/maven/vespa;publish=1 + + + + + + + + false + + bintray-yahoo-maven + bintray + https://yahoo.bintray.com/maven + + + + + scm:git:git@github.com:vespa-engine/vespa.git + scm:git:git@github.com:vespa-engine/vespa.git + git@github.com:vespa-engine/vespa.git + + + + ${project.artifactId} + + + org.apache.maven.wagon + wagon-ssh-external + 2.7 + + + org.apache.maven.archetype + archetype-packaging + 2.0 + + + + + + org.antlr + antlr3-maven-plugin + ${antlr.version} + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + org.apache.felix + maven-bundle-plugin + 2.4.0 + + + org.apache.maven.plugins + maven-assembly-plugin + 2.4 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + true + true + false + + -Xlint:all + -Xlint:-serial + -Xlint:-try + -Xlint:-processing + -Xlint:-varargs + -Werror + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.5 + + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + true + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:${doclint} -Xdoclint:-missing + + 2.10.4 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.5 + + + true + + + + mojo-descriptor + + descriptor + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + \ + + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + ${test.hide} + + ${project.build.directory} + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${surefire.version} + + false + false + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + org.codehaus.mojo + javacc-maven-plugin + 2.6 + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + net.alchim31.maven + scala-maven-plugin + 3.2.2 + + + -unchecked + -deprecation + -feature + -Xfatal-warnings + + + + + com.yahoo.vespa + bundle-plugin + ${project.version} + + ${project.version} + true + + + + + + + + attach-sources + + + !skipSources + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + + + generate-javadoc + + + !skipJavadoc + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + generate-javadoc + package + + javadoc + + + + + -Xdoclint:${doclint} -Xdoclint:-missing + ${javadoc.failOnError} + true + private + + + + + + + coverage + + + + org.codehaus.mojo + exec-maven-plugin + + true + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + src/main/scala + + + + + add-test-source + generate-test-sources + + add-test-source + + + + src/test/scala + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 2.7 + + + com.github.cverges.expect4j + expect4j + 1.6 + + + org.apache.commons + commons-compress + 1.11 + + + org.apache.commons + commons-exec + 1.3 + + + io.airlift + airline + 0.7 + + + org.ow2.asm + asm + 5.2 + + + com.google.guava + guava-testlib + 18.0 + + + com.google.protobuf + protobuf-java + 2.4.1 + + + com.googlecode.jmockit + jmockit + 1.2 + + + com.goldmansachs + gs-collections + 6.1.0 + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-xml-provider + ${jackson2.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson2.version} + + + com.infradna.tool + bridge-method-annotation + 1.4 + + + commons-cli + commons-cli + 1.3.1 + + + commons-collections + commons-collections + 3.2.1 + + + commons-configuration + commons-configuration + 1.6 + + + commons-io + commons-io + 2.4 + + + commons-lang + commons-lang + ${commons-lang.version} + + + commons-net + commons-net + 2.0 + + + commons-pool + commons-pool + 1.5.6 + + + + org.apache.zookeeper + zookeeper + 3.4.10 + + + org.apache.curator + curator-recipes + ${curator.version} + + + org.apache.curator + curator-test + ${curator.version} + + + junit + junit + 4.12 + + + org.antlr + antlr-runtime + ${antlr.version} + + + org.antlr + antlr4-runtime + ${antlr4.version} + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + ${aries.spifly.version} + + + org.apache.commons + commons-lang3 + 3.1 + + + org.apache.httpcomponents + fluent-hc + 4.3.6 + + + org.apache.httpcomponents + httpmime + 4.3.6 + + + org.apache.maven + maven-artifact + 3.5.0 + + + org.apache.maven + maven-core + 3.5.0 + + + org.apache.maven + maven-model + 3.5.0 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.5 + + + org.apache.maven + maven-plugin-api + 3.5.0 + + + org.apache.maven + maven-project + 2.2.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + org.apache.maven.surefire + surefire-junit4 + ${surefire.version} + + + org.apache.maven.surefire + surefire-providers + ${surefire.version} + pom + + + org.codehaus.jettison + jettison + 1.3.1 + + + org.cthul + cthul-matchers + 1.0 + test + + + org.eclipse.jetty + jetty-continuation + ${jetty.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-jmx + ${jetty.version} + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.hamcrest + hamcrest-library + 1.3 + test + + + uk.co.datumedge + hamcrest-json + 0.2 + test + + + org.hdrhistogram + HdrHistogram + 2.1.8 + + + org.mockito + mockito-all + 1.9.5 + + + org.mockito + mockito-core + 1.9.5 + test + + + org.osgi + org.osgi.compendium + 4.3.0 + + + org.osgi + org.osgi.core + 4.3.0 + + + org.scala-lang + scala-library + ${scala.version} + + + org.scala-lang.modules + scala-parser-combinators_${scala.major-version} + 1.0.1 + + + org.scala-lang.modules + scala-xml_${scala.major-version} + 1.0.2 + + + org.scalatest + scalatest_${scala.major-version} + 2.2.2 + + + org.springframework + spring-test + 4.0.6.RELEASE + + + org.testng + testng + 6.10 + + + org.twdata.maven + mojo-executor + 2.3.0 + + + net.spy + spymemcached + 2.10.1 + + + xerces + xercesImpl + 2.11.0 + + + org.bouncycastle + bcpkix-jdk15on + ${bouncycastle.version} + + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + + + com.ibm.icu + icu4j + 57.1 + + + com.yahoo.athenz + athenz-zms-java-client + ${athenz.version} + + + com.yahoo.athenz + athenz-zts-java-client + ${athenz.version} + + + + + + 3.5.2 + 4.5 + 1.0.8 + 1.0.0 + 5.0.3 + + 1.7.28 + 1.58 + 2.6 + + 2.9.1 + UTF-8 + UTF-8 + true + all + 2.11 + ${scala.major-version}.4 + 2.19.1 + + + diff --git a/pom.xml b/pom.xml index 2b7c1abc0d4..eb1f954ce13 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,10 @@ 4.0.0 com.yahoo.vespa - parent + vespa pom 6-SNAPSHOT - parent - Parent artifact for all Vespa maven projects. + Aggregator pom for vespa. https://github.com/vespa-engine @@ -24,941 +23,6 @@ - - - bintray-vespa-repo - https://api.bintray.com/maven/yahoo/maven/vespa;publish=1 - - - - - - - - false - - bintray-yahoo-maven - bintray - https://yahoo.bintray.com/maven - - - - - scm:git:git@github.com:vespa-engine/vespa.git - scm:git:git@github.com:vespa-engine/vespa.git - git@github.com:vespa-engine/vespa.git - - - - ${project.artifactId} - - - org.apache.maven.wagon - wagon-ssh-external - 2.7 - - - org.apache.maven.archetype - archetype-packaging - 2.0 - - - - - - org.antlr - antlr3-maven-plugin - ${antlr.version} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - org.apache.felix - maven-bundle-plugin - 2.4.0 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - true - true - false - - -Xlint:all - -Xlint:-serial - -Xlint:-try - -Xlint:-processing - -Xlint:-varargs - -Werror - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - true - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:${doclint} -Xdoclint:-missing - - 2.10.4 - - - org.apache.maven.plugins - maven-plugin-plugin - 3.5 - - - true - - - - mojo-descriptor - - descriptor - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - \ - - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - ${test.hide} - - ${project.build.directory} - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${surefire.version} - - false - false - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - org.codehaus.mojo - javacc-maven-plugin - 2.6 - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - net.alchim31.maven - scala-maven-plugin - 3.2.2 - - - -unchecked - -deprecation - -feature - -Xfatal-warnings - - - - - com.yahoo.vespa - bundle-plugin - ${project.version} - - ${project.version} - true - - - - - - - - attach-sources - - - !skipSources - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - - generate-javadoc - - - !skipJavadoc - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - generate-javadoc - package - - javadoc - - - - - -Xdoclint:${doclint} -Xdoclint:-missing - ${javadoc.failOnError} - true - private - - - - - - - coverage - - - - org.codehaus.mojo - exec-maven-plugin - - true - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - src/main/scala - - - - - add-test-source - generate-test-sources - - add-test-source - - - - src/test/scala - - - - - - - - - - sign-artifacts - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 2.7 - - - com.github.cverges.expect4j - expect4j - 1.6 - - - org.apache.commons - commons-compress - 1.11 - - - org.apache.commons - commons-exec - 1.3 - - - io.airlift - airline - 0.7 - - - aopalliance - aopalliance - 1.0 - - - org.ow2.asm - asm - 5.2 - - - com.google.code.findbugs - annotations - 1.3.9 - - - com.google.code.findbugs - jsr305 - 1.3.9 - - - com.google.guava - guava - 18.0 - - - com.google.guava - guava-testlib - 18.0 - - - com.google.inject - guice - 3.0 - - - com.google.inject - guice - 3.0 - no_aop - - - com.google.inject.extensions - guice-assistedinject - 3.0 - - - com.google.inject.extensions - guice-multibindings - 3.0 - - - com.google.protobuf - protobuf-java - 2.4.1 - - - com.googlecode.jmockit - jmockit - 1.2 - - - com.goldmansachs - gs-collections - 6.1.0 - - - com.fasterxml.jackson.core - jackson-core - ${jackson2.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson2.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson2.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-xml-provider - ${jackson2.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson2.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson2.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson2.version} - - - com.infradna.tool - bridge-method-annotation - 1.4 - - - commons-cli - commons-cli - 1.3.1 - - - commons-codec - commons-codec - 1.4 - - - commons-collections - commons-collections - 3.2.1 - - - commons-configuration - commons-configuration - 1.6 - - - commons-daemon - commons-daemon - 1.0.3 - - - commons-io - commons-io - 2.4 - - - commons-lang - commons-lang - ${commons-lang.version} - - - - commons-logging - commons-logging - 1.1.1 - - - commons-net - commons-net - 2.0 - - - commons-pool - commons-pool - 1.5.6 - - - - org.apache.zookeeper - zookeeper - 3.4.10 - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-test - ${curator.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - - - junit - junit - 4.12 - - - org.antlr - antlr-runtime - ${antlr.version} - - - org.antlr - antlr4-runtime - ${antlr4.version} - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - ${aries.spifly.version} - - - org.apache.commons - commons-lang3 - 3.1 - - - org.apache.felix - org.apache.felix.framework - 4.2.1 - - - org.apache.felix - org.apache.felix.log - 1.0.1 - - - org.apache.felix - org.apache.felix.main - 4.2.1 - - - org.apache.httpcomponents - fluent-hc - 4.3.6 - - - org.apache.httpcomponents - httpclient - 4.3.6 - - - org.apache.httpcomponents - httpcore - 4.3.3 - - - org.apache.httpcomponents - httpmime - 4.3.6 - - - org.apache.maven - maven-artifact - 3.5.0 - - - org.apache.maven - maven-core - 3.5.0 - - - org.apache.maven - maven-model - 3.5.0 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.5 - - - org.apache.maven - maven-plugin-api - 3.5.0 - - - org.apache.maven - maven-project - 2.2.1 - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.surefire - surefire-junit4 - ${surefire.version} - - - org.apache.maven.surefire - surefire-providers - ${surefire.version} - pom - - - org.codehaus.jettison - jettison - 1.3.1 - - - org.cthul - cthul-matchers - 1.0 - test - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.eclipse.jetty - jetty-http - ${jetty.version} - - - org.eclipse.jetty - jetty-jmx - ${jetty.version} - - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.hamcrest - hamcrest-library - 1.3 - test - - - uk.co.datumedge - hamcrest-json - 0.2 - test - - - org.hdrhistogram - HdrHistogram - 2.1.8 - - - org.json - json - 20090211 - - - org.mockito - mockito-all - 1.9.5 - - - org.mockito - mockito-core - 1.9.5 - test - - - org.osgi - org.osgi.compendium - 4.3.0 - - - org.osgi - org.osgi.core - 4.3.0 - - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang.modules - scala-parser-combinators_${scala.major-version} - 1.0.1 - - - org.scala-lang.modules - scala-xml_${scala.major-version} - 1.0.2 - - - org.scalatest - scalatest_${scala.major-version} - 2.2.2 - - - org.slf4j - jcl-over-slf4j - 1.7.5 - - - org.slf4j - log4j-over-slf4j - 1.7.5 - - - org.slf4j - slf4j-api - 1.7.5 - - - org.slf4j - slf4j-jdk14 - 1.7.5 - - - org.springframework - spring-test - 4.0.6.RELEASE - - - org.testng - testng - 6.10 - - - org.twdata.maven - mojo-executor - 2.3.0 - - - net.jcip - jcip-annotations - 1.0 - - - net.jpountz.lz4 - lz4 - 1.3.0 - - - net.spy - spymemcached - 2.10.1 - - - xerces - xercesImpl - 2.11.0 - - - org.bouncycastle - bcpkix-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} - - - org.glassfish.jersey.containers - jersey-container-servlet-core - ${jersey2.version} - - - org.glassfish.jersey.containers - jersey-container-servlet - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-multipart - ${jersey2.version} - - - org.glassfish.jersey.ext - jersey-proxy-client - ${jersey2.version} - - - org.glassfish.jersey.core - jersey-client - ${jersey2.version} - - - com.ibm.icu - icu4j - 57.1 - - - com.yahoo.athenz - athenz-zms-java-client - ${athenz.version} - - - com.yahoo.athenz - athenz-zts-java-client - ${athenz.version} - - - - - - 2.0.1 - 3.5.2 - 4.5 - 1.0.8 - 1.0.0 - 5.0.3 - - 1.7.28 - 1.58 - 2.6 - - 2.9.1 - 2.8.3 - 2.23.2 - 9.4.6.v20170531 - UTF-8 - UTF-8 - true - all - 2.11 - ${scala.major-version}.4 - 2.19.1 - - application application-deploy-plugin @@ -989,6 +53,7 @@ container-core container-accesslogging container-dependencies-enforcer + container-dependency-versions container-dev container-di container-disc @@ -1033,6 +98,7 @@ node-maintainer orchestrator-restapi orchestrator + parent predicate-search predicate-search-core processing diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index ea2995c4770..8ced58b840e 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml predicate-search-core 6-SNAPSHOT diff --git a/predicate-search/pom.xml b/predicate-search/pom.xml index ca79544c766..289250012a0 100644 --- a/predicate-search/pom.xml +++ b/predicate-search/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml predicate-search 6-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 15aa984cbd2..9bb9ee77037 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml processing jar diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 18cdd294b87..33f1977c7e2 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml provided-dependencies jar diff --git a/searchcore/pom.xml b/searchcore/pom.xml index f31617cfe53..3b43bf1205e 100644 --- a/searchcore/pom.xml +++ b/searchcore/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml searchcore 6-SNAPSHOT diff --git a/searchlib/pom.xml b/searchlib/pom.xml index c669903c3da..5f6717d9516 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml searchlib container-plugin diff --git a/searchsummary/pom.xml b/searchsummary/pom.xml index 97a29655ad1..417e25ff944 100644 --- a/searchsummary/pom.xml +++ b/searchsummary/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml searchsummary 6-SNAPSHOT diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index c63bdf35574..6125b75819c 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml service-monitor container-plugin diff --git a/serviceview/pom.xml b/serviceview/pom.xml index c3620ecfc9d..4357cc697b8 100644 --- a/serviceview/pom.xml +++ b/serviceview/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml serviceview container-plugin diff --git a/simplemetrics/pom.xml b/simplemetrics/pom.xml index d027fda82ce..02758b182e3 100644 --- a/simplemetrics/pom.xml +++ b/simplemetrics/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml simplemetrics container-plugin diff --git a/socket_test/pom.xml b/socket_test/pom.xml index 60d8b3713e9..0c6d5cd77f4 100644 --- a/socket_test/pom.xml +++ b/socket_test/pom.xml @@ -12,6 +12,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jar diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 9300181e00b..0d66951f364 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml standalone-container 6-SNAPSHOT diff --git a/statistics/pom.xml b/statistics/pom.xml index 7bbef0ea3c0..521efa9a2a1 100644 --- a/statistics/pom.xml +++ b/statistics/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml statistics 6-SNAPSHOT diff --git a/storage/pom.xml b/storage/pom.xml index 49b103cbe34..e0b21d5a8a9 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml storage 6-SNAPSHOT diff --git a/testutil/pom.xml b/testutil/pom.xml index 9f98f40c2d0..911c5654efe 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml testutil jar diff --git a/vdslib/pom.xml b/vdslib/pom.xml index 48681b8ce83..5063489ed66 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vdslib container-plugin diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 2464c8208ad..980c8eee60f 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa-application-maven-plugin 6-SNAPSHOT diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index 4e96a0475f7..718b19ae994 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa-documentgen-plugin maven-plugin diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index b9fbd589525..62d9010b9fd 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa-hadoop 6-SNAPSHOT diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index 15d72b7c1c2..c336c641352 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa-http-client 6-SNAPSHOT diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index f54b2df9b8a..436dcc06f3d 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -13,6 +13,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa_feed_perf 6-SNAPSHOT diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index 3250cd8a41f..781075fd041 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa_jersey2 6-SNAPSHOT diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index 59895438038..3472f3fcdc5 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespaclient-container-plugin 6-SNAPSHOT diff --git a/vespaclient-core/pom.xml b/vespaclient-core/pom.xml index bdb15825fbb..2e427364bd6 100644 --- a/vespaclient-core/pom.xml +++ b/vespaclient-core/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespaclient-core 6-SNAPSHOT diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 8cde41d53d7..d692a6ed57f 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespaclient-java 6-SNAPSHOT diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index 1f98a5e4c02..81c385c96ab 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespajlib container-plugin diff --git a/vespalog/pom.xml b/vespalog/pom.xml index 6cea5ab83d9..6443769afbe 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespalog 6-SNAPSHOT diff --git a/vsm/pom.xml b/vsm/pom.xml index 8c5b006aeec..3c491906060 100644 --- a/vsm/pom.xml +++ b/vsm/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vsm 6-SNAPSHOT diff --git a/yolean/pom.xml b/yolean/pom.xml index d64ea29a95c..850daae6fea 100644 --- a/yolean/pom.xml +++ b/yolean/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml yolean 6-SNAPSHOT diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 45ba8c32372..f9cb8c42688 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml zkfacade container-plugin -- cgit v1.2.3 From f35c228d1ac4cad6cbc8a348c0affccdfac6339b Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 30 Nov 2017 15:56:29 +0100 Subject: Revert "Gjoranv/split parent2" --- annotations/pom.xml | 1 - application-deploy-plugin/pom.xml | 1 - application-model/pom.xml | 1 - application-preprocessor/pom.xml | 1 - application/pom.xml | 1 - athenz-identity-provider-service/pom.xml | 1 - bootstrap.sh | 10 +- bundle-plugin-test/pom.xml | 1 - bundle-plugin/pom.xml | 1 - chain/pom.xml | 1 - clustercontroller-apps/pom.xml | 1 - clustercontroller-apputil/pom.xml | 1 - clustercontroller-core/pom.xml | 1 - clustercontroller-standalone/pom.xml | 1 - clustercontroller-utils/pom.xml | 1 - component/pom.xml | 1 - config-application-package/pom.xml | 1 - config-bundle/pom.xml | 1 - config-class-plugin/pom.xml | 1 - config-lib/pom.xml | 1 - config-model-api/pom.xml | 1 - config-model-fat/pom.xml | 1 - config-model/pom.xml | 1 - config-provisioning/pom.xml | 1 - config-proxy/pom.xml | 1 - config/pom.xml | 1 - configdefinitions/pom.xml | 1 - configgen/pom.xml | 1 - configserver/pom.xml | 1 - container-accesslogging/pom.xml | 1 - container-core/pom.xml | 1 - container-dependencies-enforcer/pom.xml | 45 +- container-dependency-versions/pom.xml | 369 ------------ container-dev/pom.xml | 1 - container-di/pom.xml | 1 - container-disc/pom.xml | 1 - container-jersey2/pom.xml | 1 - container-messagebus/pom.xml | 1 - container-search-and-docproc/pom.xml | 1 - container-search/pom.xml | 1 - container-test-jars/pom.xml | 1 - container-test/pom.xml | 1 - container/pom.xml | 1 - controller-api/pom.xml | 1 - controller-server/pom.xml | 1 - defaults/pom.xml | 7 +- docker-api/pom.xml | 1 - docproc/pom.xml | 1 - docprocs/pom.xml | 1 - document/pom.xml | 1 - documentapi/pom.xml | 1 - documentgen-test/pom.xml | 1 - fileacquirer/pom.xml | 1 - filedistribution/pom.xml | 3 +- filedistribution_test/pom.xml | 1 - filedistributionmanager/pom.xml | 1 - fsa/pom.xml | 1 - indexinglanguage/pom.xml | 1 - jaxrs_client_utils/pom.xml | 1 - jaxrs_utils/pom.xml | 1 - jdisc_core/pom.xml | 1 - jdisc_core_test/pom.xml | 1 - jdisc_http_service/pom.xml | 1 - jdisc_jetty/pom.xml | 1 - jdisc_messagebus_service/pom.xml | 1 - jrt/pom.xml | 1 - linguistics/pom.xml | 2 - logd/pom.xml | 1 - logserver/pom.xml | 1 - maven-plugins/pom.xml | 1 - messagebus-disc/pom.xml | 1 - messagebus/pom.xml | 1 - metrics/pom.xml | 1 - node-admin/pom.xml | 1 - node-maintainer/pom.xml | 1 - node-repository/pom.xml | 1 - orchestrator-restapi/pom.xml | 1 - orchestrator/pom.xml | 1 - parent/pom.xml | 758 ------------------------- pom.xml | 942 ++++++++++++++++++++++++++++++- predicate-search-core/pom.xml | 1 - predicate-search/pom.xml | 1 - processing/pom.xml | 1 - provided-dependencies/pom.xml | 1 - searchcore/pom.xml | 1 - searchlib/pom.xml | 1 - searchsummary/pom.xml | 1 - service-monitor/pom.xml | 2 - serviceview/pom.xml | 1 - simplemetrics/pom.xml | 1 - socket_test/pom.xml | 1 - standalone-container/pom.xml | 1 - statistics/pom.xml | 1 - storage/pom.xml | 1 - testutil/pom.xml | 2 - vdslib/pom.xml | 1 - vespa-application-maven-plugin/pom.xml | 1 - vespa-documentgen-plugin/pom.xml | 1 - vespa-hadoop/pom.xml | 1 - vespa-http-client/pom.xml | 1 - vespa_feed_perf/pom.xml | 1 - vespa_jersey2/pom.xml | 1 - vespaclient-container-plugin/pom.xml | 1 - vespaclient-core/pom.xml | 1 - vespaclient-java/pom.xml | 1 - vespajlib/pom.xml | 1 - vespalog/pom.xml | 1 - vsm/pom.xml | 1 - yolean/pom.xml | 1 - zkfacade/pom.xml | 1 - 110 files changed, 965 insertions(+), 1275 deletions(-) delete mode 100644 container-dependency-versions/pom.xml delete mode 100644 parent/pom.xml (limited to 'container-search') diff --git a/annotations/pom.xml b/annotations/pom.xml index 3321dddaf8c..146eb5e9be2 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml annotations jar diff --git a/application-deploy-plugin/pom.xml b/application-deploy-plugin/pom.xml index 501dee385a6..3cae7cf7831 100644 --- a/application-deploy-plugin/pom.xml +++ b/application-deploy-plugin/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml application-deploy-plugin 6-SNAPSHOT diff --git a/application-model/pom.xml b/application-model/pom.xml index 801c72e9194..13a2d3ea49b 100644 --- a/application-model/pom.xml +++ b/application-model/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml application-model container-plugin diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index 6ffff09e548..4fa319a881a 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml application-preprocessor jar diff --git a/application/pom.xml b/application/pom.xml index 8103226e55d..17e9ece3543 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml application jar diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index bfd02d54d43..c87589d7be2 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -11,7 +11,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml diff --git a/bootstrap.sh b/bootstrap.sh index b71af73c529..075da74b7c7 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -44,16 +44,8 @@ $top/dist/getversion.pl -M $top > $top/dist/vtag.map # The 'default' mode also builds some modules needed by C++ code. # The 'full' mode also builds modules needed by C++ tests. -# must install parent poms first: +# must install parent pom first: echo "Downloading all dependencies. This may take a few minutes with an empty Maven cache." -( - cd container-dependency-versions - mvn_install -) -( - cd parent - mvn_install -) mvn_install -N # and build plugins first: diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index 3dd5be00add..8d8bf48cc07 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml com.yahoo.vespa bundle-plugin-test diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 47a06a1ee76..02f0ed2ccf5 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml bundle-plugin 6-SNAPSHOT diff --git a/chain/pom.xml b/chain/pom.xml index 01a64a93609..a3096d37748 100755 --- a/chain/pom.xml +++ b/chain/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml chain jar diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml index bdc6059a816..26f466eb208 100644 --- a/clustercontroller-apps/pom.xml +++ b/clustercontroller-apps/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml clustercontroller-apps 6-SNAPSHOT diff --git a/clustercontroller-apputil/pom.xml b/clustercontroller-apputil/pom.xml index 42c7690eab6..68adc82596f 100644 --- a/clustercontroller-apputil/pom.xml +++ b/clustercontroller-apputil/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml clustercontroller-apputil 6-SNAPSHOT diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 99cf4df643b..499dee0d1de 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml clustercontroller-core 6-SNAPSHOT diff --git a/clustercontroller-standalone/pom.xml b/clustercontroller-standalone/pom.xml index f435cd9d7c4..f51555a92b6 100644 --- a/clustercontroller-standalone/pom.xml +++ b/clustercontroller-standalone/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml clustercontroller-standalone 6-SNAPSHOT diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index 287a85089ca..f151a623ff9 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml clustercontroller-utils 6-SNAPSHOT diff --git a/component/pom.xml b/component/pom.xml index 18bfd000a84..92f852e4ba0 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml component container-plugin diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 629c02de1e8..90d4a2d9af6 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config-application-package container-plugin diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index 07262141801..7121756ce68 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config-bundle container-plugin diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index 71a20782d85..5b3149a13da 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config-class-plugin maven-plugin diff --git a/config-lib/pom.xml b/config-lib/pom.xml index 31648958fa6..2ed993dd052 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config-lib container-plugin diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 743164afb16..6618612df31 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config-model-api 6-SNAPSHOT diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 0526c2f6581..a4bbba0e6e8 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config-model-fat bundle diff --git a/config-model/pom.xml b/config-model/pom.xml index 729d1a2ef9b..0fdc09e1a61 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config-model container-plugin diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml index 05f94973017..ebe7d460989 100644 --- a/config-provisioning/pom.xml +++ b/config-provisioning/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml com.yahoo.vespa config-provisioning diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index a266f68efe2..0aadb1bbb12 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config-proxy jar diff --git a/config/pom.xml b/config/pom.xml index cfa3a692181..f73c5b7bfd8 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml config container-plugin diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 487c43ed3b3..92980a18899 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml configdefinitions container-plugin diff --git a/configgen/pom.xml b/configgen/pom.xml index e8de114f8d5..6e550ec7321 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml configgen jar diff --git a/configserver/pom.xml b/configserver/pom.xml index f5aa8ea3118..30d92dc7650 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml configserver container-plugin diff --git a/container-accesslogging/pom.xml b/container-accesslogging/pom.xml index b4c7094a50a..45d7b4a2ed2 100644 --- a/container-accesslogging/pom.xml +++ b/container-accesslogging/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-accesslogging 6-SNAPSHOT diff --git a/container-core/pom.xml b/container-core/pom.xml index 1be10215419..c608f35f26c 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-core 6-SNAPSHOT diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 3384da7c1eb..61495384744 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-dependencies-enforcer @@ -82,36 +81,36 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:[2.5.4, ${jackson2.version}]:jar:provided com.fasterxml.jackson.module:jackson-module-jaxb-annotations:[2.5.4, ${jackson2.version}]:jar:provided - com.google.code.findbugs:annotations:[${findbugs.version}]:jar:provided - com.google.code.findbugs:jsr305:[${findbugs.version}]:jar:provided - com.google.guava:guava:[${guava.version}]:jar:provided - com.google.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided - com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar:provided - com.google.inject:guice:[${guice.version}]:jar:provided:no_aop + com.google.code.findbugs:annotations:[1.3.9]:jar:provided + com.google.code.findbugs:jsr305:[1.3.9]:jar:provided + com.google.guava:guava:[18.0]:jar:provided + com.google.inject.extensions:guice-assistedinject:[3.0]:jar:provided + com.google.inject.extensions:guice-multibindings:[3.0]:jar:provided + com.google.inject:guice:[3.0]:jar:provided:no_aop commons-codec:commons-codec:[1.4]:jar:provided commons-daemon:commons-daemon:[1.0.3]:jar:provided commons-logging:commons-logging:[1.1.1]:jar:provided - javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided + javax.annotation:javax.annotation-api:[1.2]:jar:provided javax.inject:javax.inject:[1]:jar:provided javax.servlet:javax.servlet-api:[3.1.0]:jar:provided - javax.validation:validation-api:[${javax.validation-api.version}]:jar:provided + javax.validation:validation-api:[1.1.0.Final]:jar:provided javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided net.jcip:jcip-annotations:[1.0]:jar:provided net.jpountz.lz4:lz4:[1.3.0]:jar:provided - org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided + org.apache.felix:org.apache.felix.framework:[4.2.1]:jar:provided org.apache.felix:org.apache.felix.log:[1.0.1]:jar:provided - org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided + org.apache.felix:org.apache.felix.main:[4.2.1]:jar:provided org.apache.httpcomponents:httpclient:[4.3.6]:jar:provided org.apache.httpcomponents:httpcore:[4.3.3]:jar:provided org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:provided org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:provided - org.glassfish.hk2.external:aopalliance-repackaged:[${hk2.version}]:jar:provided - org.glassfish.hk2.external:javax.inject:[${hk2.version}]:jar:provided - org.glassfish.hk2:hk2-api:[${hk2.version}]:jar:provided - org.glassfish.hk2:hk2-locator:[${hk2.version}]:jar:provided - org.glassfish.hk2:hk2-utils:[${hk2.version}]:jar:provided - org.glassfish.hk2:osgi-resource-locator:[${hk2.osgi-resource-locator.version}]:jar:provided + org.glassfish.hk2.external:aopalliance-repackaged:[2.5.0-b05]:jar:provided + org.glassfish.hk2.external:javax.inject:[2.5.0-b05]:jar:provided + org.glassfish.hk2:hk2-api:[2.5.0-b05]:jar:provided + org.glassfish.hk2:hk2-locator:[2.5.0-b05]:jar:provided + org.glassfish.hk2:hk2-utils:[2.5.0-b05]:jar:provided + org.glassfish.hk2:osgi-resource-locator:[1.0.1]:jar:provided org.glassfish.jersey.bundles.repackaged:jersey-guava:[${jersey2.version}]:jar:provided org.glassfish.jersey.containers:jersey-container-servlet-core:[${jersey2.version}]:jar:provided org.glassfish.jersey.containers:jersey-container-servlet:[${jersey2.version}]:jar:provided @@ -123,13 +122,13 @@ org.glassfish.jersey.media:jersey-media-jaxb:[${jersey2.version}]:jar:provided org.glassfish.jersey.media:jersey-media-json-jackson:[${jersey2.version}]:jar:provided org.glassfish.jersey.media:jersey-media-multipart:[${jersey2.version}]:jar:provided - org.javassist:javassist:[${javassist.version}]:jar:provided + org.javassist:javassist:[3.20.0-GA]:jar:provided org.json:json:[20090211]:jar:provided - org.jvnet.mimepull:mimepull:[${mimepull.version}]:jar:provided - org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided - org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided - org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided - org.slf4j:slf4j-jdk14:[${slf4j.version}]:jar:provided + org.jvnet.mimepull:mimepull:[1.9.6]:jar:provided + org.slf4j:jcl-over-slf4j:[1.7.5]:jar:provided + org.slf4j:log4j-over-slf4j:[1.7.5]:jar:provided + org.slf4j:slf4j-api:[1.7.5]:jar:provided + org.slf4j:slf4j-jdk14:[1.7.5]:jar:provided xml-apis:xml-apis:[1.4.01]:jar:provided diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml deleted file mode 100644 index 5007e91c916..00000000000 --- a/container-dependency-versions/pom.xml +++ /dev/null @@ -1,369 +0,0 @@ - - - - 4.0.0 - com.yahoo.vespa - container-dependency-versions - pom - 6-SNAPSHOT - Dependency versions for all Vespa maven projects. - https://github.com/vespa-engine - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - - - aopalliance - aopalliance - 1.0 - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson2.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson2.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson2.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson2.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson2.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson2.version} - - - com.google.code.findbugs - annotations - ${findbugs.version} - - - com.google.code.findbugs - jsr305 - ${findbugs.version} - - - com.google.guava - guava - ${guava.version} - - - com.google.inject.extensions - guice-assistedinject - ${guice.version} - - - com.google.inject.extensions - guice-multibindings - ${guice.version} - - - com.google.inject - guice - ${guice.version} - - - com.google.inject - guice - ${guice.version} - no_aop - - - commons-codec - commons-codec - 1.4 - - - commons-daemon - commons-daemon - 1.0.3 - - - - commons-logging - commons-logging - 1.1.1 - - - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} - - - javax.inject - javax.inject - 1 - - - javax.servlet - javax.servlet-api - 3.1.0 - - - javax.validation - validation-api - ${javax.validation-api.version} - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} - - - net.jcip - jcip-annotations - 1.0 - - - net.jpountz.lz4 - lz4 - 1.3.0 - - - org.apache.felix - org.apache.felix.framework - ${felix.version} - - - org.apache.felix - org.apache.felix.log - 1.0.1 - - - org.apache.felix - org.apache.felix.main - ${felix.version} - - - org.apache.httpcomponents - httpclient - 4.3.6 - - - org.apache.httpcomponents - httpcore - 4.3.3 - - - org.eclipse.jetty - jetty-http - ${jetty.version} - - - org.eclipse.jetty - jetty-io - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.glassfish.hk2.external - aopalliance-repackaged - ${hk2.version} - - - org.glassfish.hk2.external - javax.inject - ${hk2.version} - - - org.glassfish.hk2 - hk2-api - ${hk2.version} - - - org.glassfish.hk2 - hk2-locator - ${hk2.version} - - - org.glassfish.hk2 - hk2-utils - ${hk2.version} - - - org.glassfish.hk2 - osgi-resource-locator - ${hk2.osgi-resource-locator.version} - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - ${jersey2.version} - - - org.glassfish.jersey.containers - jersey-container-servlet-core - ${jersey2.version} - - - org.glassfish.jersey.containers - jersey-container-servlet - ${jersey2.version} - - - org.glassfish.jersey.core - jersey-client - ${jersey2.version} - - - org.glassfish.jersey.core - jersey-common - ${jersey2.version} - - - org.glassfish.jersey.core - jersey-server - ${jersey2.version} - - - org.glassfish.jersey.ext - jersey-entity-filtering - ${jersey2.version} - - - org.glassfish.jersey.ext - jersey-proxy-client - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-jaxb - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-multipart - ${jersey2.version} - - - org.javassist - javassist - ${javassist.version} - - - org.json - json - 20090211 - - - org.jvnet.mimepull - mimepull - ${mimepull.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-jdk14 - ${slf4j.version} - - - xml-apis - xml-apis - 1.4.01 - - - - - - 4.2.1 - 1.3.9 - 18.0 - 3.0 - 9.4.6.v20170531 - 1.7.5 - - - - - 2.5.0-b05 - 1.0.1 - 2.8.3 - 3.20.0-GA - 1.2 - 1.1.0.Final - 2.0.1 - 2.23.2 - 1.9.6 - - - diff --git a/container-dev/pom.xml b/container-dev/pom.xml index f62bbd22690..d02ec233d96 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -10,7 +10,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-dev 6-SNAPSHOT diff --git a/container-di/pom.xml b/container-di/pom.xml index abc652d6e6e..cf6a9e54daa 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-di 6-SNAPSHOT diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 38b4bfc2ff5..ad86b3ffcff 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-disc 6-SNAPSHOT diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml index 26dfa762032..8f579e49876 100644 --- a/container-jersey2/pom.xml +++ b/container-jersey2/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-jersey2 6-SNAPSHOT diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml index 1daf1df6fcb..6058063daf3 100644 --- a/container-messagebus/pom.xml +++ b/container-messagebus/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-messagebus 6-SNAPSHOT diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 9b4419ae2b6..fb2794670a2 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-search-and-docproc 6-SNAPSHOT diff --git a/container-search/pom.xml b/container-search/pom.xml index 0df502cf21a..f622567acde 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-search jar diff --git a/container-test-jars/pom.xml b/container-test-jars/pom.xml index 804ca5eb879..dcde18fc8cf 100644 --- a/container-test-jars/pom.xml +++ b/container-test-jars/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml com.yahoo.vespa.container-test-jars container-test-jars diff --git a/container-test/pom.xml b/container-test/pom.xml index 26f02767062..7aaffed652e 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -11,7 +11,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container-test 6-SNAPSHOT diff --git a/container/pom.xml b/container/pom.xml index 3793a3508a4..4726071db55 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -11,7 +11,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml container 6-SNAPSHOT diff --git a/controller-api/pom.xml b/controller-api/pom.xml index 5ef130a22ba..51666da0c03 100644 --- a/controller-api/pom.xml +++ b/controller-api/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml controller-api container-plugin diff --git a/controller-server/pom.xml b/controller-server/pom.xml index b033286b82a..0cfcbc40601 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml controller-server container-plugin diff --git a/defaults/pom.xml b/defaults/pom.xml index 4d1a08aacc2..2f3f06780e7 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -5,10 +5,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.yahoo.vespa - parent - 6-SNAPSHOT - ../parent/pom.xml + com.yahoo.vespa + parent + 6-SNAPSHOT com.yahoo.vespa defaults diff --git a/docker-api/pom.xml b/docker-api/pom.xml index 449a94fb621..fc374a12dd2 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml docker-api diff --git a/docproc/pom.xml b/docproc/pom.xml index 1043de32128..09635201e51 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml docproc jar diff --git a/docprocs/pom.xml b/docprocs/pom.xml index 16259a861c7..1b209ec39ee 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml docprocs container-plugin diff --git a/document/pom.xml b/document/pom.xml index 10f71218422..81b21487314 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml document 6-SNAPSHOT diff --git a/documentapi/pom.xml b/documentapi/pom.xml index 3781dfd93ac..c94337e8873 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml documentapi container-plugin diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index d009ef3d592..53b49cf1473 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml documentgen-test jar diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index 6449b8c620f..eb040eddffb 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml fileacquirer 6-SNAPSHOT diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index b0bdaff518f..10b77b540e7 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -9,8 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml - + filedistribution 6-SNAPSHOT diff --git a/filedistribution_test/pom.xml b/filedistribution_test/pom.xml index 5cc113c6453..c270eabb6cf 100644 --- a/filedistribution_test/pom.xml +++ b/filedistribution_test/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml filedistribution_test 6-SNAPSHOT diff --git a/filedistributionmanager/pom.xml b/filedistributionmanager/pom.xml index 9f037814a12..9e3ecf95ecb 100644 --- a/filedistributionmanager/pom.xml +++ b/filedistributionmanager/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml filedistributionmanager 6-SNAPSHOT diff --git a/fsa/pom.xml b/fsa/pom.xml index 2a56069f82e..a49845105cf 100644 --- a/fsa/pom.xml +++ b/fsa/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml fsa container-plugin diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index f0aba8d9476..70cb9f6d8d0 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml indexinglanguage jar diff --git a/jaxrs_client_utils/pom.xml b/jaxrs_client_utils/pom.xml index e3de5b8163d..1c4bdde21a8 100644 --- a/jaxrs_client_utils/pom.xml +++ b/jaxrs_client_utils/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml jaxrs_client_utils 6-SNAPSHOT diff --git a/jaxrs_utils/pom.xml b/jaxrs_utils/pom.xml index 1753d016ec3..249cbda992b 100644 --- a/jaxrs_utils/pom.xml +++ b/jaxrs_utils/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml jaxrs_utils 6-SNAPSHOT diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 55da222994f..fb8200eb610 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml jdisc_core 6-SNAPSHOT diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index a1a96463ffc..92e7a39fee0 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml com.yahoo.vespa.jdisc_core parent diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index a1482669b39..d8c0b0bc29c 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml jdisc_http_service 6-SNAPSHOT diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index 0f8a5ba19e2..4e739aae8cc 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml jdisc_jetty 6-SNAPSHOT diff --git a/jdisc_messagebus_service/pom.xml b/jdisc_messagebus_service/pom.xml index 6201f413b9a..e9531a73861 100644 --- a/jdisc_messagebus_service/pom.xml +++ b/jdisc_messagebus_service/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml jdisc_messagebus_service 6-SNAPSHOT diff --git a/jrt/pom.xml b/jrt/pom.xml index cf3da2ab7ce..0d6be56fdab 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml jrt container-plugin diff --git a/linguistics/pom.xml b/linguistics/pom.xml index e4aa7c3049e..328742f483a 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml linguistics container-plugin @@ -60,7 +59,6 @@ com.google.inject guice provided - no_aop diff --git a/logd/pom.xml b/logd/pom.xml index a1a107bc20c..e21931efc5a 100644 --- a/logd/pom.xml +++ b/logd/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml logd 6-SNAPSHOT diff --git a/logserver/pom.xml b/logserver/pom.xml index 55c5c443cfb..6acdd8ed1d7 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml logserver jar diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 0aabe630a63..2f7343e753c 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml com.yahoo.vespa bundle-plugins diff --git a/messagebus-disc/pom.xml b/messagebus-disc/pom.xml index 89741dce82b..46158b0ca60 100644 --- a/messagebus-disc/pom.xml +++ b/messagebus-disc/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml messagebus-disc 6-SNAPSHOT diff --git a/messagebus/pom.xml b/messagebus/pom.xml index 7c37bccbd9a..7fb44787cdf 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml messagebus 6-SNAPSHOT diff --git a/metrics/pom.xml b/metrics/pom.xml index 628ab66552d..ec64d0d392c 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml com.yahoo.vespa metrics diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 983e4d3a832..f7691cda3f7 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml node-admin diff --git a/node-maintainer/pom.xml b/node-maintainer/pom.xml index 1fe3eb23857..d56e12d92c6 100644 --- a/node-maintainer/pom.xml +++ b/node-maintainer/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml node-maintainer diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 6673ea487a1..09b0d3df3d9 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml node-repository 6-SNAPSHOT diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index 310512812e2..db823f3fb15 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml orchestrator-restapi 6-SNAPSHOT diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index ae22b6718f9..c50f9ddcb29 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml orchestrator 6-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index e01612218ff..00000000000 --- a/parent/pom.xml +++ /dev/null @@ -1,758 +0,0 @@ - - - - 4.0.0 - parent - pom - 6-SNAPSHOT - parent - Parent artifact for all Vespa maven projects. - https://github.com/vespa-engine - - - com.yahoo.vespa - container-dependency-versions - 6-SNAPSHOT - ../container-dependency-versions/pom.xml - - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - Vespa - https://github.com/vespa-engine - - - - - - bintray-vespa-repo - https://api.bintray.com/maven/yahoo/maven/vespa;publish=1 - - - - - - - - false - - bintray-yahoo-maven - bintray - https://yahoo.bintray.com/maven - - - - - scm:git:git@github.com:vespa-engine/vespa.git - scm:git:git@github.com:vespa-engine/vespa.git - git@github.com:vespa-engine/vespa.git - - - - ${project.artifactId} - - - org.apache.maven.wagon - wagon-ssh-external - 2.7 - - - org.apache.maven.archetype - archetype-packaging - 2.0 - - - - - - org.antlr - antlr3-maven-plugin - ${antlr.version} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - org.apache.felix - maven-bundle-plugin - 2.4.0 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - true - true - false - - -Xlint:all - -Xlint:-serial - -Xlint:-try - -Xlint:-processing - -Xlint:-varargs - -Werror - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - true - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:${doclint} -Xdoclint:-missing - - 2.10.4 - - - org.apache.maven.plugins - maven-plugin-plugin - 3.5 - - - true - - - - mojo-descriptor - - descriptor - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - \ - - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - ${test.hide} - - ${project.build.directory} - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${surefire.version} - - false - false - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - org.codehaus.mojo - javacc-maven-plugin - 2.6 - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - net.alchim31.maven - scala-maven-plugin - 3.2.2 - - - -unchecked - -deprecation - -feature - -Xfatal-warnings - - - - - com.yahoo.vespa - bundle-plugin - ${project.version} - - ${project.version} - true - - - - - - - - attach-sources - - - !skipSources - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - - generate-javadoc - - - !skipJavadoc - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - generate-javadoc - package - - javadoc - - - - - -Xdoclint:${doclint} -Xdoclint:-missing - ${javadoc.failOnError} - true - private - - - - - - - coverage - - - - org.codehaus.mojo - exec-maven-plugin - - true - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - src/main/scala - - - - - add-test-source - generate-test-sources - - add-test-source - - - - src/test/scala - - - - - - - - - - sign-artifacts - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 2.7 - - - com.github.cverges.expect4j - expect4j - 1.6 - - - org.apache.commons - commons-compress - 1.11 - - - org.apache.commons - commons-exec - 1.3 - - - io.airlift - airline - 0.7 - - - org.ow2.asm - asm - 5.2 - - - com.google.guava - guava-testlib - 18.0 - - - com.google.protobuf - protobuf-java - 2.4.1 - - - com.googlecode.jmockit - jmockit - 1.2 - - - com.goldmansachs - gs-collections - 6.1.0 - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-xml-provider - ${jackson2.version} - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson2.version} - - - com.infradna.tool - bridge-method-annotation - 1.4 - - - commons-cli - commons-cli - 1.3.1 - - - commons-collections - commons-collections - 3.2.1 - - - commons-configuration - commons-configuration - 1.6 - - - commons-io - commons-io - 2.4 - - - commons-lang - commons-lang - ${commons-lang.version} - - - commons-net - commons-net - 2.0 - - - commons-pool - commons-pool - 1.5.6 - - - - org.apache.zookeeper - zookeeper - 3.4.10 - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-test - ${curator.version} - - - junit - junit - 4.12 - - - org.antlr - antlr-runtime - ${antlr.version} - - - org.antlr - antlr4-runtime - ${antlr4.version} - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - ${aries.spifly.version} - - - org.apache.commons - commons-lang3 - 3.1 - - - org.apache.httpcomponents - fluent-hc - 4.3.6 - - - org.apache.httpcomponents - httpmime - 4.3.6 - - - org.apache.maven - maven-artifact - 3.5.0 - - - org.apache.maven - maven-core - 3.5.0 - - - org.apache.maven - maven-model - 3.5.0 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.5 - - - org.apache.maven - maven-plugin-api - 3.5.0 - - - org.apache.maven - maven-project - 2.2.1 - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.surefire - surefire-junit4 - ${surefire.version} - - - org.apache.maven.surefire - surefire-providers - ${surefire.version} - pom - - - org.codehaus.jettison - jettison - 1.3.1 - - - org.cthul - cthul-matchers - 1.0 - test - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - org.eclipse.jetty - jetty-jmx - ${jetty.version} - - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.hamcrest - hamcrest-library - 1.3 - test - - - uk.co.datumedge - hamcrest-json - 0.2 - test - - - org.hdrhistogram - HdrHistogram - 2.1.8 - - - org.mockito - mockito-all - 1.9.5 - - - org.mockito - mockito-core - 1.9.5 - test - - - org.osgi - org.osgi.compendium - 4.3.0 - - - org.osgi - org.osgi.core - 4.3.0 - - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang.modules - scala-parser-combinators_${scala.major-version} - 1.0.1 - - - org.scala-lang.modules - scala-xml_${scala.major-version} - 1.0.2 - - - org.scalatest - scalatest_${scala.major-version} - 2.2.2 - - - org.springframework - spring-test - 4.0.6.RELEASE - - - org.testng - testng - 6.10 - - - org.twdata.maven - mojo-executor - 2.3.0 - - - net.spy - spymemcached - 2.10.1 - - - xerces - xercesImpl - 2.11.0 - - - org.bouncycastle - bcpkix-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - - - com.ibm.icu - icu4j - 57.1 - - - com.yahoo.athenz - athenz-zms-java-client - ${athenz.version} - - - com.yahoo.athenz - athenz-zts-java-client - ${athenz.version} - - - - - - 3.5.2 - 4.5 - 1.0.8 - 1.0.0 - 5.0.3 - - 1.7.28 - 1.58 - 2.6 - - 2.9.1 - UTF-8 - UTF-8 - true - all - 2.11 - ${scala.major-version}.4 - 2.19.1 - - - diff --git a/pom.xml b/pom.xml index eb1f954ce13..2b7c1abc0d4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,11 @@ 4.0.0 com.yahoo.vespa - vespa + parent pom 6-SNAPSHOT - Aggregator pom for vespa. + parent + Parent artifact for all Vespa maven projects. https://github.com/vespa-engine @@ -23,6 +24,941 @@ + + + bintray-vespa-repo + https://api.bintray.com/maven/yahoo/maven/vespa;publish=1 + + + + + + + + false + + bintray-yahoo-maven + bintray + https://yahoo.bintray.com/maven + + + + + scm:git:git@github.com:vespa-engine/vespa.git + scm:git:git@github.com:vespa-engine/vespa.git + git@github.com:vespa-engine/vespa.git + + + + ${project.artifactId} + + + org.apache.maven.wagon + wagon-ssh-external + 2.7 + + + org.apache.maven.archetype + archetype-packaging + 2.0 + + + + + + org.antlr + antlr3-maven-plugin + ${antlr.version} + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + org.apache.felix + maven-bundle-plugin + 2.4.0 + + + org.apache.maven.plugins + maven-assembly-plugin + 2.4 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + true + true + false + + -Xlint:all + -Xlint:-serial + -Xlint:-try + -Xlint:-processing + -Xlint:-varargs + -Werror + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.5 + + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + true + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:${doclint} -Xdoclint:-missing + + 2.10.4 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.5 + + + true + + + + mojo-descriptor + + descriptor + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + \ + + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + ${test.hide} + + ${project.build.directory} + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${surefire.version} + + false + false + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + org.codehaus.mojo + javacc-maven-plugin + 2.6 + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + net.alchim31.maven + scala-maven-plugin + 3.2.2 + + + -unchecked + -deprecation + -feature + -Xfatal-warnings + + + + + com.yahoo.vespa + bundle-plugin + ${project.version} + + ${project.version} + true + + + + + + + + attach-sources + + + !skipSources + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + + + generate-javadoc + + + !skipJavadoc + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + generate-javadoc + package + + javadoc + + + + + -Xdoclint:${doclint} -Xdoclint:-missing + ${javadoc.failOnError} + true + private + + + + + + + coverage + + + + org.codehaus.mojo + exec-maven-plugin + + true + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + src/main/scala + + + + + add-test-source + generate-test-sources + + add-test-source + + + + src/test/scala + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 2.7 + + + com.github.cverges.expect4j + expect4j + 1.6 + + + org.apache.commons + commons-compress + 1.11 + + + org.apache.commons + commons-exec + 1.3 + + + io.airlift + airline + 0.7 + + + aopalliance + aopalliance + 1.0 + + + org.ow2.asm + asm + 5.2 + + + com.google.code.findbugs + annotations + 1.3.9 + + + com.google.code.findbugs + jsr305 + 1.3.9 + + + com.google.guava + guava + 18.0 + + + com.google.guava + guava-testlib + 18.0 + + + com.google.inject + guice + 3.0 + + + com.google.inject + guice + 3.0 + no_aop + + + com.google.inject.extensions + guice-assistedinject + 3.0 + + + com.google.inject.extensions + guice-multibindings + 3.0 + + + com.google.protobuf + protobuf-java + 2.4.1 + + + com.googlecode.jmockit + jmockit + 1.2 + + + com.goldmansachs + gs-collections + 6.1.0 + + + com.fasterxml.jackson.core + jackson-core + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson2.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-xml-provider + ${jackson2.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson2.version} + + + com.infradna.tool + bridge-method-annotation + 1.4 + + + commons-cli + commons-cli + 1.3.1 + + + commons-codec + commons-codec + 1.4 + + + commons-collections + commons-collections + 3.2.1 + + + commons-configuration + commons-configuration + 1.6 + + + commons-daemon + commons-daemon + 1.0.3 + + + commons-io + commons-io + 2.4 + + + commons-lang + commons-lang + ${commons-lang.version} + + + + commons-logging + commons-logging + 1.1.1 + + + commons-net + commons-net + 2.0 + + + commons-pool + commons-pool + 1.5.6 + + + + org.apache.zookeeper + zookeeper + 3.4.10 + + + org.apache.curator + curator-recipes + ${curator.version} + + + org.apache.curator + curator-test + ${curator.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + + + junit + junit + 4.12 + + + org.antlr + antlr-runtime + ${antlr.version} + + + org.antlr + antlr4-runtime + ${antlr4.version} + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + ${aries.spifly.version} + + + org.apache.commons + commons-lang3 + 3.1 + + + org.apache.felix + org.apache.felix.framework + 4.2.1 + + + org.apache.felix + org.apache.felix.log + 1.0.1 + + + org.apache.felix + org.apache.felix.main + 4.2.1 + + + org.apache.httpcomponents + fluent-hc + 4.3.6 + + + org.apache.httpcomponents + httpclient + 4.3.6 + + + org.apache.httpcomponents + httpcore + 4.3.3 + + + org.apache.httpcomponents + httpmime + 4.3.6 + + + org.apache.maven + maven-artifact + 3.5.0 + + + org.apache.maven + maven-core + 3.5.0 + + + org.apache.maven + maven-model + 3.5.0 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.5 + + + org.apache.maven + maven-plugin-api + 3.5.0 + + + org.apache.maven + maven-project + 2.2.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + org.apache.maven.surefire + surefire-junit4 + ${surefire.version} + + + org.apache.maven.surefire + surefire-providers + ${surefire.version} + pom + + + org.codehaus.jettison + jettison + 1.3.1 + + + org.cthul + cthul-matchers + 1.0 + test + + + org.eclipse.jetty + jetty-continuation + ${jetty.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.eclipse.jetty + jetty-http + ${jetty.version} + + + org.eclipse.jetty + jetty-jmx + ${jetty.version} + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.hamcrest + hamcrest-library + 1.3 + test + + + uk.co.datumedge + hamcrest-json + 0.2 + test + + + org.hdrhistogram + HdrHistogram + 2.1.8 + + + org.json + json + 20090211 + + + org.mockito + mockito-all + 1.9.5 + + + org.mockito + mockito-core + 1.9.5 + test + + + org.osgi + org.osgi.compendium + 4.3.0 + + + org.osgi + org.osgi.core + 4.3.0 + + + org.scala-lang + scala-library + ${scala.version} + + + org.scala-lang.modules + scala-parser-combinators_${scala.major-version} + 1.0.1 + + + org.scala-lang.modules + scala-xml_${scala.major-version} + 1.0.2 + + + org.scalatest + scalatest_${scala.major-version} + 2.2.2 + + + org.slf4j + jcl-over-slf4j + 1.7.5 + + + org.slf4j + log4j-over-slf4j + 1.7.5 + + + org.slf4j + slf4j-api + 1.7.5 + + + org.slf4j + slf4j-jdk14 + 1.7.5 + + + org.springframework + spring-test + 4.0.6.RELEASE + + + org.testng + testng + 6.10 + + + org.twdata.maven + mojo-executor + 2.3.0 + + + net.jcip + jcip-annotations + 1.0 + + + net.jpountz.lz4 + lz4 + 1.3.0 + + + net.spy + spymemcached + 2.10.1 + + + xerces + xercesImpl + 2.11.0 + + + org.bouncycastle + bcpkix-jdk15on + ${bouncycastle.version} + + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs-api.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey2.version} + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey2.version} + + + org.glassfish.jersey.ext + jersey-proxy-client + ${jersey2.version} + + + org.glassfish.jersey.core + jersey-client + ${jersey2.version} + + + com.ibm.icu + icu4j + 57.1 + + + com.yahoo.athenz + athenz-zms-java-client + ${athenz.version} + + + com.yahoo.athenz + athenz-zts-java-client + ${athenz.version} + + + + + + 2.0.1 + 3.5.2 + 4.5 + 1.0.8 + 1.0.0 + 5.0.3 + + 1.7.28 + 1.58 + 2.6 + + 2.9.1 + 2.8.3 + 2.23.2 + 9.4.6.v20170531 + UTF-8 + UTF-8 + true + all + 2.11 + ${scala.major-version}.4 + 2.19.1 + + application application-deploy-plugin @@ -53,7 +989,6 @@ container-core container-accesslogging container-dependencies-enforcer - container-dependency-versions container-dev container-di container-disc @@ -98,7 +1033,6 @@ node-maintainer orchestrator-restapi orchestrator - parent predicate-search predicate-search-core processing diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index 8ced58b840e..ea2995c4770 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml predicate-search-core 6-SNAPSHOT diff --git a/predicate-search/pom.xml b/predicate-search/pom.xml index 289250012a0..ca79544c766 100644 --- a/predicate-search/pom.xml +++ b/predicate-search/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml predicate-search 6-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 9bb9ee77037..15aa984cbd2 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml processing jar diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 33f1977c7e2..18cdd294b87 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml provided-dependencies jar diff --git a/searchcore/pom.xml b/searchcore/pom.xml index 3b43bf1205e..f31617cfe53 100644 --- a/searchcore/pom.xml +++ b/searchcore/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml searchcore 6-SNAPSHOT diff --git a/searchlib/pom.xml b/searchlib/pom.xml index 5f6717d9516..c669903c3da 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml searchlib container-plugin diff --git a/searchsummary/pom.xml b/searchsummary/pom.xml index 417e25ff944..97a29655ad1 100644 --- a/searchsummary/pom.xml +++ b/searchsummary/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml searchsummary 6-SNAPSHOT diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 70f9d4aa655..c63bdf35574 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml service-monitor container-plugin @@ -67,7 +66,6 @@ com.google.inject guice provided - no_aop com.fasterxml.jackson.core diff --git a/serviceview/pom.xml b/serviceview/pom.xml index 4357cc697b8..c3620ecfc9d 100644 --- a/serviceview/pom.xml +++ b/serviceview/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml serviceview container-plugin diff --git a/simplemetrics/pom.xml b/simplemetrics/pom.xml index 02758b182e3..d027fda82ce 100644 --- a/simplemetrics/pom.xml +++ b/simplemetrics/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml simplemetrics container-plugin diff --git a/socket_test/pom.xml b/socket_test/pom.xml index 0c6d5cd77f4..60d8b3713e9 100644 --- a/socket_test/pom.xml +++ b/socket_test/pom.xml @@ -12,7 +12,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml jar diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 0d66951f364..9300181e00b 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml standalone-container 6-SNAPSHOT diff --git a/statistics/pom.xml b/statistics/pom.xml index 521efa9a2a1..7bbef0ea3c0 100644 --- a/statistics/pom.xml +++ b/statistics/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml statistics 6-SNAPSHOT diff --git a/storage/pom.xml b/storage/pom.xml index e0b21d5a8a9..49b103cbe34 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml storage 6-SNAPSHOT diff --git a/testutil/pom.xml b/testutil/pom.xml index 00f606860a4..9f98f40c2d0 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml testutil jar @@ -24,7 +23,6 @@ com.google.inject guice provided - no_aop org.hamcrest diff --git a/vdslib/pom.xml b/vdslib/pom.xml index 5063489ed66..48681b8ce83 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vdslib container-plugin diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 980c8eee60f..2464c8208ad 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespa-application-maven-plugin 6-SNAPSHOT diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index 718b19ae994..4e96a0475f7 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespa-documentgen-plugin maven-plugin diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index 62d9010b9fd..b9fbd589525 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespa-hadoop 6-SNAPSHOT diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index c336c641352..15d72b7c1c2 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -7,7 +7,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespa-http-client 6-SNAPSHOT diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index 436dcc06f3d..f54b2df9b8a 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -13,7 +13,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespa_feed_perf 6-SNAPSHOT diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index 781075fd041..3250cd8a41f 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespa_jersey2 6-SNAPSHOT diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index 3472f3fcdc5..59895438038 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -9,7 +9,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespaclient-container-plugin 6-SNAPSHOT diff --git a/vespaclient-core/pom.xml b/vespaclient-core/pom.xml index 2e427364bd6..bdb15825fbb 100644 --- a/vespaclient-core/pom.xml +++ b/vespaclient-core/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespaclient-core 6-SNAPSHOT diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index d692a6ed57f..8cde41d53d7 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespaclient-java 6-SNAPSHOT diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index 81c385c96ab..1f98a5e4c02 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespajlib container-plugin diff --git a/vespalog/pom.xml b/vespalog/pom.xml index 6443769afbe..6cea5ab83d9 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vespalog 6-SNAPSHOT diff --git a/vsm/pom.xml b/vsm/pom.xml index 3c491906060..8c5b006aeec 100644 --- a/vsm/pom.xml +++ b/vsm/pom.xml @@ -8,7 +8,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml vsm 6-SNAPSHOT diff --git a/yolean/pom.xml b/yolean/pom.xml index 850daae6fea..d64ea29a95c 100644 --- a/yolean/pom.xml +++ b/yolean/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml yolean 6-SNAPSHOT diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index f9cb8c42688..45ba8c32372 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -6,7 +6,6 @@ com.yahoo.vespa parent 6-SNAPSHOT - ../parent/pom.xml zkfacade container-plugin -- cgit v1.2.3 From 644dfe78df379c51e37f6da502295c4f50808877 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Tue, 28 Nov 2017 14:37:47 +0100 Subject: Split parent + container-dependency-versions from root pom. - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent. --- annotations/pom.xml | 1 + application-deploy-plugin/pom.xml | 1 + application-model/pom.xml | 1 + application-preprocessor/pom.xml | 1 + application/pom.xml | 1 + athenz-identity-provider-service/pom.xml | 1 + bundle-plugin-test/pom.xml | 1 + bundle-plugin/pom.xml | 1 + chain/pom.xml | 1 + clustercontroller-apps/pom.xml | 1 + clustercontroller-apputil/pom.xml | 1 + clustercontroller-core/pom.xml | 1 + clustercontroller-standalone/pom.xml | 1 + clustercontroller-utils/pom.xml | 1 + component/pom.xml | 1 + config-application-package/pom.xml | 1 + config-bundle/pom.xml | 1 + config-class-plugin/pom.xml | 1 + config-lib/pom.xml | 1 + config-model-api/pom.xml | 1 + config-model-fat/pom.xml | 1 + config-model/pom.xml | 1 + config-provisioning/pom.xml | 1 + config-proxy/pom.xml | 1 + config/pom.xml | 1 + configdefinitions/pom.xml | 1 + configgen/pom.xml | 1 + configserver/pom.xml | 1 + container-accesslogging/pom.xml | 1 + container-core/pom.xml | 1 + container-dependencies-enforcer/pom.xml | 1 + container-dependency-versions/pom.xml | 369 ++++++++++++ container-dev/pom.xml | 1 + container-di/pom.xml | 1 + container-disc/pom.xml | 1 + container-jersey2/pom.xml | 1 + container-messagebus/pom.xml | 1 + container-search-and-docproc/pom.xml | 1 + container-search/pom.xml | 1 + container-test-jars/pom.xml | 1 + container-test/pom.xml | 1 + container/pom.xml | 1 + controller-api/pom.xml | 1 + controller-server/pom.xml | 1 + defaults/pom.xml | 7 +- docker-api/pom.xml | 1 + docproc/pom.xml | 1 + docprocs/pom.xml | 1 + document/pom.xml | 1 + documentapi/pom.xml | 1 + documentgen-test/pom.xml | 1 + fileacquirer/pom.xml | 1 + filedistribution/pom.xml | 3 +- filedistribution_test/pom.xml | 1 + filedistributionmanager/pom.xml | 1 + fsa/pom.xml | 1 + indexinglanguage/pom.xml | 1 + jaxrs_client_utils/pom.xml | 1 + jaxrs_utils/pom.xml | 1 + jdisc_core/pom.xml | 1 + jdisc_core_test/pom.xml | 1 + jdisc_http_service/pom.xml | 1 + jdisc_jetty/pom.xml | 1 + jdisc_messagebus_service/pom.xml | 1 + jrt/pom.xml | 1 + linguistics/pom.xml | 1 + logd/pom.xml | 1 + logserver/pom.xml | 1 + maven-plugins/pom.xml | 1 + messagebus-disc/pom.xml | 1 + messagebus/pom.xml | 1 + metrics/pom.xml | 1 + node-admin/pom.xml | 1 + node-maintainer/pom.xml | 1 + node-repository/pom.xml | 1 + orchestrator-restapi/pom.xml | 1 + orchestrator/pom.xml | 1 + parent/pom.xml | 758 +++++++++++++++++++++++++ pom.xml | 942 +------------------------------ predicate-search-core/pom.xml | 1 + predicate-search/pom.xml | 1 + processing/pom.xml | 1 + provided-dependencies/pom.xml | 1 + searchcore/pom.xml | 1 + searchlib/pom.xml | 1 + searchsummary/pom.xml | 1 + service-monitor/pom.xml | 1 + serviceview/pom.xml | 1 + simplemetrics/pom.xml | 1 + socket_test/pom.xml | 1 + standalone-container/pom.xml | 1 + statistics/pom.xml | 1 + storage/pom.xml | 1 + testutil/pom.xml | 1 + vdslib/pom.xml | 1 + vespa-application-maven-plugin/pom.xml | 1 + vespa-documentgen-plugin/pom.xml | 1 + vespa-hadoop/pom.xml | 1 + vespa-http-client/pom.xml | 1 + vespa_feed_perf/pom.xml | 1 + vespa_jersey2/pom.xml | 1 + vespaclient-container-plugin/pom.xml | 1 + vespaclient-core/pom.xml | 1 + vespaclient-java/pom.xml | 1 + vespajlib/pom.xml | 1 + vespalog/pom.xml | 1 + vsm/pom.xml | 1 + yolean/pom.xml | 1 + zkfacade/pom.xml | 1 + 109 files changed, 1241 insertions(+), 942 deletions(-) create mode 100644 container-dependency-versions/pom.xml create mode 100644 parent/pom.xml (limited to 'container-search') diff --git a/annotations/pom.xml b/annotations/pom.xml index 146eb5e9be2..3321dddaf8c 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml annotations jar diff --git a/application-deploy-plugin/pom.xml b/application-deploy-plugin/pom.xml index 3cae7cf7831..501dee385a6 100644 --- a/application-deploy-plugin/pom.xml +++ b/application-deploy-plugin/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml application-deploy-plugin 6-SNAPSHOT diff --git a/application-model/pom.xml b/application-model/pom.xml index 13a2d3ea49b..801c72e9194 100644 --- a/application-model/pom.xml +++ b/application-model/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml application-model container-plugin diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index 4fa319a881a..6ffff09e548 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml application-preprocessor jar diff --git a/application/pom.xml b/application/pom.xml index 17e9ece3543..8103226e55d 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml application jar diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index c87589d7be2..bfd02d54d43 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -11,6 +11,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index 8d8bf48cc07..3dd5be00add 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa bundle-plugin-test diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 02f0ed2ccf5..47a06a1ee76 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml bundle-plugin 6-SNAPSHOT diff --git a/chain/pom.xml b/chain/pom.xml index a3096d37748..01a64a93609 100755 --- a/chain/pom.xml +++ b/chain/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml chain jar diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml index 26f466eb208..bdc6059a816 100644 --- a/clustercontroller-apps/pom.xml +++ b/clustercontroller-apps/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-apps 6-SNAPSHOT diff --git a/clustercontroller-apputil/pom.xml b/clustercontroller-apputil/pom.xml index 68adc82596f..42c7690eab6 100644 --- a/clustercontroller-apputil/pom.xml +++ b/clustercontroller-apputil/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-apputil 6-SNAPSHOT diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 499dee0d1de..99cf4df643b 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-core 6-SNAPSHOT diff --git a/clustercontroller-standalone/pom.xml b/clustercontroller-standalone/pom.xml index f51555a92b6..f435cd9d7c4 100644 --- a/clustercontroller-standalone/pom.xml +++ b/clustercontroller-standalone/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-standalone 6-SNAPSHOT diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index f151a623ff9..287a85089ca 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml clustercontroller-utils 6-SNAPSHOT diff --git a/component/pom.xml b/component/pom.xml index 92f852e4ba0..18bfd000a84 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml component container-plugin diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 90d4a2d9af6..629c02de1e8 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-application-package container-plugin diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index 7121756ce68..07262141801 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-bundle container-plugin diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index 5b3149a13da..71a20782d85 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-class-plugin maven-plugin diff --git a/config-lib/pom.xml b/config-lib/pom.xml index 2ed993dd052..31648958fa6 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-lib container-plugin diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 6618612df31..743164afb16 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-model-api 6-SNAPSHOT diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index a4bbba0e6e8..0526c2f6581 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-model-fat bundle diff --git a/config-model/pom.xml b/config-model/pom.xml index 0fdc09e1a61..729d1a2ef9b 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-model container-plugin diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml index ebe7d460989..05f94973017 100644 --- a/config-provisioning/pom.xml +++ b/config-provisioning/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa config-provisioning diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 0aadb1bbb12..a266f68efe2 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config-proxy jar diff --git a/config/pom.xml b/config/pom.xml index f73c5b7bfd8..cfa3a692181 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml config container-plugin diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 92980a18899..487c43ed3b3 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml configdefinitions container-plugin diff --git a/configgen/pom.xml b/configgen/pom.xml index 6e550ec7321..e8de114f8d5 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml configgen jar diff --git a/configserver/pom.xml b/configserver/pom.xml index 30d92dc7650..f5aa8ea3118 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml configserver container-plugin diff --git a/container-accesslogging/pom.xml b/container-accesslogging/pom.xml index 45d7b4a2ed2..b4c7094a50a 100644 --- a/container-accesslogging/pom.xml +++ b/container-accesslogging/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-accesslogging 6-SNAPSHOT diff --git a/container-core/pom.xml b/container-core/pom.xml index c608f35f26c..1be10215419 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-core 6-SNAPSHOT diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 61495384744..94f7613e692 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-dependencies-enforcer diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml new file mode 100644 index 00000000000..5007e91c916 --- /dev/null +++ b/container-dependency-versions/pom.xml @@ -0,0 +1,369 @@ + + + + 4.0.0 + com.yahoo.vespa + container-dependency-versions + pom + 6-SNAPSHOT + Dependency versions for all Vespa maven projects. + https://github.com/vespa-engine + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + + + aopalliance + aopalliance + 1.0 + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson2.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson2.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson2.version} + + + com.google.code.findbugs + annotations + ${findbugs.version} + + + com.google.code.findbugs + jsr305 + ${findbugs.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.inject.extensions + guice-assistedinject + ${guice.version} + + + com.google.inject.extensions + guice-multibindings + ${guice.version} + + + com.google.inject + guice + ${guice.version} + + + com.google.inject + guice + ${guice.version} + no_aop + + + commons-codec + commons-codec + 1.4 + + + commons-daemon + commons-daemon + 1.0.3 + + + + commons-logging + commons-logging + 1.1.1 + + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + + + javax.inject + javax.inject + 1 + + + javax.servlet + javax.servlet-api + 3.1.0 + + + javax.validation + validation-api + ${javax.validation-api.version} + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs-api.version} + + + net.jcip + jcip-annotations + 1.0 + + + net.jpountz.lz4 + lz4 + 1.3.0 + + + org.apache.felix + org.apache.felix.framework + ${felix.version} + + + org.apache.felix + org.apache.felix.log + 1.0.1 + + + org.apache.felix + org.apache.felix.main + ${felix.version} + + + org.apache.httpcomponents + httpclient + 4.3.6 + + + org.apache.httpcomponents + httpcore + 4.3.3 + + + org.eclipse.jetty + jetty-http + ${jetty.version} + + + org.eclipse.jetty + jetty-io + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.glassfish.hk2.external + aopalliance-repackaged + ${hk2.version} + + + org.glassfish.hk2.external + javax.inject + ${hk2.version} + + + org.glassfish.hk2 + hk2-api + ${hk2.version} + + + org.glassfish.hk2 + hk2-locator + ${hk2.version} + + + org.glassfish.hk2 + hk2-utils + ${hk2.version} + + + org.glassfish.hk2 + osgi-resource-locator + ${hk2.osgi-resource-locator.version} + + + org.glassfish.jersey.bundles.repackaged + jersey-guava + ${jersey2.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey2.version} + + + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey2.version} + + + org.glassfish.jersey.core + jersey-client + ${jersey2.version} + + + org.glassfish.jersey.core + jersey-common + ${jersey2.version} + + + org.glassfish.jersey.core + jersey-server + ${jersey2.version} + + + org.glassfish.jersey.ext + jersey-entity-filtering + ${jersey2.version} + + + org.glassfish.jersey.ext + jersey-proxy-client + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-jaxb + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2.version} + + + org.glassfish.jersey.media + jersey-media-multipart + ${jersey2.version} + + + org.javassist + javassist + ${javassist.version} + + + org.json + json + 20090211 + + + org.jvnet.mimepull + mimepull + ${mimepull.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-jdk14 + ${slf4j.version} + + + xml-apis + xml-apis + 1.4.01 + + + + + + 4.2.1 + 1.3.9 + 18.0 + 3.0 + 9.4.6.v20170531 + 1.7.5 + + + + + 2.5.0-b05 + 1.0.1 + 2.8.3 + 3.20.0-GA + 1.2 + 1.1.0.Final + 2.0.1 + 2.23.2 + 1.9.6 + + + diff --git a/container-dev/pom.xml b/container-dev/pom.xml index d02ec233d96..f62bbd22690 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -10,6 +10,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-dev 6-SNAPSHOT diff --git a/container-di/pom.xml b/container-di/pom.xml index cf6a9e54daa..abc652d6e6e 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-di 6-SNAPSHOT diff --git a/container-disc/pom.xml b/container-disc/pom.xml index ad86b3ffcff..38b4bfc2ff5 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-disc 6-SNAPSHOT diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml index 8f579e49876..26dfa762032 100644 --- a/container-jersey2/pom.xml +++ b/container-jersey2/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-jersey2 6-SNAPSHOT diff --git a/container-messagebus/pom.xml b/container-messagebus/pom.xml index 6058063daf3..1daf1df6fcb 100644 --- a/container-messagebus/pom.xml +++ b/container-messagebus/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-messagebus 6-SNAPSHOT diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index fb2794670a2..9b4419ae2b6 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-search-and-docproc 6-SNAPSHOT diff --git a/container-search/pom.xml b/container-search/pom.xml index f622567acde..0df502cf21a 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-search jar diff --git a/container-test-jars/pom.xml b/container-test-jars/pom.xml index dcde18fc8cf..804ca5eb879 100644 --- a/container-test-jars/pom.xml +++ b/container-test-jars/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa.container-test-jars container-test-jars diff --git a/container-test/pom.xml b/container-test/pom.xml index 7aaffed652e..26f02767062 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -11,6 +11,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container-test 6-SNAPSHOT diff --git a/container/pom.xml b/container/pom.xml index 4726071db55..3793a3508a4 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -11,6 +11,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml container 6-SNAPSHOT diff --git a/controller-api/pom.xml b/controller-api/pom.xml index 51666da0c03..5ef130a22ba 100644 --- a/controller-api/pom.xml +++ b/controller-api/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml controller-api container-plugin diff --git a/controller-server/pom.xml b/controller-server/pom.xml index 0cfcbc40601..b033286b82a 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml controller-server container-plugin diff --git a/defaults/pom.xml b/defaults/pom.xml index 2f3f06780e7..4d1a08aacc2 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -5,9 +5,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.yahoo.vespa - parent - 6-SNAPSHOT + com.yahoo.vespa + parent + 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa defaults diff --git a/docker-api/pom.xml b/docker-api/pom.xml index fc374a12dd2..449a94fb621 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml docker-api diff --git a/docproc/pom.xml b/docproc/pom.xml index 09635201e51..1043de32128 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml docproc jar diff --git a/docprocs/pom.xml b/docprocs/pom.xml index 1b209ec39ee..16259a861c7 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml docprocs container-plugin diff --git a/document/pom.xml b/document/pom.xml index 81b21487314..10f71218422 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml document 6-SNAPSHOT diff --git a/documentapi/pom.xml b/documentapi/pom.xml index c94337e8873..3781dfd93ac 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml documentapi container-plugin diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index 53b49cf1473..d009ef3d592 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml documentgen-test jar diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index eb040eddffb..6449b8c620f 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml fileacquirer 6-SNAPSHOT diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 10b77b540e7..b0bdaff518f 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -9,7 +9,8 @@ com.yahoo.vespa parent 6-SNAPSHOT - + ../parent/pom.xml + filedistribution 6-SNAPSHOT diff --git a/filedistribution_test/pom.xml b/filedistribution_test/pom.xml index c270eabb6cf..5cc113c6453 100644 --- a/filedistribution_test/pom.xml +++ b/filedistribution_test/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml filedistribution_test 6-SNAPSHOT diff --git a/filedistributionmanager/pom.xml b/filedistributionmanager/pom.xml index 9e3ecf95ecb..9f037814a12 100644 --- a/filedistributionmanager/pom.xml +++ b/filedistributionmanager/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml filedistributionmanager 6-SNAPSHOT diff --git a/fsa/pom.xml b/fsa/pom.xml index a49845105cf..2a56069f82e 100644 --- a/fsa/pom.xml +++ b/fsa/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml fsa container-plugin diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 70cb9f6d8d0..f0aba8d9476 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml indexinglanguage jar diff --git a/jaxrs_client_utils/pom.xml b/jaxrs_client_utils/pom.xml index 1c4bdde21a8..e3de5b8163d 100644 --- a/jaxrs_client_utils/pom.xml +++ b/jaxrs_client_utils/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jaxrs_client_utils 6-SNAPSHOT diff --git a/jaxrs_utils/pom.xml b/jaxrs_utils/pom.xml index 249cbda992b..1753d016ec3 100644 --- a/jaxrs_utils/pom.xml +++ b/jaxrs_utils/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jaxrs_utils 6-SNAPSHOT diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index fb8200eb610..55da222994f 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jdisc_core 6-SNAPSHOT diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index 92e7a39fee0..a1a96463ffc 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa.jdisc_core parent diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index d8c0b0bc29c..a1482669b39 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jdisc_http_service 6-SNAPSHOT diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index 4e739aae8cc..0f8a5ba19e2 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jdisc_jetty 6-SNAPSHOT diff --git a/jdisc_messagebus_service/pom.xml b/jdisc_messagebus_service/pom.xml index e9531a73861..6201f413b9a 100644 --- a/jdisc_messagebus_service/pom.xml +++ b/jdisc_messagebus_service/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jdisc_messagebus_service 6-SNAPSHOT diff --git a/jrt/pom.xml b/jrt/pom.xml index 0d6be56fdab..cf3da2ab7ce 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jrt container-plugin diff --git a/linguistics/pom.xml b/linguistics/pom.xml index 328742f483a..b89369b42dc 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml linguistics container-plugin diff --git a/logd/pom.xml b/logd/pom.xml index e21931efc5a..a1a107bc20c 100644 --- a/logd/pom.xml +++ b/logd/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml logd 6-SNAPSHOT diff --git a/logserver/pom.xml b/logserver/pom.xml index 6acdd8ed1d7..55c5c443cfb 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml logserver jar diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 2f7343e753c..0aabe630a63 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa bundle-plugins diff --git a/messagebus-disc/pom.xml b/messagebus-disc/pom.xml index 46158b0ca60..89741dce82b 100644 --- a/messagebus-disc/pom.xml +++ b/messagebus-disc/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml messagebus-disc 6-SNAPSHOT diff --git a/messagebus/pom.xml b/messagebus/pom.xml index 7fb44787cdf..7c37bccbd9a 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml messagebus 6-SNAPSHOT diff --git a/metrics/pom.xml b/metrics/pom.xml index ec64d0d392c..628ab66552d 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml com.yahoo.vespa metrics diff --git a/node-admin/pom.xml b/node-admin/pom.xml index f7691cda3f7..983e4d3a832 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml node-admin diff --git a/node-maintainer/pom.xml b/node-maintainer/pom.xml index d56e12d92c6..1fe3eb23857 100644 --- a/node-maintainer/pom.xml +++ b/node-maintainer/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml node-maintainer diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 09b0d3df3d9..6673ea487a1 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml node-repository 6-SNAPSHOT diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index db823f3fb15..310512812e2 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml orchestrator-restapi 6-SNAPSHOT diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index c50f9ddcb29..ae22b6718f9 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml orchestrator 6-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 00000000000..e01612218ff --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,758 @@ + + + + 4.0.0 + parent + pom + 6-SNAPSHOT + parent + Parent artifact for all Vespa maven projects. + https://github.com/vespa-engine + + + com.yahoo.vespa + container-dependency-versions + 6-SNAPSHOT + ../container-dependency-versions/pom.xml + + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + Vespa + https://github.com/vespa-engine + + + + + + bintray-vespa-repo + https://api.bintray.com/maven/yahoo/maven/vespa;publish=1 + + + + + + + + false + + bintray-yahoo-maven + bintray + https://yahoo.bintray.com/maven + + + + + scm:git:git@github.com:vespa-engine/vespa.git + scm:git:git@github.com:vespa-engine/vespa.git + git@github.com:vespa-engine/vespa.git + + + + ${project.artifactId} + + + org.apache.maven.wagon + wagon-ssh-external + 2.7 + + + org.apache.maven.archetype + archetype-packaging + 2.0 + + + + + + org.antlr + antlr3-maven-plugin + ${antlr.version} + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + org.apache.felix + maven-bundle-plugin + 2.4.0 + + + org.apache.maven.plugins + maven-assembly-plugin + 2.4 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + true + true + false + + -Xlint:all + -Xlint:-serial + -Xlint:-try + -Xlint:-processing + -Xlint:-varargs + -Werror + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.5 + + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + true + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:${doclint} -Xdoclint:-missing + + 2.10.4 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.5 + + + true + + + + mojo-descriptor + + descriptor + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + \ + + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + ${test.hide} + + ${project.build.directory} + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${surefire.version} + + false + false + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + org.codehaus.mojo + javacc-maven-plugin + 2.6 + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + net.alchim31.maven + scala-maven-plugin + 3.2.2 + + + -unchecked + -deprecation + -feature + -Xfatal-warnings + + + + + com.yahoo.vespa + bundle-plugin + ${project.version} + + ${project.version} + true + + + + + + + + attach-sources + + + !skipSources + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + + + + generate-javadoc + + + !skipJavadoc + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + generate-javadoc + package + + javadoc + + + + + -Xdoclint:${doclint} -Xdoclint:-missing + ${javadoc.failOnError} + true + private + + + + + + + coverage + + + + org.codehaus.mojo + exec-maven-plugin + + true + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + src/main/scala + + + + + add-test-source + generate-test-sources + + add-test-source + + + + src/test/scala + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 2.7 + + + com.github.cverges.expect4j + expect4j + 1.6 + + + org.apache.commons + commons-compress + 1.11 + + + org.apache.commons + commons-exec + 1.3 + + + io.airlift + airline + 0.7 + + + org.ow2.asm + asm + 5.2 + + + com.google.guava + guava-testlib + 18.0 + + + com.google.protobuf + protobuf-java + 2.4.1 + + + com.googlecode.jmockit + jmockit + 1.2 + + + com.goldmansachs + gs-collections + 6.1.0 + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-xml-provider + ${jackson2.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson2.version} + + + com.infradna.tool + bridge-method-annotation + 1.4 + + + commons-cli + commons-cli + 1.3.1 + + + commons-collections + commons-collections + 3.2.1 + + + commons-configuration + commons-configuration + 1.6 + + + commons-io + commons-io + 2.4 + + + commons-lang + commons-lang + ${commons-lang.version} + + + commons-net + commons-net + 2.0 + + + commons-pool + commons-pool + 1.5.6 + + + + org.apache.zookeeper + zookeeper + 3.4.10 + + + org.apache.curator + curator-recipes + ${curator.version} + + + org.apache.curator + curator-test + ${curator.version} + + + junit + junit + 4.12 + + + org.antlr + antlr-runtime + ${antlr.version} + + + org.antlr + antlr4-runtime + ${antlr4.version} + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + ${aries.spifly.version} + + + org.apache.commons + commons-lang3 + 3.1 + + + org.apache.httpcomponents + fluent-hc + 4.3.6 + + + org.apache.httpcomponents + httpmime + 4.3.6 + + + org.apache.maven + maven-artifact + 3.5.0 + + + org.apache.maven + maven-core + 3.5.0 + + + org.apache.maven + maven-model + 3.5.0 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.5 + + + org.apache.maven + maven-plugin-api + 3.5.0 + + + org.apache.maven + maven-project + 2.2.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + org.apache.maven.surefire + surefire-junit4 + ${surefire.version} + + + org.apache.maven.surefire + surefire-providers + ${surefire.version} + pom + + + org.codehaus.jettison + jettison + 1.3.1 + + + org.cthul + cthul-matchers + 1.0 + test + + + org.eclipse.jetty + jetty-continuation + ${jetty.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-jmx + ${jetty.version} + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.hamcrest + hamcrest-library + 1.3 + test + + + uk.co.datumedge + hamcrest-json + 0.2 + test + + + org.hdrhistogram + HdrHistogram + 2.1.8 + + + org.mockito + mockito-all + 1.9.5 + + + org.mockito + mockito-core + 1.9.5 + test + + + org.osgi + org.osgi.compendium + 4.3.0 + + + org.osgi + org.osgi.core + 4.3.0 + + + org.scala-lang + scala-library + ${scala.version} + + + org.scala-lang.modules + scala-parser-combinators_${scala.major-version} + 1.0.1 + + + org.scala-lang.modules + scala-xml_${scala.major-version} + 1.0.2 + + + org.scalatest + scalatest_${scala.major-version} + 2.2.2 + + + org.springframework + spring-test + 4.0.6.RELEASE + + + org.testng + testng + 6.10 + + + org.twdata.maven + mojo-executor + 2.3.0 + + + net.spy + spymemcached + 2.10.1 + + + xerces + xercesImpl + 2.11.0 + + + org.bouncycastle + bcpkix-jdk15on + ${bouncycastle.version} + + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + + + com.ibm.icu + icu4j + 57.1 + + + com.yahoo.athenz + athenz-zms-java-client + ${athenz.version} + + + com.yahoo.athenz + athenz-zts-java-client + ${athenz.version} + + + + + + 3.5.2 + 4.5 + 1.0.8 + 1.0.0 + 5.0.3 + + 1.7.28 + 1.58 + 2.6 + + 2.9.1 + UTF-8 + UTF-8 + true + all + 2.11 + ${scala.major-version}.4 + 2.19.1 + + + diff --git a/pom.xml b/pom.xml index 2b7c1abc0d4..eb1f954ce13 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,10 @@ 4.0.0 com.yahoo.vespa - parent + vespa pom 6-SNAPSHOT - parent - Parent artifact for all Vespa maven projects. + Aggregator pom for vespa. https://github.com/vespa-engine @@ -24,941 +23,6 @@ - - - bintray-vespa-repo - https://api.bintray.com/maven/yahoo/maven/vespa;publish=1 - - - - - - - - false - - bintray-yahoo-maven - bintray - https://yahoo.bintray.com/maven - - - - - scm:git:git@github.com:vespa-engine/vespa.git - scm:git:git@github.com:vespa-engine/vespa.git - git@github.com:vespa-engine/vespa.git - - - - ${project.artifactId} - - - org.apache.maven.wagon - wagon-ssh-external - 2.7 - - - org.apache.maven.archetype - archetype-packaging - 2.0 - - - - - - org.antlr - antlr3-maven-plugin - ${antlr.version} - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - org.apache.felix - maven-bundle-plugin - 2.4.0 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - true - true - false - - -Xlint:all - -Xlint:-serial - -Xlint:-try - -Xlint:-processing - -Xlint:-varargs - -Werror - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - true - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:${doclint} -Xdoclint:-missing - - 2.10.4 - - - org.apache.maven.plugins - maven-plugin-plugin - 3.5 - - - true - - - - mojo-descriptor - - descriptor - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - \ - - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - ${test.hide} - - ${project.build.directory} - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${surefire.version} - - false - false - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - org.codehaus.mojo - javacc-maven-plugin - 2.6 - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - net.alchim31.maven - scala-maven-plugin - 3.2.2 - - - -unchecked - -deprecation - -feature - -Xfatal-warnings - - - - - com.yahoo.vespa - bundle-plugin - ${project.version} - - ${project.version} - true - - - - - - - - attach-sources - - - !skipSources - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - - generate-javadoc - - - !skipJavadoc - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - generate-javadoc - package - - javadoc - - - - - -Xdoclint:${doclint} -Xdoclint:-missing - ${javadoc.failOnError} - true - private - - - - - - - coverage - - - - org.codehaus.mojo - exec-maven-plugin - - true - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - src/main/scala - - - - - add-test-source - generate-test-sources - - add-test-source - - - - src/test/scala - - - - - - - - - - sign-artifacts - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 2.7 - - - com.github.cverges.expect4j - expect4j - 1.6 - - - org.apache.commons - commons-compress - 1.11 - - - org.apache.commons - commons-exec - 1.3 - - - io.airlift - airline - 0.7 - - - aopalliance - aopalliance - 1.0 - - - org.ow2.asm - asm - 5.2 - - - com.google.code.findbugs - annotations - 1.3.9 - - - com.google.code.findbugs - jsr305 - 1.3.9 - - - com.google.guava - guava - 18.0 - - - com.google.guava - guava-testlib - 18.0 - - - com.google.inject - guice - 3.0 - - - com.google.inject - guice - 3.0 - no_aop - - - com.google.inject.extensions - guice-assistedinject - 3.0 - - - com.google.inject.extensions - guice-multibindings - 3.0 - - - com.google.protobuf - protobuf-java - 2.4.1 - - - com.googlecode.jmockit - jmockit - 1.2 - - - com.goldmansachs - gs-collections - 6.1.0 - - - com.fasterxml.jackson.core - jackson-core - ${jackson2.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson2.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson2.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson2.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-xml-provider - ${jackson2.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson2.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson2.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson2.version} - - - com.infradna.tool - bridge-method-annotation - 1.4 - - - commons-cli - commons-cli - 1.3.1 - - - commons-codec - commons-codec - 1.4 - - - commons-collections - commons-collections - 3.2.1 - - - commons-configuration - commons-configuration - 1.6 - - - commons-daemon - commons-daemon - 1.0.3 - - - commons-io - commons-io - 2.4 - - - commons-lang - commons-lang - ${commons-lang.version} - - - - commons-logging - commons-logging - 1.1.1 - - - commons-net - commons-net - 2.0 - - - commons-pool - commons-pool - 1.5.6 - - - - org.apache.zookeeper - zookeeper - 3.4.10 - - - org.apache.curator - curator-recipes - ${curator.version} - - - org.apache.curator - curator-test - ${curator.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - - - junit - junit - 4.12 - - - org.antlr - antlr-runtime - ${antlr.version} - - - org.antlr - antlr4-runtime - ${antlr4.version} - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - ${aries.spifly.version} - - - org.apache.commons - commons-lang3 - 3.1 - - - org.apache.felix - org.apache.felix.framework - 4.2.1 - - - org.apache.felix - org.apache.felix.log - 1.0.1 - - - org.apache.felix - org.apache.felix.main - 4.2.1 - - - org.apache.httpcomponents - fluent-hc - 4.3.6 - - - org.apache.httpcomponents - httpclient - 4.3.6 - - - org.apache.httpcomponents - httpcore - 4.3.3 - - - org.apache.httpcomponents - httpmime - 4.3.6 - - - org.apache.maven - maven-artifact - 3.5.0 - - - org.apache.maven - maven-core - 3.5.0 - - - org.apache.maven - maven-model - 3.5.0 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.5 - - - org.apache.maven - maven-plugin-api - 3.5.0 - - - org.apache.maven - maven-project - 2.2.1 - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.surefire - surefire-junit4 - ${surefire.version} - - - org.apache.maven.surefire - surefire-providers - ${surefire.version} - pom - - - org.codehaus.jettison - jettison - 1.3.1 - - - org.cthul - cthul-matchers - 1.0 - test - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.eclipse.jetty - jetty-http - ${jetty.version} - - - org.eclipse.jetty - jetty-jmx - ${jetty.version} - - - org.hamcrest - hamcrest-all - 1.3 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.hamcrest - hamcrest-library - 1.3 - test - - - uk.co.datumedge - hamcrest-json - 0.2 - test - - - org.hdrhistogram - HdrHistogram - 2.1.8 - - - org.json - json - 20090211 - - - org.mockito - mockito-all - 1.9.5 - - - org.mockito - mockito-core - 1.9.5 - test - - - org.osgi - org.osgi.compendium - 4.3.0 - - - org.osgi - org.osgi.core - 4.3.0 - - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang.modules - scala-parser-combinators_${scala.major-version} - 1.0.1 - - - org.scala-lang.modules - scala-xml_${scala.major-version} - 1.0.2 - - - org.scalatest - scalatest_${scala.major-version} - 2.2.2 - - - org.slf4j - jcl-over-slf4j - 1.7.5 - - - org.slf4j - log4j-over-slf4j - 1.7.5 - - - org.slf4j - slf4j-api - 1.7.5 - - - org.slf4j - slf4j-jdk14 - 1.7.5 - - - org.springframework - spring-test - 4.0.6.RELEASE - - - org.testng - testng - 6.10 - - - org.twdata.maven - mojo-executor - 2.3.0 - - - net.jcip - jcip-annotations - 1.0 - - - net.jpountz.lz4 - lz4 - 1.3.0 - - - net.spy - spymemcached - 2.10.1 - - - xerces - xercesImpl - 2.11.0 - - - org.bouncycastle - bcpkix-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} - - - org.glassfish.jersey.containers - jersey-container-servlet-core - ${jersey2.version} - - - org.glassfish.jersey.containers - jersey-container-servlet - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey2.version} - - - org.glassfish.jersey.media - jersey-media-multipart - ${jersey2.version} - - - org.glassfish.jersey.ext - jersey-proxy-client - ${jersey2.version} - - - org.glassfish.jersey.core - jersey-client - ${jersey2.version} - - - com.ibm.icu - icu4j - 57.1 - - - com.yahoo.athenz - athenz-zms-java-client - ${athenz.version} - - - com.yahoo.athenz - athenz-zts-java-client - ${athenz.version} - - - - - - 2.0.1 - 3.5.2 - 4.5 - 1.0.8 - 1.0.0 - 5.0.3 - - 1.7.28 - 1.58 - 2.6 - - 2.9.1 - 2.8.3 - 2.23.2 - 9.4.6.v20170531 - UTF-8 - UTF-8 - true - all - 2.11 - ${scala.major-version}.4 - 2.19.1 - - application application-deploy-plugin @@ -989,6 +53,7 @@ container-core container-accesslogging container-dependencies-enforcer + container-dependency-versions container-dev container-di container-disc @@ -1033,6 +98,7 @@ node-maintainer orchestrator-restapi orchestrator + parent predicate-search predicate-search-core processing diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index ea2995c4770..8ced58b840e 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml predicate-search-core 6-SNAPSHOT diff --git a/predicate-search/pom.xml b/predicate-search/pom.xml index ca79544c766..289250012a0 100644 --- a/predicate-search/pom.xml +++ b/predicate-search/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml predicate-search 6-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 15aa984cbd2..9bb9ee77037 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml processing jar diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 18cdd294b87..33f1977c7e2 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml provided-dependencies jar diff --git a/searchcore/pom.xml b/searchcore/pom.xml index f31617cfe53..3b43bf1205e 100644 --- a/searchcore/pom.xml +++ b/searchcore/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml searchcore 6-SNAPSHOT diff --git a/searchlib/pom.xml b/searchlib/pom.xml index c669903c3da..5f6717d9516 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml searchlib container-plugin diff --git a/searchsummary/pom.xml b/searchsummary/pom.xml index 97a29655ad1..417e25ff944 100644 --- a/searchsummary/pom.xml +++ b/searchsummary/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml searchsummary 6-SNAPSHOT diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index c63bdf35574..6125b75819c 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml service-monitor container-plugin diff --git a/serviceview/pom.xml b/serviceview/pom.xml index c3620ecfc9d..4357cc697b8 100644 --- a/serviceview/pom.xml +++ b/serviceview/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml serviceview container-plugin diff --git a/simplemetrics/pom.xml b/simplemetrics/pom.xml index d027fda82ce..02758b182e3 100644 --- a/simplemetrics/pom.xml +++ b/simplemetrics/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml simplemetrics container-plugin diff --git a/socket_test/pom.xml b/socket_test/pom.xml index 60d8b3713e9..0c6d5cd77f4 100644 --- a/socket_test/pom.xml +++ b/socket_test/pom.xml @@ -12,6 +12,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml jar diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 9300181e00b..0d66951f364 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml standalone-container 6-SNAPSHOT diff --git a/statistics/pom.xml b/statistics/pom.xml index 7bbef0ea3c0..521efa9a2a1 100644 --- a/statistics/pom.xml +++ b/statistics/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml statistics 6-SNAPSHOT diff --git a/storage/pom.xml b/storage/pom.xml index 49b103cbe34..e0b21d5a8a9 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml storage 6-SNAPSHOT diff --git a/testutil/pom.xml b/testutil/pom.xml index 9f98f40c2d0..911c5654efe 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml testutil jar diff --git a/vdslib/pom.xml b/vdslib/pom.xml index 48681b8ce83..5063489ed66 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vdslib container-plugin diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 2464c8208ad..980c8eee60f 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa-application-maven-plugin 6-SNAPSHOT diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index 4e96a0475f7..718b19ae994 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa-documentgen-plugin maven-plugin diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index b9fbd589525..62d9010b9fd 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa-hadoop 6-SNAPSHOT diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index 15d72b7c1c2..c336c641352 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -7,6 +7,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa-http-client 6-SNAPSHOT diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index f54b2df9b8a..436dcc06f3d 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -13,6 +13,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa_feed_perf 6-SNAPSHOT diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml index 3250cd8a41f..781075fd041 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa_jersey2/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespa_jersey2 6-SNAPSHOT diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index 59895438038..3472f3fcdc5 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -9,6 +9,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespaclient-container-plugin 6-SNAPSHOT diff --git a/vespaclient-core/pom.xml b/vespaclient-core/pom.xml index bdb15825fbb..2e427364bd6 100644 --- a/vespaclient-core/pom.xml +++ b/vespaclient-core/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespaclient-core 6-SNAPSHOT diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 8cde41d53d7..d692a6ed57f 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespaclient-java 6-SNAPSHOT diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index 1f98a5e4c02..81c385c96ab 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespajlib container-plugin diff --git a/vespalog/pom.xml b/vespalog/pom.xml index 6cea5ab83d9..6443769afbe 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vespalog 6-SNAPSHOT diff --git a/vsm/pom.xml b/vsm/pom.xml index 8c5b006aeec..3c491906060 100644 --- a/vsm/pom.xml +++ b/vsm/pom.xml @@ -8,6 +8,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml vsm 6-SNAPSHOT diff --git a/yolean/pom.xml b/yolean/pom.xml index d64ea29a95c..850daae6fea 100644 --- a/yolean/pom.xml +++ b/yolean/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml yolean 6-SNAPSHOT diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 45ba8c32372..f9cb8c42688 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -6,6 +6,7 @@ com.yahoo.vespa parent 6-SNAPSHOT + ../parent/pom.xml zkfacade container-plugin -- cgit v1.2.3