diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-07-13 11:54:39 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-07-13 11:54:39 +0200 |
| commit | b1c741e102711830fa2fe0caa4908b76274aa9b2 (patch) | |
| tree | 86d8af7039f96c4344fe0ba704c92fd1d0ab3235 | |
| parent | 3ad0117c5ec96bb3d32495a222409df074cfd7d9 (diff) | |
Remove all dependencies to yolean
| -rw-r--r-- | application-preprocessor/pom.xml | 5 | ||||
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | clustercontroller-utils/pom.xml | 6 | ||||
| -rw-r--r-- | config-bundle/pom.xml | 6 | ||||
| -rw-r--r-- | config-model/pom.xml | 6 | ||||
| -rw-r--r-- | config-proxy/pom.xml | 5 | ||||
| -rwxr-xr-x | config/pom.xml | 5 | ||||
| -rw-r--r-- | configserver-flags/pom.xml | 6 | ||||
| -rw-r--r-- | container-core/pom.xml | 6 | ||||
| -rw-r--r-- | container-search-gui/pom.xml | 32 | ||||
| -rw-r--r-- | docproc/pom.xml | 6 | ||||
| -rw-r--r-- | documentapi-dependencies/pom.xml | 5 | ||||
| -rw-r--r-- | fat-model-dependencies/pom.xml | 5 | ||||
| -rw-r--r-- | flags/pom.xml | 6 | ||||
| -rw-r--r-- | hosted-api/pom.xml | 6 | ||||
| -rw-r--r-- | http-client/pom.xml | 6 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 18 | ||||
| -rw-r--r-- | logserver/pom.xml | 5 | ||||
| -rw-r--r-- | metrics-proxy/pom.xml | 6 | ||||
| -rw-r--r-- | vespa-maven-plugin/pom.xml | 6 | ||||
| -rw-r--r-- | vespajlib/pom.xml | 6 |
21 files changed, 1 insertions, 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 @@ -54,11 +54,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> 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 @@ <include>com.yahoo.vespa:vespaclient-container-plugin:*:jar:provided</include> <include>com.yahoo.vespa:vespajlib:*:jar:provided</include> <include>com.yahoo.vespa:vespalog:*:jar:provided</include> - <include>com.yahoo.vespa:yolean:*:jar:provided</include> <!-- Vespa test dependencies --> <include>com.yahoo.vespa:application:*:jar:test</include> 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 @@ -35,12 +35,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <scope>provided</scope> 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 @@ -49,12 +49,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>vespalog</artifactId> <version>${project.version}</version> <scope>provided</scope> 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 @@ -130,12 +130,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>testutil</artifactId> <version>${project.version}</version> <scope>test</scope> 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 @@ -20,11 +20,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>config-lib</artifactId> <version>${project.version}</version> </dependency> diff --git a/config/pom.xml b/config/pom.xml index f787a7b0b49..1f90d374d88 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -55,11 +55,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>defaults</artifactId> <version>${project.version}</version> </dependency> 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 @@ -55,12 +55,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <scope>provided</scope> 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 @@ -256,12 +256,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> 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 @@ -16,43 +16,13 @@ <version>8-SNAPSHOT</version> <dependencies> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_core</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-core</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-search-and-docproc</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>configdefinitions</artifactId> + <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> </dependencies> <build> - <plugins> <!-- TODO: alternative solution. For now, don't call out during build. <plugin> diff --git a/docproc/pom.xml b/docproc/pom.xml index d656559d5ec..325e198c59a 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -88,12 +88,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> <!-- TEST scope --> <dependency> 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 @@ <artifactId>vespajlib</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </project> 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 @@ -91,11 +91,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>container-documentapi</artifactId> <version>${project.version}</version> </dependency> diff --git a/flags/pom.xml b/flags/pom.xml index cf230c1b7a9..21206b160a6 100644 --- a/flags/pom.xml +++ b/flags/pom.xml @@ -39,12 +39,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> <scope>provided</scope> 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 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.junit.jupiter</groupId> 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 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.junit.jupiter</groupId> 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 @@ <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -65,18 +64,15 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <scope>compile</scope> <classifier>no_aop</classifier> <!-- Non-AOP version required for Java 8 compatibility --> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <scope>compile</scope> <exclusions> <exclusion> <groupId>org.codehaus.mojo</groupId> @@ -87,7 +83,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> - <scope>compile</scope> <exclusions> <exclusion> <groupId>org.osgi</groupId> @@ -102,40 +97,28 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-lib</artifactId> <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -224,7 +207,6 @@ <argument>${project.build.directory}/dependency/defaults.jar</argument> <argument>${project.build.directory}/dependency/vespajlib.jar</argument> <argument>${project.build.directory}/dependency/vespalog.jar</argument> - <argument>${project.build.directory}/dependency/yolean.jar</argument> <argument>${project.build.directory}/dependency/jaxb-api.jar</argument> <argument>${project.build.directory}/dependency/jaxb-core.jar</argument> <argument>${project.build.directory}/dependency/jaxb-impl.jar</argument> diff --git a/logserver/pom.xml b/logserver/pom.xml index 61b777ad86b..68ed459f315 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -27,11 +27,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>vespalog</artifactId> <version>${project.version}</version> </dependency> 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 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> <!-- compile scope --> 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 @@ <artifactId>tenant-cd-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.ow2.asm</groupId> 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 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>yolean</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> <!-- test scope --> <dependency> |