From d9f4351623e616f8df85e73b45f9e42bd221fb6f Mon Sep 17 00:00:00 2001
From: gjoranv <gjoranv@gmail.com>
Date: Wed, 23 Oct 2019 12:11:12 +0200
Subject: Revert "Gjoranv/artifact version for exports3"

---
 bundle-plugin-test/test-bundles/main/pom.xml | 78 ----------------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 bundle-plugin-test/test-bundles/main/pom.xml

(limited to 'bundle-plugin-test/test-bundles/main/pom.xml')

diff --git a/bundle-plugin-test/test-bundles/main/pom.xml b/bundle-plugin-test/test-bundles/main/pom.xml
deleted file mode 100644
index c9c9ea270eb..00000000000
--- a/bundle-plugin-test/test-bundles/main/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2019 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.bundle-plugin</groupId>
-    <artifactId>test-bundles</artifactId>
-    <version>7-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <artifactId>main</artifactId>
-  <version>7-SNAPSHOT</version>
-  <packaging>container-plugin</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>jrt</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <!-- Added to verify that module-info.class can be handled by bundle-plugin without throwing an exception. -->
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <Import-Package>
-            manualImport.withoutVersion,
-            manualImport.withVersion;version="12.3.4",
-            multiple.packages.with.the.same.version1;multiple.packages.with.the.same.version2;version="[1,2)"
-          </Import-Package>
-          <WebInfUrl>/WEB-INF/web.xml</WebInfUrl>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- Trick to copy bundle-plugin.bundle-classpath-mappings.json from target/test-classes to target/classes -->
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-bundle-classpath-mappings-from-test-to-main</id>
-            <!-- NOTE: Must be done after generating classpath-mappings and before assembling the bundle (see the test-bundles pom) -->
-            <phase>process-test-sources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-              <overwrite>true</overwrite>
-              <resources>
-                <resource>
-                  <directory>${project.build.testOutputDirectory}</directory>
-                  <includes>
-                    <include>bundle-plugin.bundle-classpath-mappings.json</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-- 
cgit v1.2.3