You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2022/02/20 17:29:25 UTC
[johnzon] branch master updated: JOHNZON-360 Make buildable and testable on Java 17 (#79)
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new dd94ec3 JOHNZON-360 Make buildable and testable on Java 17 (#79)
dd94ec3 is described below
commit dd94ec343b49d817e4e282f93b1a226ff2000260
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Sun Feb 20 12:29:20 2022 -0500
JOHNZON-360 Make buildable and testable on Java 17 (#79)
Signed-off-by: Raymond Augé <ro...@apache.org>
---
johnzon-jsonb/pom.xml | 7 ----
johnzon-jsonp-strict/pom.xml | 7 ----
johnzon-jsonschema/pom.xml | 17 ++++++++++
.../src/test/resources/arquillian.xml | 1 +
pom.xml | 37 +++++++++++++++++++++-
5 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 0ee3162..97b7a45 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -134,13 +134,6 @@
<Provide-Capability>osgi.serviceloader;osgi.serviceloader=javax.json.bind.spi.JsonbProvider</Provide-Capability>
</instructions>
</configuration>
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>4.3.1</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml
index aca67c3..6acd306 100644
--- a/johnzon-jsonp-strict/pom.xml
+++ b/johnzon-jsonp-strict/pom.xml
@@ -68,13 +68,6 @@
<Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.apache.johnzon.core.spi.JsonPointerFactory</Provide-Capability>
</instructions>
</configuration>
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>4.3.1</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml
index 8ada11f..24f0f7f 100644
--- a/johnzon-jsonschema/pom.xml
+++ b/johnzon-jsonschema/pom.xml
@@ -61,4 +61,21 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk15+</id>
+ <activation>
+ <jdk>[15,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>15.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/johnzon-websocket/src/test/resources/arquillian.xml b/johnzon-websocket/src/test/resources/arquillian.xml
index 1f2d9d0..6312b91 100644
--- a/johnzon-websocket/src/test/resources/arquillian.xml
+++ b/johnzon-websocket/src/test/resources/arquillian.xml
@@ -32,6 +32,7 @@
<property name="cleanOnStartUp">true</property>
<property name="dir">target/apache-tomee-remote</property>
<property name="appWorkingDir">target/arquillian-test-working-dir</property>
+ <property name="catalina_opts">${arquillian.jvm.args}</property>
</configuration>
</container>
</arquillian>
diff --git a/pom.xml b/pom.xml
index 4e77fa7..6d0cdbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,14 +42,16 @@
<johnzon.site.url>https://svn.apache.org/repos/asf/johnzon/site/publish/</johnzon.site.url>
<pubsub.url>scm:svn:${johnzon.site.url}</pubsub.url>
<staging.directory>${project.build.directory}/site</staging.directory>
- <felix.plugin.version>4.0.0</felix.plugin.version>
+ <felix.plugin.version>5.1.4</felix.plugin.version>
<bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>
+ <bnd.version>6.1.0</bnd.version>
<java-compile.version>1.8</java-compile.version>
<cxf.version>3.4.1</cxf.version>
<checkstyle.version>2.15</checkstyle.version> <!-- checkstyle > 2.15 version do not support java 6 -->
<!-- JVM values for surefire plugin -->
<surefire.jvm.params>-Xms1024m -Xmx2048m -Dfile.encoding=UTF-8</surefire.jvm.params>
<owb.version>2.0.23</owb.version>
+ <arquillian.jvm.args></arquillian.jvm.args>
</properties>
<modules>
@@ -447,6 +449,13 @@
<Bundle-DocURL>http://johnzon.apache.org/</Bundle-DocURL>
</instructions>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>${bnd.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
@@ -786,5 +795,31 @@
<checkstyle.version>2.17</checkstyle.version>
</properties>
</profile>
+
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <arquillian.jvm.args>
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ </arquillian.jvm.args>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>jdk18+</id>
+ <activation>
+ <jdk>[18,)</jdk>
+ </activation>
+ <properties>
+ <arquillian.jvm.args>
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ -Xmx512m -Xms256m -XX:ReservedCodeCacheSize=64m -Dtomee.httpPort=38383
+ -Djava.opts=
+ </arquillian.jvm.args>
+ </properties>
+ </profile>
</profiles>
</project>