Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change min java version to 17 #210

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

change min java version to 17 #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion archetypes/application/src/main/resources/archetype-resources/__artifactId__.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion ...es/application/src/test/resources/projects/check-8/reference/standalone-app-module.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion archetypes/bundle-test/src/main/resources/archetype-resources/integration-test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})'
2 changes: 1 addition & 1 deletion archetypes/bundle-test/src/test/resources/projects/check/reference/integration-test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
4 changes: 2 additions & 2 deletions archetypes/project-bare/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<description>The ${artifactId} application - built using OSGi enRoute R7</description>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bnd.version>6.1.0</bnd.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions archetypes/project-bare/src/test/resources/projects/basic/reference/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<description>The basic application - built using OSGi enRoute R7</description>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bnd.version>6.1.0</bnd.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion ...oject/src/main/resources/archetype-resources/__app-artifactId__/__app-artifactId__.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions archetypes/project/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<properties>
#if ($app-target-java-version == '8')
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
#elseif ($app-target-java-version == '9')
<maven.compiler.source>9</maven.compiler.source>
<maven.compiler.target>9</maven.compiler.target>
Expand Down
2 changes: 1 addition & 1 deletion ...etypes/project/src/test/resources/projects/basic-8/reference/app-module/app-module.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions archetypes/project/src/test/resources/projects/basic-8/reference/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<description>The basic application - built using OSGi enRoute R7</description>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bnd.version>6.1.0</bnd.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion examples/gogo/app/app.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/microservice/rest-app-jpa/rest-app-jpa.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion examples/microservice/rest-app/rest-app.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion examples/microservice/rest-service-test/integration-test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',\
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
</distributionManagement>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bnd.version>6.1.0</bnd.version>
</properties>
Expand Down
14 changes: 10 additions & 4 deletions examples/quickstart/app/app.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)'
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
7 changes: 7 additions & 0 deletions examples/quickstart/app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
<artifactId>debug-bundles</artifactId>
<type>pom</type>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>

</dependencies>

<build>
Expand Down
Loading