Remove container-test-jars

- Only tested Jersey + an obscure bundle-plugin error.

11 files changed, 0 insertions, 190 deletions

diff --git a/application/pom.xml b/application/pom.xml
index 4d82367c560..f671c16c5a6 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -83,12 +83,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa.container-test-jars</groupId>
-      <artifactId>jersey-resources</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
 
     <!-- All dependencies that should be visible in test classpath, but not compile classpath,
          for user projects must be added in compile scope here.
diff --git a/container-test-jars/OWNERS b/container-test-jars/OWNERS
deleted file mode 100644
index 3b2ba1ede81..00000000000
--- a/container-test-jars/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-gjoranv
diff --git a/container-test-jars/README.md b/container-test-jars/README.md
deleted file mode 100644
index f4f4481efc1..00000000000
--- a/container-test-jars/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-# Container test bundles
-
-Used by the 'application' module.
diff --git a/container-test-jars/bundle-with-provided-bundle/pom.xml b/container-test-jars/bundle-with-provided-bundle/pom.xml
deleted file mode 100644
index d9d97ddd2b0..00000000000
--- a/container-test-jars/bundle-with-provided-bundle/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. 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.container-test-jars</groupId>
-    <artifactId>container-test-jars</artifactId>
-    <version>7-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>bundle-with-provided-bundle</artifactId>
-  <packaging>container-plugin</packaging>
-  <description>
-    This will trigger bugs in our bundle plugins that assumes that artifact.getFile is a jar file.
-    Normally, artifact.getFile points to a jar file,
-    but in multi-module projects when running phases not including package,
-    this will be a directory.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.yahoo.vespa.container-test-jars</groupId>
-      <artifactId>jersey-resources</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespa_jersey2</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-      <type>pom</type>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <version>${project.version}</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/container-test-jars/jersey-resources/pom.xml b/container-test-jars/jersey-resources/pom.xml
deleted file mode 100644
index cb35be91cfd..00000000000
--- a/container-test-jars/jersey-resources/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. 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.container-test-jars</groupId>
-    <artifactId>container-test-jars</artifactId>
-    <version>7-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>jersey-resources</artifactId>
-  <packaging>container-plugin</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespa_jersey2</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-      <type>pom</type>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <!-- Explicit for IntelliJ to detect correct language level from parent -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <version>${project.version}</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/TestResource.java b/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/TestResource.java
deleted file mode 100644
index 59095d05567..00000000000
--- a/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/TestResource.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.test.jars.jersey.resources;
-
-import javax.ws.rs.Path;
-
-/**
- * @author Tony Vaagenes
- * @author ollivir
- */
-@Path("bundle-plugin-test/test-resource")
-public class TestResource extends TestResourceBase {
-}
diff --git a/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/TestResourceBase.java b/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/TestResourceBase.java
deleted file mode 100644
index c3724723252..00000000000
--- a/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/TestResourceBase.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.test.jars.jersey.resources;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.Produces;
-import javax.ws.rs.GET;
-
-/**
- * @author Tony Vaagenes
- * @author ollivir
- */
-public class TestResourceBase {
-    @GET
-    @Produces({MediaType.TEXT_PLAIN})
-    public String get() {
-        return content(getClass());
-    }
-
-    public static String content(Class<? extends TestResourceBase> clazz) {
-        return "Response from " + clazz.getName();
-    }
-}
diff --git a/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/nestedpackage1/NestedTestResource1.java b/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/nestedpackage1/NestedTestResource1.java
deleted file mode 100644
index ab1c1f8f229..00000000000
--- a/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/nestedpackage1/NestedTestResource1.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.test.jars.jersey.resources.nestedpackage1;
-
-import com.yahoo.container.test.jars.jersey.resources.TestResourceBase;
-
-import javax.ws.rs.Path;
-
-/**
- * @author Tony Vaagenes
- */
-@Path("bundle-plugin-test/nested-test-resource1")
-public class NestedTestResource1 extends TestResourceBase {
-}
diff --git a/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/nestedpackage2/NestedTestResource2.java b/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/nestedpackage2/NestedTestResource2.java
deleted file mode 100644
index 0dfc9e1938b..00000000000
--- a/container-test-jars/jersey-resources/src/main/java/com/yahoo/container/test/jars/jersey/resources/nestedpackage2/NestedTestResource2.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.test.jars.jersey.resources.nestedpackage2;
-
-import com.yahoo.container.test.jars.jersey.resources.TestResourceBase;
-
-import javax.ws.rs.Path;
-
-/**
- * @author Tony Vaagenes
- */
-@Path("bundle-plugin-test/nested-test-resource2")
-public class NestedTestResource2 extends TestResourceBase {
-}
diff --git a/container-test-jars/pom.xml b/container-test-jars/pom.xml
deleted file mode 100644
index 7176af3791c..00000000000
--- a/container-test-jars/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. 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>7-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-    <groupId>com.yahoo.vespa.container-test-jars</groupId>
-    <artifactId>container-test-jars</artifactId>
-    <version>7-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <modules>
-        <module>jersey-resources</module>
-        <module>bundle-with-provided-bundle</module>
-    </modules>
-
-    <properties>
-        <!-- This project only builds test artifacts -->
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
-</project>
diff --git a/pom.xml b/pom.xml
index d4569f2039f..2774b8af00c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,6 @@
         <module>container-search</module>
         <module>container-search-gui</module>
         <module>container-test</module>
-        <module>container-test-jars</module>
         <module>controller-api</module>
         <module>controller-server</module>
         <module>defaults</module>