diff options
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 4 | ||||
-rw-r--r-- | container-dev/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | vespa-3party-bundles/.gitignore (renamed from vespa_jersey2/.gitignore) | 0 | ||||
-rw-r--r-- | vespa-3party-bundles/CMakeLists.txt (renamed from vespa_jersey2/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | vespa-3party-bundles/OWNERS (renamed from vespa_jersey2/OWNERS) | 0 | ||||
-rw-r--r-- | vespa-3party-bundles/README (renamed from vespa_jersey2/README) | 0 | ||||
-rw-r--r-- | vespa-3party-bundles/pom.xml (renamed from vespa_jersey2/pom.xml) | 3 |
9 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0eff2a7c20c..1172da5de1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,7 +132,7 @@ add_subdirectory(vespa-feed-client-cli) add_subdirectory(vespa-osgi-testrunner) add_subdirectory(vespa-testrunner-components) add_subdirectory(vespa_feed_perf) -add_subdirectory(vespa_jersey2) +add_subdirectory(vespa-3party-bundles) add_subdirectory(vespabase) add_subdirectory(vespaclient) add_subdirectory(vespaclient-core) diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index b268bc75eeb..ace3ba946e9 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -137,7 +137,7 @@ <include>com.yahoo.vespa:searchlib:*:jar:provided</include> <include>com.yahoo.vespa:security-utils:*:jar:provided</include> <include>com.yahoo.vespa:vdslib:*:jar:provided</include> - <include>com.yahoo.vespa:vespa_jersey2:*:pom:provided</include> + <include>com.yahoo.vespa:vespa-3party-bundles:*:pom:provided</include> <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> @@ -168,7 +168,7 @@ <include>com.yahoo.vespa:vespa-athenz:*:jar:test</include> <include>com.yahoo.vespa:vespa-feed-client:*:jar:test</include> <include>com.yahoo.vespa:vespa-feed-client-api:*:jar:test</include> - <include>com.yahoo.vespa:vespa_jersey2:*:pom:test</include> + <include>com.yahoo.vespa:vespa-3party-bundles:*:pom:test</include> <include>com.yahoo.vespa:vespaclient-core:*:jar:test</include> <include>com.yahoo.vespa:vsm:*:jar:test</include> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index d292da33ffe..10a4cb4c3ea 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -106,7 +106,7 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>vespa_jersey2</artifactId> + <artifactId>vespa-3party-bundles</artifactId> <version>${project.version}</version> <type>pom</type> </dependency> @@ -139,7 +139,7 @@ <module>vespa-osgi-testrunner</module> <module>vespa-testrunner-components</module> <module>vespa_feed_perf</module> - <module>vespa_jersey2</module> + <module>vespa-3party-bundles</module> <module>vespajlib</module> <module>vespalog</module> <module>yolean</module> diff --git a/vespa_jersey2/.gitignore b/vespa-3party-bundles/.gitignore index ea8c4bf7f35..ea8c4bf7f35 100644 --- a/vespa_jersey2/.gitignore +++ b/vespa-3party-bundles/.gitignore diff --git a/vespa_jersey2/CMakeLists.txt b/vespa-3party-bundles/CMakeLists.txt index ced1db89e30..9451c93ca6f 100644 --- a/vespa_jersey2/CMakeLists.txt +++ b/vespa-3party-bundles/CMakeLists.txt @@ -1,2 +1,2 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_jar_dependencies(vespa_jersey2) +install_jar_dependencies(vespa-3party-bundles) diff --git a/vespa_jersey2/OWNERS b/vespa-3party-bundles/OWNERS index 3b2ba1ede81..3b2ba1ede81 100644 --- a/vespa_jersey2/OWNERS +++ b/vespa-3party-bundles/OWNERS diff --git a/vespa_jersey2/README b/vespa-3party-bundles/README index d2775883a75..d2775883a75 100644 --- a/vespa_jersey2/README +++ b/vespa-3party-bundles/README diff --git a/vespa_jersey2/pom.xml b/vespa-3party-bundles/pom.xml index 6a043f74c71..efa4edf89b4 100644 --- a/vespa_jersey2/pom.xml +++ b/vespa-3party-bundles/pom.xml @@ -11,8 +11,7 @@ <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <!-- TODO Vespa 8: Remove this module, or rename to vespa-jackson --> - <artifactId>vespa_jersey2</artifactId> + <artifactId>vespa-3party-bundles</artifactId> <version>7-SNAPSHOT</version> <packaging>pom</packaging> <dependencies> |