From b1c741e102711830fa2fe0caa4908b76274aa9b2 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 13 Jul 2022 11:54:39 +0200 Subject: Remove all dependencies to yolean --- application-preprocessor/pom.xml | 5 ---- cloud-tenant-base-dependencies-enforcer/pom.xml | 1 - clustercontroller-utils/pom.xml | 6 ----- config-bundle/pom.xml | 6 ----- config-model/pom.xml | 6 ----- config-proxy/pom.xml | 5 ---- config/pom.xml | 5 ---- configserver-flags/pom.xml | 6 ----- container-core/pom.xml | 6 ----- container-search-gui/pom.xml | 32 +------------------------ docproc/pom.xml | 6 ----- documentapi-dependencies/pom.xml | 5 ---- fat-model-dependencies/pom.xml | 5 ---- flags/pom.xml | 6 ----- hosted-api/pom.xml | 6 ----- http-client/pom.xml | 6 ----- jdisc_core/pom.xml | 18 -------------- logserver/pom.xml | 5 ---- metrics-proxy/pom.xml | 6 ----- vespa-maven-plugin/pom.xml | 6 ----- vespajlib/pom.xml | 6 ----- 21 files changed, 1 insertion(+), 152 deletions(-) diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index f8b521140f7..2cc75b885a9 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -53,11 +53,6 @@ com.google.guava guava - - com.yahoo.vespa - yolean - ${project.version} - junit junit diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 5084d6b893f..5cbed645539 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -142,7 +142,6 @@ com.yahoo.vespa:vespaclient-container-plugin:*:jar:provided com.yahoo.vespa:vespajlib:*:jar:provided com.yahoo.vespa:vespalog:*:jar:provided - com.yahoo.vespa:yolean:*:jar:provided com.yahoo.vespa:application:*:jar:test diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index 03a368ed667..a1f0b1c21c2 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -34,12 +34,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - com.google.guava guava diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index 50205f9fe71..a1770537a3e 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -47,12 +47,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - com.yahoo.vespa vespalog diff --git a/config-model/pom.xml b/config-model/pom.xml index b08ff7f7f2e..c39f84b864d 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -128,12 +128,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - com.yahoo.vespa testutil diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 4272cf6617e..b28714925ee 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -18,11 +18,6 @@ junit test - - com.yahoo.vespa - yolean - ${project.version} - com.yahoo.vespa config-lib diff --git a/config/pom.xml b/config/pom.xml index f787a7b0b49..1f90d374d88 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -53,11 +53,6 @@ vespajlib ${project.version} - - com.yahoo.vespa - yolean - ${project.version} - com.yahoo.vespa defaults diff --git a/configserver-flags/pom.xml b/configserver-flags/pom.xml index 43263885371..61d03e41cd5 100644 --- a/configserver-flags/pom.xml +++ b/configserver-flags/pom.xml @@ -54,12 +54,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - com.google.inject guice diff --git a/container-core/pom.xml b/container-core/pom.xml index ed1ec8adca2..e1443702e95 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -255,12 +255,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - javax.servlet javax.servlet-api diff --git a/container-search-gui/pom.xml b/container-search-gui/pom.xml index d0c6706189d..74a854ce4a3 100644 --- a/container-search-gui/pom.xml +++ b/container-search-gui/pom.xml @@ -15,44 +15,14 @@ container-plugin 8-SNAPSHOT - - com.google.inject - guice - provided - - - com.yahoo.vespa - yolean - ${project.version} - provided - - - com.yahoo.vespa - jdisc_core - ${project.version} - provided - - - com.yahoo.vespa - container-core - ${project.version} - provided - com.yahoo.vespa - container-search-and-docproc - ${project.version} - provided - - - com.yahoo.vespa - configdefinitions + container-dev ${project.version} provided - diff --git a/documentapi-dependencies/pom.xml b/documentapi-dependencies/pom.xml index 25552700528..cda469ab5f8 100644 --- a/documentapi-dependencies/pom.xml +++ b/documentapi-dependencies/pom.xml @@ -65,11 +65,6 @@ vespajlib ${project.version} - - com.yahoo.vespa - yolean - ${project.version} - diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index 180a39778a8..f3312bd5d89 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -89,11 +89,6 @@ vespajlib ${project.version} - - com.yahoo.vespa - yolean - ${project.version} - com.yahoo.vespa container-documentapi diff --git a/flags/pom.xml b/flags/pom.xml index cf230c1b7a9..21206b160a6 100644 --- a/flags/pom.xml +++ b/flags/pom.xml @@ -37,12 +37,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - com.yahoo.vespa vespajlib diff --git a/hosted-api/pom.xml b/hosted-api/pom.xml index 6f7c6186ece..c016478c3f7 100644 --- a/hosted-api/pom.xml +++ b/hosted-api/pom.xml @@ -33,12 +33,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - org.junit.jupiter diff --git a/http-client/pom.xml b/http-client/pom.xml index 49512c09a72..26f76288c85 100644 --- a/http-client/pom.xml +++ b/http-client/pom.xml @@ -41,12 +41,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - org.junit.jupiter diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 3ab469983c5..2bf952b4500 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -55,7 +55,6 @@ aopalliance aopalliance - compile com.yahoo.vespa @@ -65,18 +64,15 @@ com.google.guava guava - compile com.google.inject guice - compile no_aop org.apache.felix org.apache.felix.framework - compile org.codehaus.mojo @@ -87,7 +83,6 @@ org.apache.felix org.apache.felix.log - compile org.osgi @@ -102,40 +97,28 @@ org.slf4j slf4j-api - compile org.slf4j jcl-over-slf4j - compile org.slf4j log4j-over-slf4j - compile org.slf4j slf4j-jdk14 - compile com.yahoo.vespa config-lib ${project.version} - compile - - - com.yahoo.vespa - yolean - ${project.version} - compile com.yahoo.vespa vespajlib ${project.version} - compile com.yahoo.vespa @@ -224,7 +207,6 @@ ${project.build.directory}/dependency/defaults.jar ${project.build.directory}/dependency/vespajlib.jar ${project.build.directory}/dependency/vespalog.jar - ${project.build.directory}/dependency/yolean.jar ${project.build.directory}/dependency/jaxb-api.jar ${project.build.directory}/dependency/jaxb-core.jar ${project.build.directory}/dependency/jaxb-impl.jar diff --git a/logserver/pom.xml b/logserver/pom.xml index 61b777ad86b..68ed459f315 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -25,11 +25,6 @@ vespajlib ${project.version} - - com.yahoo.vespa - yolean - ${project.version} - com.yahoo.vespa vespalog diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml index fc63d453738..4aafff72af0 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -89,12 +89,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - diff --git a/vespa-maven-plugin/pom.xml b/vespa-maven-plugin/pom.xml index 8f46e5ff35f..c7ea54a3977 100644 --- a/vespa-maven-plugin/pom.xml +++ b/vespa-maven-plugin/pom.xml @@ -49,12 +49,6 @@ tenant-cd-api ${project.version} - - com.yahoo.vespa - yolean - ${project.version} - - org.ow2.asm diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index c4d100aa10c..361e3a1f6ff 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -54,12 +54,6 @@ ${project.version} provided - - com.yahoo.vespa - yolean - ${project.version} - provided - -- cgit v1.2.3