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

[RESTEASY-2886] RESTEasy Java 16 Fixes #2796

Merged
merged 10 commits into from
May 27, 2021
Merged

[RESTEASY-2886] RESTEasy Java 16 Fixes #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31e597b
[RESTEASY-2904] Upgrade the test WildFly version to 23.0.2.Final.
jamezp May 20, 2021
fe7db1f
[RESTEASY-2895] Upgrade Google Guice to 5.0.1
jamezp May 20, 2021
eb5045c
[RESTEASY-2896] Upgrade Undertow to 2.2.7.Final
jamezp May 20, 2021
b6fd86c
[RESTEASY-2897] Upgrade Weld to 3.1.7.SP1 and the API to 3.1.SP4
jamezp May 20, 2021
39dd4b9
[RESTEASY-2898] Upgrade WildFly CLI to 15.0.1.Final.
jamezp May 20, 2021
ad17dfe
[RESTEASY-2899] Upgrade mockito to 3.10.0
jamezp May 20, 2021
9030c9a
[RESTEASY-2900] Upgrade Spring to 5.3.7.
jamezp May 20, 2021
7e945ff
[RESTEASY-2902] Drop legacy WildFly security configuration options an…
jamezp May 20, 2021
03e61fd
[RESTEASY-2903] Ignore remote EJB tests until WFLY-14668 is resolved …
jamezp May 20, 2021
da6aaed
[RESTEASY-2886] Add the JDK module options required for Java 16+. Upg…
jamezp May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest ]
java: ['1.8', '11']
wildfly-version: ['20.0.1.Final', '21.0.1.Final']
wildfly-version: ['22.0.1.Final', '23.0.2.Final']

steps:
- uses: actions/checkout@v2
Expand Down
14 changes: 14 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,20 @@
</plugins>
</build>
</profile>
<profile>
<id>modular.jvm</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<modular.jdk.args>
--add-exports=java.base/sun.nio.ch=ALL-UNNAMED
--add-modules=java.se
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.security=ALL-UNNAMED
</modular.jdk.args>
</properties>
</profile>
<profile>
<id>github-actions</id>
<activation>
Expand Down
7 changes: 0 additions & 7 deletions resteasy-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

Expand Down
36 changes: 30 additions & 6 deletions resteasy-dependencies-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<version.com.fasterxml.classmate>1.5.1</version.com.fasterxml.classmate>
<version.com.fasterxml.jackson>2.11.4</version.com.fasterxml.jackson>
<version.com.google.guava>30.1-jre</version.com.google.guava>
<version.com.google.inject.guice>4.2.2</version.com.google.inject.guice>
<version.com.google.inject.guice>5.0.1</version.com.google.inject.guice>
<version.com.io7m.xom>1.2.10</version.com.io7m.xom>
<version.jakarta.mail>1.6.5</version.jakarta.mail>
<version.org.glassfish.jaxb.jaxb>2.3.3-b02</version.org.glassfish.jaxb.jaxb>
Expand All @@ -29,7 +29,7 @@
<version.io.netty.netty>3.10.6.Final</version.io.netty.netty>
<version.io.netty.netty4>4.1.60.Final</version.io.netty.netty4>
<version.io.vertx>4.0.3</version.io.vertx>
<version.io.undertow>2.0.23.Final</version.io.undertow>
<version.io.undertow>2.2.7.Final</version.io.undertow>
<version.jakarta.activation>1.2.1</version.jakarta.activation>
<version.jakarta.enterprise.cdi-api>2.0.2</version.jakarta.enterprise.cdi-api>
<version.jakarta.inject.jakarta.inject-api>1.0</version.jakarta.inject.jakarta.inject-api>
Expand Down Expand Up @@ -70,11 +70,13 @@
<version.org.jboss.spec.javax.servlet.jboss-servlet-api_4.0_spec>2.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_4.0_spec>
<version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.3_spec>2.0.0.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.3_spec>
<version.org.jboss.shrinkwrap.resolver>2.2.7</version.org.jboss.shrinkwrap.resolver>
<version.org.mockito>3.10.0</version.org.mockito>
<version.org.slf4j>1.7.29</version.org.slf4j>
<version.org.wildfly.core.wildfly-cli>7.0.0.Final</version.org.wildfly.core.wildfly-cli>
<version.org.wildfly.common>1.5.4.Final</version.org.wildfly.common>
<version.org.wildfly.core.wildfly-cli>15.0.1.Final</version.org.wildfly.core.wildfly-cli>
<version.org.wildfly.extras.creaper>1.6.1</version.org.wildfly.extras.creaper>
<version.weld.api>3.1.SP3</version.weld.api>
<version.weld>3.1.5.Final</version.weld>
<version.weld.api>3.1.SP4</version.weld.api>
<version.weld>3.1.7.SP1</version.weld>
<version.json.patch>1.13</version.json.patch>

<!-- MicroProfile versions -->
Expand All @@ -99,7 +101,7 @@
<version.org.hibernate.validator>6.0.18.Final</version.org.hibernate.validator>
<version.org.jboss.marshalling.jboss-marshalling>2.0.6.Final</version.org.jboss.marshalling.jboss-marshalling>
<version.rest-assured>3.3.0</version.rest-assured>
<version.org.springframework>5.2.0.RELEASE</version.org.springframework>
<version.org.springframework>5.3.7</version.org.springframework>
<version.io.projectreactor>2020.0.5</version.io.projectreactor>

<version.asyncutil>0.1.0</version.asyncutil>
Expand Down Expand Up @@ -370,6 +372,17 @@
<artifactId>undertow-core</artifactId>
<version>${version.io.undertow}</version>
</dependency>
<!-- Used by Under and some of it's dependencies, defining it here unifies the version -->
<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<version>${version.org.wildfly.common}</version>
<!-- Using provided and optional here because RESTEasy itself does not use this dependency. It's defined
here to stop dependency convergences.
-->
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
Expand Down Expand Up @@ -922,6 +935,17 @@
<artifactId>jboss-marshalling-river</artifactId>
<version>${version.org.jboss.marshalling.jboss-marshalling}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${version.org.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${version.org.springframework}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
Expand Down