From f18764a119950d20dcd231cd4787f229dc2506e1 Mon Sep 17 00:00:00 2001 From: Dirk Fauth Date: Wed, 14 Sep 2022 11:47:49 +0200 Subject: [PATCH] Bug: 1052 Simplify integration test --- .../pom.xml | 25 +++--- .../.classpath | 7 -- .../tycho-its-project.issue1052.api/.project | 28 ------ .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 9 -- .../META-INF/MANIFEST.MF | 8 -- .../build.properties | 4 - .../src/issue1052/api/StringModifier.java | 5 -- .../.classpath | 7 -- .../tycho-its-project.issue1052.impl/.project | 33 ------- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 9 -- .../org.eclipse.pde.ds.annotations.prefs | 8 -- .../META-INF/MANIFEST.MF | 13 --- .../issue1052.impl.StringInverter.xml | 8 -- .../build.properties | 5 -- .../src/issue1052/impl/StringInverter.java | 34 -------- .../jaxrs.bndrun | 42 --------- .../pom.xml | 86 ------------------- .../tycho-its-project.issue1052.jaxrs.product | 33 +------ .../tycho-its-project.issue1052.target.target | 69 +-------------- 21 files changed, 14 insertions(+), 423 deletions(-) delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.classpath delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.project delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.settings/org.eclipse.core.resources.prefs delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.settings/org.eclipse.jdt.core.prefs delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/META-INF/MANIFEST.MF delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/build.properties delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/src/issue1052/api/StringModifier.java delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.classpath delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.project delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.core.resources.prefs delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.jdt.core.prefs delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.pde.ds.annotations.prefs delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/META-INF/MANIFEST.MF delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/OSGI-INF/issue1052.impl.StringInverter.xml delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/build.properties delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/src/issue1052/impl/StringInverter.java delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/jaxrs.bndrun delete mode 100644 tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/pom.xml diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/pom.xml b/tycho-its/projects/product.pluginBased.mavenArtefacts/pom.xml index 78c07ecef8..84d101f36e 100644 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/pom.xml +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/pom.xml @@ -11,19 +11,21 @@ 1.0.0-SNAPSHOT pom - - - tycho-snapshots - https://repo.eclipse.org/content/repositories/tycho-snapshots/ - - - - 6.3.0 UTF-8 + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho-version} + + + + org.eclipse.tycho @@ -70,14 +72,7 @@ - tycho-its-project.issue1052.target - - - tycho-its-project.issue1052.api - tycho-its-project.issue1052.impl - - tycho-its-project.issue1052.jaxrs.product \ No newline at end of file diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.classpath b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.classpath deleted file mode 100644 index e801ebfb46..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.project b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.project deleted file mode 100644 index 5d4772c272..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - tycho-its-project.issue1052.api - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.settings/org.eclipse.core.resources.prefs b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.settings/org.eclipse.jdt.core.prefs b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c9545f06a4..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/META-INF/MANIFEST.MF b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/META-INF/MANIFEST.MF deleted file mode 100644 index 820f635f68..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/META-INF/MANIFEST.MF +++ /dev/null @@ -1,8 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Modifier API -Bundle-SymbolicName: tycho-its-project.issue1052.api -Bundle-Version: 1.0.0.qualifier -Automatic-Module-Name: tycho-its-project.issue1052.api -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: issue1052.api;version="1.0.0" diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/build.properties b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/src/issue1052/api/StringModifier.java b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/src/issue1052/api/StringModifier.java deleted file mode 100644 index c05180538e..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.api/src/issue1052/api/StringModifier.java +++ /dev/null @@ -1,5 +0,0 @@ -package issue1052.api; - -public interface StringModifier { - String modify(String input); -} \ No newline at end of file diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.classpath b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.classpath deleted file mode 100644 index e801ebfb46..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.project b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.project deleted file mode 100644 index 630ebb0a37..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - tycho-its-project.issue1052.impl - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.ds.core.builder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.core.resources.prefs b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.jdt.core.prefs b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c9545f06a4..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.pde.ds.annotations.prefs b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.pde.ds.annotations.prefs deleted file mode 100644 index 73a356b6d0..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/.settings/org.eclipse.pde.ds.annotations.prefs +++ /dev/null @@ -1,8 +0,0 @@ -classpath=true -dsVersion=V1_3 -eclipse.preferences.version=1 -enabled=true -generateBundleActivationPolicyLazy=true -path=OSGI-INF -validationErrorLevel=error -validationErrorLevel.missingImplicitUnbindMethod=error diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/META-INF/MANIFEST.MF b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/META-INF/MANIFEST.MF deleted file mode 100644 index 7cd364a23b..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/META-INF/MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Modifier Implementations -Bundle-SymbolicName: tycho-its-project.issue1052.impl -Bundle-Version: 1.0.0.qualifier -Automatic-Module-Name: tycho-its-project.issue1052.impl -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Service-Component: OSGI-INF/issue1052.impl.StringInverter.xml -Bundle-ActivationPolicy: lazy -Import-Package: javax.ws.rs;version="2.1.0", - javax.ws.rs.core;version="2.1.0", - issue1052.api;version="1.0.0", - org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/OSGI-INF/issue1052.impl.StringInverter.xml b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/OSGI-INF/issue1052.impl.StringInverter.xml deleted file mode 100644 index 0f8497303d..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/OSGI-INF/issue1052.impl.StringInverter.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/build.properties b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/build.properties deleted file mode 100644 index c58ea2178c..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - OSGI-INF/ diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/src/issue1052/impl/StringInverter.java b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/src/issue1052/impl/StringInverter.java deleted file mode 100644 index 99dd351520..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.impl/src/issue1052/impl/StringInverter.java +++ /dev/null @@ -1,34 +0,0 @@ -package issue1052.impl; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.osgi.service.component.annotations.Component; - -import issue1052.api.StringModifier; - -//The JAX-RS path annotation for this service -@Path("/inverter") -@Component( - immediate = true, - property = { - // property to configure that the service must be processed by the JAX-RS Whiteboard - "osgi.jaxrs.resource=true"}) -public class StringInverter implements StringModifier { - - @GET - // The JAX-RS annotation to specify the result type - @Produces(MediaType.TEXT_PLAIN) - // The JAX-RS annotation to specify that the last part - // of the URL is used as method parameter - @Path("/{value}") - @Override - public String modify(@PathParam("value") String input) { - return (input != null) - ? new StringBuilder(input).reverse().toString() - : "No input given"; - } -} \ No newline at end of file diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/jaxrs.bndrun b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/jaxrs.bndrun deleted file mode 100644 index 441983e6cf..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/jaxrs.bndrun +++ /dev/null @@ -1,42 +0,0 @@ -index: target/index.xml;name="tycho-its-project.issue1052.jaxrs.product" - --standalone: ${index} - --runee: JavaSE-11 --runfw: org.eclipse.osgi --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runrequires: \ - osgi.identity;filter:='(osgi.identity=tycho-its-project.issue1052.impl)' - --runbundles: \ - tycho-its-project.issue1052..api,\ - tycho-its-project.issue1052.impl,\ - com.sun.activation.javax.activation,\ - jakarta.annotation-api,\ - jakarta.servlet-api,\ - jakarta.xml.bind-api,\ - org.apache.aries.javax.jax.rs-api,\ - org.apache.aries.jax.rs.whiteboard,\ - org.apache.felix.gogo.command,\ - org.apache.felix.gogo.runtime,\ - org.apache.felix.gogo.shell,\ - org.apache.felix.http.jetty,\ - org.apache.felix.http.servlet-api,\ - org.apache.felix.scr,\ - org.apache.servicemix.specs.annotation-api-1.3,\ - org.apache.servicemix.specs.jaxws-api-2.2,\ - org.apache.servicemix.specs.saaj-api-1.3,\ - org.eclipse.equinox.console,\ - org.eclipse.osgi,\ - org.eclipse.osgi.services,\ - org.osgi.service.jaxrs,\ - org.osgi.util.function,\ - org.osgi.util.promise,\ - org.slf4j.api - --runproperties: \ - osgi.console=,\ - org.osgi.service.http.port=8282 diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/pom.xml b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/pom.xml deleted file mode 100644 index b8090d835e..0000000000 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - 4.0.0 - - tycho-its-project.issue1052 - tycho-its-project.issue1052.parent - 1.0.0-SNAPSHOT - - - tycho-its-project.issue1052 - tycho-its-project.issue1052.jaxrs.product - eclipse-repository - - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho-version} - - true - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho-version} - - - materialize-products - - materialize-products - - - - archive-products - - archive-products - - - - - - biz.aQute.bnd - bnd-indexer-maven-plugin - ${bnd.version} - - ${project.build.directory}/repository/plugins/ - - - - package - index - - local-index - - - - - - biz.aQute.bnd - bnd-export-maven-plugin - ${bnd.version} - - false - - jaxrs.bndrun - - - ${project.build.directory}/repository/plugins/* - - - - - - export - - - - - - - \ No newline at end of file diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/tycho-its-project.issue1052.jaxrs.product b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/tycho-its-project.issue1052.jaxrs.product index 50548d62dc..8c8740a130 100644 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/tycho-its-project.issue1052.jaxrs.product +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.jaxrs.product/tycho-its-project.issue1052.jaxrs.product @@ -1,13 +1,13 @@ - + - -console + -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8282 @@ -25,36 +25,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/tycho-its-project.issue1052.target.target b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/tycho-its-project.issue1052.target.target index 5770166b7a..e254e55f02 100644 --- a/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/tycho-its-project.issue1052.target.target +++ b/tycho-its/projects/product.pluginBased.mavenArtefacts/tycho-its-project.issue1052.target/tycho-its-project.issue1052.target.target @@ -6,81 +6,16 @@ - - - - - - org.apache.aries.jax.rs - org.apache.aries.jax.rs.whiteboard + org.osgi + org.osgi.service.jaxrs 1.0.1 jar - - - - org.apache.servicemix.specs - org.apache.servicemix.specs.jaxws-api-2.2 - 2.9.0 - jar - - - - - - - org.apache.servicemix.specs - org.apache.servicemix.specs.saaj-api-1.3 - 2.9.0 - jar - - - - - - - org.apache.felix - org.apache.felix.http.jetty - 4.1.14 - jar - - - - - - - jakarta.xml.bind - jakarta.xml.bind-api - 2.3.3 - jar - - - - - - - jakarta.annotation - jakarta.annotation-api - 1.3.5 - jar - - - - - - - com.sun.activation - javax.activation - 1.2.0 - jar - - - \ No newline at end of file