From 59a3e8324d1806d8530f1dab14d78d14cd36661b Mon Sep 17 00:00:00 2001 From: Markus Hochstein Date: Wed, 3 Jan 2024 16:49:37 +0100 Subject: [PATCH] change min java version to 17 Signed-off-by: Markus Hochstein --- .../archetype-resources/__artifactId__.bndrun | 2 +- .../check-8/reference/standalone-app-module.bndrun | 2 +- .../archetype-resources/integration-test.bndrun | 2 +- .../check/reference/integration-test.bndrun | 2 +- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../resources/projects/basic/reference/pom.xml | 4 ++-- .../__app-artifactId__/__app-artifactId__.bndrun | 2 +- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../basic-8/reference/app-module/app-module.bndrun | 2 +- .../resources/projects/basic-8/reference/pom.xml | 4 ++-- examples/gogo/app/app.bndrun | 2 +- .../microservice/rest-app-jpa/rest-app-jpa.bndrun | 2 +- examples/microservice/rest-app/rest-app.bndrun | 2 +- .../rest-service-test/integration-test.bndrun | 2 +- examples/pom.xml | 4 ++-- examples/quickstart/app/app.bndrun | 14 ++++++++++---- examples/quickstart/app/pom.xml | 7 +++++++ 17 files changed, 37 insertions(+), 24 deletions(-) diff --git a/archetypes/application/src/main/resources/archetype-resources/__artifactId__.bndrun b/archetypes/application/src/main/resources/archetype-resources/__artifactId__.bndrun index 79731c7b..4c5a6091 100644 --- a/archetypes/application/src/main/resources/archetype-resources/__artifactId__.bndrun +++ b/archetypes/application/src/main/resources/archetype-resources/__artifactId__.bndrun @@ -5,7 +5,7 @@ index: target/index.xml;name="${artifactId}" -runrequires: osgi.identity;filter:='(osgi.identity=${impl-groupId}.${impl-artifactId})' -runfw: org.eclipse.osgi #if ($target-java-version == '8') --runee: JavaSE-1.8 +-runee: JavaSE-17 #elseif ($target-java-version == '9') -runee: JavaSE-9 #elseif ($target-java-version == '10') diff --git a/archetypes/application/src/test/resources/projects/check-8/reference/standalone-app-module.bndrun b/archetypes/application/src/test/resources/projects/check-8/reference/standalone-app-module.bndrun index 2b4dbe81..a51f8d7b 100644 --- a/archetypes/application/src/test/resources/projects/check-8/reference/standalone-app-module.bndrun +++ b/archetypes/application/src/test/resources/projects/check-8/reference/standalone-app-module.bndrun @@ -4,6 +4,6 @@ index: target/index.xml;name="standalone-app-module" -runrequires: osgi.identity;filter:='(osgi.identity=archetype.it.impl-bundle)' -runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runee: JavaSE-17 -resolve.effective: active \ No newline at end of file diff --git a/archetypes/bundle-test/src/main/resources/archetype-resources/integration-test.bndrun b/archetypes/bundle-test/src/main/resources/archetype-resources/integration-test.bndrun index ed30e977..35cfe1ce 100644 --- a/archetypes/bundle-test/src/main/resources/archetype-resources/integration-test.bndrun +++ b/archetypes/bundle-test/src/main/resources/archetype-resources/integration-test.bndrun @@ -13,7 +13,7 @@ Import-Package: org.osgi.framework.*;version="[1.8,2)",* -runsystempackages: sun.reflect -runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runee: JavaSE-17 -runrequires: \ osgi.identity;filter:='(osgi.identity=${groupId}.${artifactId})' diff --git a/archetypes/bundle-test/src/test/resources/projects/check/reference/integration-test.bndrun b/archetypes/bundle-test/src/test/resources/projects/check/reference/integration-test.bndrun index fd86b4cc..8a631e75 100644 --- a/archetypes/bundle-test/src/test/resources/projects/check/reference/integration-test.bndrun +++ b/archetypes/bundle-test/src/test/resources/projects/check/reference/integration-test.bndrun @@ -13,7 +13,7 @@ Import-Package: org.osgi.framework.*;version="[1.8,2)",* -runsystempackages: sun.reflect -runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runee: JavaSE-17 -runrequires: \ osgi.identity;filter:='(osgi.identity=archetype.it.bundle-testing)' diff --git a/archetypes/project-bare/src/main/resources/archetype-resources/pom.xml b/archetypes/project-bare/src/main/resources/archetype-resources/pom.xml index 080ad6de..fe415bd7 100644 --- a/archetypes/project-bare/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/project-bare/src/main/resources/archetype-resources/pom.xml @@ -11,8 +11,8 @@ The ${artifactId} application - built using OSGi enRoute R7 - 1.8 - 1.8 + 17 + 17 UTF-8 6.1.0 diff --git a/archetypes/project-bare/src/test/resources/projects/basic/reference/pom.xml b/archetypes/project-bare/src/test/resources/projects/basic/reference/pom.xml index af514d87..3b87f497 100644 --- a/archetypes/project-bare/src/test/resources/projects/basic/reference/pom.xml +++ b/archetypes/project-bare/src/test/resources/projects/basic/reference/pom.xml @@ -11,8 +11,8 @@ The basic application - built using OSGi enRoute R7 - 1.8 - 1.8 + 17 + 17 UTF-8 6.1.0 diff --git a/archetypes/project/src/main/resources/archetype-resources/__app-artifactId__/__app-artifactId__.bndrun b/archetypes/project/src/main/resources/archetype-resources/__app-artifactId__/__app-artifactId__.bndrun index 31898a5b..427ec2ea 100644 --- a/archetypes/project/src/main/resources/archetype-resources/__app-artifactId__/__app-artifactId__.bndrun +++ b/archetypes/project/src/main/resources/archetype-resources/__app-artifactId__/__app-artifactId__.bndrun @@ -5,7 +5,7 @@ index: target/index.xml;name="${app-artifactId}" -runrequires: osgi.identity;filter:='(osgi.identity=${groupId}.${impl-artifactId})' -runfw: org.eclipse.osgi #if ($app-target-java-version == '8') --runee: JavaSE-1.8 +-runee: JavaSE-17 #elseif ($app-target-java-version == '9') -runee: JavaSE-9 #elseif ($app-target-java-version == '10') diff --git a/archetypes/project/src/main/resources/archetype-resources/pom.xml b/archetypes/project/src/main/resources/archetype-resources/pom.xml index fa4687b9..c0349938 100644 --- a/archetypes/project/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/project/src/main/resources/archetype-resources/pom.xml @@ -12,8 +12,8 @@ #if ($app-target-java-version == '8') - 1.8 - 1.8 + 17 + 17 #elseif ($app-target-java-version == '9') 9 9 diff --git a/archetypes/project/src/test/resources/projects/basic-8/reference/app-module/app-module.bndrun b/archetypes/project/src/test/resources/projects/basic-8/reference/app-module/app-module.bndrun index 1a45ded8..bdfacbbc 100644 --- a/archetypes/project/src/test/resources/projects/basic-8/reference/app-module/app-module.bndrun +++ b/archetypes/project/src/test/resources/projects/basic-8/reference/app-module/app-module.bndrun @@ -4,6 +4,6 @@ index: target/index.xml;name="app-module" -runrequires: osgi.identity;filter:='(osgi.identity=archetype.it.impl-bundle)' -runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runee: JavaSE-17 -resolve.effective: active \ No newline at end of file diff --git a/archetypes/project/src/test/resources/projects/basic-8/reference/pom.xml b/archetypes/project/src/test/resources/projects/basic-8/reference/pom.xml index 698737c0..13d688a4 100644 --- a/archetypes/project/src/test/resources/projects/basic-8/reference/pom.xml +++ b/archetypes/project/src/test/resources/projects/basic-8/reference/pom.xml @@ -11,8 +11,8 @@ The basic application - built using OSGi enRoute R7 - 1.8 - 1.8 + 17 + 17 UTF-8 6.1.0 diff --git a/examples/gogo/app/app.bndrun b/examples/gogo/app/app.bndrun index 4f0fe460..38035a23 100644 --- a/examples/gogo/app/app.bndrun +++ b/examples/gogo/app/app.bndrun @@ -5,6 +5,6 @@ index: target/index.xml;name="app" -runrequires: osgi.identity;filter:='(osgi.identity=org.osgi.enroute.examples.gogo.command)' -runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runee: JavaSE-17 -resolve.effective: active diff --git a/examples/microservice/rest-app-jpa/rest-app-jpa.bndrun b/examples/microservice/rest-app-jpa/rest-app-jpa.bndrun index 06738412..af43274b 100644 --- a/examples/microservice/rest-app-jpa/rest-app-jpa.bndrun +++ b/examples/microservice/rest-app-jpa/rest-app-jpa.bndrun @@ -27,7 +27,7 @@ index: target/index.xml;name="rest-app-jpa" osgi.identity;filter:='(osgi.identity=org.apache.johnzon.core)',\ osgi.identity;filter:='(osgi.identity=org.h2)' -runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runee: JavaSE-17 -runbundles: \ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ diff --git a/examples/microservice/rest-app/rest-app.bndrun b/examples/microservice/rest-app/rest-app.bndrun index 83b8f466..e6aece1e 100644 --- a/examples/microservice/rest-app/rest-app.bndrun +++ b/examples/microservice/rest-app/rest-app.bndrun @@ -13,7 +13,7 @@ index: target/index.xml;name="rest-app" osgi.identity;filter:='(osgi.identity=org.apache.johnzon.core)',\ osgi.identity;filter:='(osgi.identity=org.h2)' -runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runee: JavaSE-17 -runbundles: \ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ diff --git a/examples/microservice/rest-service-test/integration-test.bndrun b/examples/microservice/rest-service-test/integration-test.bndrun index fe9106ff..c2e94a61 100644 --- a/examples/microservice/rest-service-test/integration-test.bndrun +++ b/examples/microservice/rest-service-test/integration-test.bndrun @@ -15,7 +15,7 @@ Import-Package: org.osgi.framework.*;version="[1.8,2)",* -runsystempackages: sun.reflect -runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runee: JavaSE-17 -runrequires: \ bnd.identity;id='org.osgi.enroute.examples.microservice.rest-service',\ diff --git a/examples/pom.xml b/examples/pom.xml index 21aa18ef..e7e16601 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -69,8 +69,8 @@ - 1.8 - 1.8 + 17 + 17 UTF-8 6.1.0 diff --git a/examples/quickstart/app/app.bndrun b/examples/quickstart/app/app.bndrun index 1f89dd32..708f47f5 100644 --- a/examples/quickstart/app/app.bndrun +++ b/examples/quickstart/app/app.bndrun @@ -2,9 +2,10 @@ index: target/index.xml;name="app" -standalone: ${index} --runrequires: osgi.identity;filter:='(osgi.identity=org.osgi.enroute.examples.quickstart.rest)' --runfw: org.eclipse.osgi --runee: JavaSE-1.8 +-runrequires: osgi.identity;filter:='(osgi.identity=org.osgi.enroute.examples.quickstart.rest)',\ + osgi.contract;osgi.contract=JavaJAXRS;filter:="(&(osgi.contract=JavaJAXRS)(version=2.1.0))" +-runfw: org.eclipse.osgi;version='[3.15.300.v20200520-1959,3.15.300.v20200520-1959]' +-runee: JavaSE-17 -resolve.effective: active @@ -22,4 +23,9 @@ index: target/index.xml;name="app" org.apache.felix.configadmin;version='[1.9.16,1.9.17)',\ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\ org.apache.felix.scr;version='[2.1.16,2.1.17)',\ - org.osgi.enroute.examples.quickstart.rest;version='[0.0.2,0.0.3)' \ No newline at end of file + org.osgi.enroute.examples.quickstart.rest;version='[0.0.2,0.0.3)',\ + jaxb-api;version='[2.3.1,2.3.2)',\ + org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ + org.apache.servicemix.specs.jaxws-api-2.2;version='[2.9.0,2.9.1)',\ + org.apache.servicemix.specs.saaj-api-1.3;version='[2.9.0,2.9.1)' +-resolve: manual \ No newline at end of file diff --git a/examples/quickstart/app/pom.xml b/examples/quickstart/app/pom.xml index 5e4d7b35..8ff4378f 100644 --- a/examples/quickstart/app/pom.xml +++ b/examples/quickstart/app/pom.xml @@ -29,6 +29,13 @@ debug-bundles pom + + + javax.xml.bind + jaxb-api + 2.3.1 + +