Revert "Gjoranv/artifact version for exports4"

5 files changed, 0 insertions, 78 deletions

diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/InDefaultPackage.java b/bundle-plugin-test/test-bundles/main/src/main/java/InDefaultPackage.java
deleted file mode 100644
index a650916d653..00000000000
--- a/bundle-plugin-test/test-bundles/main/src/main/java/InDefaultPackage.java
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-public class InDefaultPackage {}
diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java
deleted file mode 100644
index dddca3f4d59..00000000000
--- a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.test;
-
-import com.yahoo.prelude.hitfield.XMLString;
-import com.yahoo.search.Query;
-import com.yahoo.search.Result;
-import com.yahoo.search.Searcher;
-import com.yahoo.search.result.Hit;
-import com.yahoo.search.searchchain.Execution;
-import com.yahoo.text.BooleanParser;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * A searcher adding a new hit.
- *
- * @author  Joe Developer
- */
-public class SimpleSearcher extends Searcher {
-
-    public Result search(Query query,Execution execution) {
-        try {
-            BooleanParser.parseBoolean("true");
-            XMLString xmlString = new XMLString("<sampleXmlString/>");
-
-            Hit hit = new Hit("Hello world!");
-            hit.setField("json", new JSONObject().put("price", 42).toString());
-
-            Result result = execution.search(query);
-            result.hits().add(hit);
-            return result;
-
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher2.java b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher2.java
deleted file mode 100644
index 3220171de13..00000000000
--- a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher2.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.test;
-
-
-/**
- * Test class for integration tests. Used to verify that nested classes are visited.
- *
- * Do not replace the fully qualified class names with imports!
- */
-public class SimpleSearcher2 extends SimpleSearcher {
-    public void dummy() {}
-
-    private class InnerClassProcessor extends com.yahoo.processing.Processor {
-        @Override
-        public com.yahoo.processing.Response process(com.yahoo.processing.Request request,
-                                                     com.yahoo.processing.execution.Execution execution) {
-            return null;
-        }
-    }
-
-    private static class NestedStaticClass {
-        private com.yahoo.metrics.simple.Counter counter;
-
-        @com.google.inject.Inject
-        public NestedStaticClass() { }
-    }
-
-}
diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/package-info.java b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/package-info.java
deleted file mode 100644
index 5774fc8d5f2..00000000000
--- a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage(version = @Version(major = 1, minor = 2, micro = 3, qualifier = "RELEASE"))
-package com.yahoo.test;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-import com.yahoo.osgi.annotation.Version;
diff --git a/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def b/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def
deleted file mode 100644
index b4ba9ec518a..00000000000
--- a/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def
+++ /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.
-namespace=example
-
-exampleKey string default="exampleValue"