You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2021/11/22 00:13:02 UTC
[aries-jax-rs-whiteboard] branch master updated (434da88 -> 20b077a)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git.
from 434da88 add Java 18-ea
new 84871b3 Revert "make sure to properly handle invocation be different java versions for CI"
new 20b077a select the correct EE for resolution while keeping compilation target level to Java 1.8
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun | 2 ++
integrations/jackson/jackson-itest/itest.bndrun | 2 ++
integrations/openapi/openapi-itest/itest.bndrun | 2 ++
.../rest-management/rest-management-itest/itest.bndrun | 2 ++
integrations/shiro/shiro-itest/itest.bndrun | 2 ++
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 2 ++
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 2 ++
jax-rs.itests/itest.bndrun | 2 ++
jax-rs.whiteboard/pom.xml | 11 -----------
pom.xml | 11 -----------
10 files changed, 16 insertions(+), 22 deletions(-)
[aries-jax-rs-whiteboard] 02/02: select the correct EE for resolution while keeping compilation target level to Java 1.8
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 20b077a7b50c2bfeabbe9e3ead110672f9cb5375
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sun Nov 21 18:49:59 2021 -0500
select the correct EE for resolution while keeping compilation target level to Java 1.8
Signed-off-by: Raymond Auge <ro...@apache.org>
---
integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun | 2 ++
integrations/jackson/jackson-itest/itest.bndrun | 2 ++
integrations/openapi/openapi-itest/itest.bndrun | 2 ++
integrations/rest-management/rest-management-itest/itest.bndrun | 2 ++
integrations/shiro/shiro-itest/itest.bndrun | 2 ++
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 2 ++
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 2 ++
jax-rs.itests/itest.bndrun | 2 ++
8 files changed, 16 insertions(+)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index 5cad81d..957d7ac 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -28,6 +28,8 @@
-runfw: org.eclipse.osgi
+-runee: JavaSE-${java.specification.version}
+
-resolve.effective: resolve, active
java.8.reqs: \
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index 70e5180..b5905ca 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -28,6 +28,8 @@
-runfw: org.eclipse.osgi
+-runee: JavaSE-${java.specification.version}
+
-resolve.effective: resolve, active
java.8.reqs: \
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index a821949..ead43a6 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -31,6 +31,8 @@
-runfw: org.eclipse.osgi
+-runee: JavaSE-${java.specification.version}
+
-resolve.effective: resolve, active
java.8.reqs: \
diff --git a/integrations/rest-management/rest-management-itest/itest.bndrun b/integrations/rest-management/rest-management-itest/itest.bndrun
index 637ff8d..f1ebb32 100644
--- a/integrations/rest-management/rest-management-itest/itest.bndrun
+++ b/integrations/rest-management/rest-management-itest/itest.bndrun
@@ -35,6 +35,8 @@ jaxb.export: javax.xml.bind;javax.xml.bind.annotation;javax.xml.bind.helpers;jav
-runfw: org.eclipse.osgi
+-runee: JavaSE-${java.specification.version}
+
#-runjdb: 8000
#-runtrace: true
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index 1f9c38c..a5571d0 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -28,6 +28,8 @@
-runfw: org.eclipse.osgi
+-runee: JavaSE-${java.specification.version}
+
-resolve.effective: resolve, active
java.8.reqs: \
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index 67099d7..a5d6736 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -28,6 +28,8 @@
-runfw: org.eclipse.osgi
+-runee: JavaSE-${java.specification.version}
+
#-runjdb: 8000
#-runtrace: true
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index 4670f1f..cdfd3aa 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -28,6 +28,8 @@
-runfw: org.eclipse.osgi
+-runee: JavaSE-${java.specification.version}
+
#-runjdb: 8000
#-runtrace: true
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 02cc64c..a8f8532 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -28,6 +28,8 @@
-runfw: org.eclipse.osgi
+-runee: JavaSE-${java.specification.version}
+
#-runjdb: 8000
#-runtrace: true
[aries-jax-rs-whiteboard] 01/02: Revert "make sure to properly handle invocation be different java versions for CI"
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 84871b31fd28cae06e730b34a36babc5b539ad14
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sun Nov 21 18:50:18 2021 -0500
Revert "make sure to properly handle invocation be different java versions for CI"
This reverts commit 534db48ee44e266d2b32125ba9d003ac4cc307d0.
---
jax-rs.whiteboard/pom.xml | 11 -----------
pom.xml | 11 -----------
2 files changed, 22 deletions(-)
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index baa80d9..be4911f 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -137,15 +137,4 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <properties>
- <maven.compiler.release>8</maven.compiler.release>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/pom.xml b/pom.xml
index df2c101..34267e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -737,17 +737,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <properties>
- <maven.compiler.release>${java.specification.version}</maven.compiler.release>
- </properties>
- </profile>
- </profiles>
-
<reporting>
<plugins>
<plugin>