diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-08 12:13:10 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-08 13:44:26 +0200 |
commit | 7780b4d0ea2c7710e967c90947d37936b74b2a99 (patch) | |
tree | 433742408f177db354faefab9e0298c410736e49 | |
parent | 2af24a81aa7c2351e6e2a7dd22419dd65b0be79b (diff) |
Remove jdisc_jetty
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | application/pom.xml | 9 | ||||
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 1 | ||||
-rw-r--r-- | container-core/pom.xml | 6 | ||||
-rw-r--r-- | container-disc/pom.xml | 6 | ||||
-rw-r--r-- | dist/vespa.spec | 1 | ||||
-rw-r--r-- | jdisc_jetty/.gitignore | 2 | ||||
-rw-r--r-- | jdisc_jetty/CMakeLists.txt | 3 | ||||
-rw-r--r-- | jdisc_jetty/OWNERS | 2 | ||||
-rw-r--r-- | jdisc_jetty/README | 1 | ||||
-rw-r--r-- | jdisc_jetty/pom.xml | 36 | ||||
-rw-r--r-- | jdisc_jetty/src/main/javadoc/README | 1 | ||||
-rw-r--r-- | model-evaluation/pom.xml | 6 | ||||
-rw-r--r-- | pom.xml | 1 |
14 files changed, 0 insertions, 76 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 66c3d0fb2dd..440ecb18024 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,6 @@ add_subdirectory(http-client) add_subdirectory(jdisc-cloud-aws) add_subdirectory(jdisc_core) add_subdirectory(jdisc-security-filters) -add_subdirectory(jdisc_jetty) add_subdirectory(jrt_test) add_subdirectory(linguistics) add_subdirectory(linguistics-components) diff --git a/application/pom.xml b/application/pom.xml index b31776eb5f9..51448502d1d 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -60,15 +60,6 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <!-- Because these are provided in container-core and just preinstalled: --> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_jetty</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - <exclusions> - </exclusions> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 116ba1ba403..84ebba80584 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -155,7 +155,6 @@ <include>com.yahoo.vespa:container-test:*:jar:test</include> <include>com.yahoo.vespa:hosted-api:*:jar:test</include> <include>com.yahoo.vespa:indexinglanguage:*:jar:test</include> - <include>com.yahoo.vespa:jdisc_jetty:*:jar:test</include> <include>com.yahoo.vespa:logd:*:jar:test</include> <include>com.yahoo.vespa:metrics-proxy:*:jar:test</include> <include>com.yahoo.vespa:metrics:*:jar:test</include> diff --git a/container-core/pom.xml b/container-core/pom.xml index 57b984e7635..ed1ec8adca2 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -239,12 +239,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_jetty</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/container-disc/pom.xml b/container-disc/pom.xml index 569241c0986..37e62541da3 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -145,12 +145,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_jetty</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/dist/vespa.spec b/dist/vespa.spec index 7688ad5e800..9b3a64dded6 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -757,7 +757,6 @@ fi %{_prefix}/lib/jars/document.jar %{_prefix}/lib/jars/filedistribution-jar-with-dependencies.jar %{_prefix}/lib/jars/http-client-jar-with-dependencies.jar -%{_prefix}/lib/jars/jdisc_jetty.jar %{_prefix}/lib/jars/logserver-jar-with-dependencies.jar %{_prefix}/lib/jars/metrics-proxy-jar-with-dependencies.jar %{_prefix}/lib/jars/node-repository-jar-with-dependencies.jar diff --git a/jdisc_jetty/.gitignore b/jdisc_jetty/.gitignore deleted file mode 100644 index 016c6f704f0..00000000000 --- a/jdisc_jetty/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -pom.xml.build -/target diff --git a/jdisc_jetty/CMakeLists.txt b/jdisc_jetty/CMakeLists.txt deleted file mode 100644 index 7f72c61be20..00000000000 --- a/jdisc_jetty/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_jar(jdisc_jetty.jar) -install_jar_dependencies(jdisc_jetty) diff --git a/jdisc_jetty/OWNERS b/jdisc_jetty/OWNERS deleted file mode 100644 index 78b92e411b4..00000000000 --- a/jdisc_jetty/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -gjoranv -bjorncs diff --git a/jdisc_jetty/README b/jdisc_jetty/README deleted file mode 100644 index a09ee05e471..00000000000 --- a/jdisc_jetty/README +++ /dev/null @@ -1 +0,0 @@ -Jetty dependencies for JDisc Container. diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml deleted file mode 100644 index 62a09da97a9..00000000000 --- a/jdisc_jetty/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.yahoo.vespa</groupId> - <artifactId>parent</artifactId> - <version>8-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <artifactId>jdisc_jetty</artifactId> - <version>8-SNAPSHOT</version> - <packaging>jar</packaging> - <dependencies> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/jdisc_jetty/src/main/javadoc/README b/jdisc_jetty/src/main/javadoc/README deleted file mode 100644 index 6695538e308..00000000000 --- a/jdisc_jetty/src/main/javadoc/README +++ /dev/null @@ -1 +0,0 @@ -No javadoc available for module
\ No newline at end of file diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml index 9188ff9af80..caf28199c3d 100644 --- a/model-evaluation/pom.xml +++ b/model-evaluation/pom.xml @@ -79,12 +79,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_jetty</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> </dependency> @@ -92,7 +92,6 @@ <module>jdisc-security-filters</module> <module>jdisc_core</module> <module>jdisc_core_test</module> - <module>jdisc_jetty</module> <module>jrt</module> <module>linguistics</module> <module>linguistics-components</module> |