From 6c161ca5c0b37c488308503d1b318acab14bf80d Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 8 Jul 2020 09:04:53 +0200 Subject: [PATCH 01/13] Fix checkstyle violation. --- .../eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java index 656485ad850..688bdc6c524 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java @@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentHashMap; import javax.inject.Inject; import aQute.bnd.osgi.Constants; - import org.eclipse.jetty.annotations.ClassInheritanceHandler; import org.eclipse.jetty.osgi.annotations.AnnotationParser; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; From f4f85fed4486b011b1c75e874f199aaadaadc71f Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 8 Jul 2020 16:33:14 +0200 Subject: [PATCH 02/13] Fix TestJettyOSGiAnnotationParser. --- jetty-osgi/test-jetty-osgi/pom.xml | 1 - .../test/TestJettyOSGiAnnotationParser.java | 21 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 04c634c8e5d..0983f62033b 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -73,7 +73,6 @@ org.ops4j.pax.tinybundles tinybundles 3.0.0 - test biz.aQute.bnd diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java index 71475a2556c..a33f8ce7354 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java @@ -20,6 +20,7 @@ package org.eclipse.jetty.osgi.test; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; import java.nio.file.Paths; @@ -58,20 +59,13 @@ public class TestJettyOSGiAnnotationParser BundleContext bundleContext = null; @Configuration - public static Option[] configure() + public static Option[] configure() throws IOException { ArrayList