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

Merge remote-tracking branch 'MSTR/master' into 3.x #5138

Merged
merged 4 commits into from
Aug 31, 2022
Merged

Merge remote-tracking branch 'MSTR/master' into 3.x #5138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c81fc8f
Support JDK19
jbescos Aug 19, 2022
f0754eb
Fix OSGi headers for CDI & MP Jersey modules to be compatible with EE…
jansupol Aug 26, 2022
80b91ef
Merge remote-tracking branch 'MSTR/master' into 3.x
jansupol Aug 26, 2022
0746348
Updated gf-cdi integration test for 3.x
jansupol Aug 26, 2022
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
4 changes: 2 additions & 2 deletions etc/jenkins/Jenkinsfile_ci_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ pipeline {
'''
}
}
stage('JDK 17 ') {
stage('JDK 19 ') {
agent {
label 'centos-7'
}
tools {
jdk 'openjdk-jdk17-latest'
jdk 'openjdk-jdk19-latest'
maven 'apache-maven-latest'
}
steps {
Expand Down
2 changes: 1 addition & 1 deletion examples/groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<type>pom</type>
<version>4.0.0-alpha-3</version>
<version>4.0.4</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
Expand Down
3 changes: 2 additions & 1 deletion ext/bean-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
<Export-Package>org.glassfish.jersey.server.validation.*;version=${project.version}</Export-Package>
<Import-Package>
${jakarta.annotation.osgi.version},
jakarta.validation.*;resolution:=optional;version="[3,4)",
${cdi.osgi.version},
jakarta.validation.*;resolution:=optional;version="${range;[==,4);${jakarta.validation.api.version}}",
*
</Import-Package>
</instructions>
Expand Down
14 changes: 14 additions & 0 deletions ext/cdi/jersey-cdi-rs-inject/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>
${cdi.osgi.version},
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
4 changes: 4 additions & 0 deletions ext/cdi/jersey-cdi1x-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.servlet.internal</Export-Package>
<Import-Package>
${cdi.osgi.version},
*
</Import-Package>
</instructions>
</configuration>
</plugin>
Expand Down
8 changes: 6 additions & 2 deletions ext/cdi/jersey-cdi1x-transaction/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>9.0.0-RC2</version>
<version>9.0.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -91,7 +91,11 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.transaction.internal</Export-Package>
<Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
<Import-Package>
${jakarta.annotation.osgi.version},
${cdi.osgi.version},
*
</Import-Package>
</instructions>
</configuration>
</plugin>
Expand Down
6 changes: 5 additions & 1 deletion ext/cdi/jersey-cdi1x-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.validation.internal;version=${project.version}</Export-Package>
<Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
<Import-Package>
${jakarta.annotation.osgi.version},
${cdi.osgi.version},
*
</Import-Package>
</instructions>
</configuration>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions ext/cdi/jersey-cdi1x/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<Import-Package>
${jakarta.annotation.osgi.version},
${hk2.osgi.version},
${cdi.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion ext/microprofile/mp-rest-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
org.glassfish.jersey.microprofile.restclient.*;version=${project.version}
</Export-Package>
<Import-Package>
jakarta.enterprise.*;version="[3.0,5)",
${cdi.osgi.version},
jakarta.decorator.*;version="[3.0,5)",
org.eclipse.microprofile.config.*;version="!",
*
Expand Down
3 changes: 2 additions & 1 deletion incubator/cdi-inject-weld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@
</Export-Package>
<Import-Package>
sun.misc.*;resolution:=optional,
${jakarta.annotation.osgi.version},
${cdi.osgi.version},
${javax.annotation.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
1 change: 1 addition & 0 deletions inject/cdi2-se/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
</Export-Package>
<Import-Package>
sun.misc.*;resolution:=optional,
${cdi.osgi.version},
${jakarta.annotation.osgi.version},
*
</Import-Package>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@
<doctitle>Jersey ${jersey.version} API Documentation</doctitle>
<windowtitle>Jersey ${jersey.version} API</windowtitle>
<bottom>
<![CDATA[Copyright &#169; 2007-2021,
<![CDATA[Copyright &#169; 2007-2022,
<a href="http://www.oracle.com">Oracle</a>
and/or its affiliates.
All Rights Reserved. Use is subject to license terms.]]>
Expand Down Expand Up @@ -2221,6 +2221,7 @@
<hk2.config.version>6.2.5</hk2.config.version>
<!-- Jakartified -->
<cdi.api.version>3.0.0</cdi.api.version>
<cdi.osgi.version>javax.enterprise.*;version="[3.0,5)"</cdi.osgi.version>
<ejb.version>4.0.1</ejb.version>
<grizzly2.version>3.0.1</grizzly2.version>
<grizzly.npn.version>2.0.0</grizzly.npn.version>
Expand Down
30 changes: 30 additions & 0 deletions tests/integration/cdi-integration/gf-cdi-inject/arquillian.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0"?>
<!--

Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
http://www.eclipse.org/legal/epl-2.0.

This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.

SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0

-->
<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://jboss.org/schema/arquillian"
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<container qualifier="glassfish" default="true">
<configuration>
<property name="debug">true</property>
</configuration>
</container>

</arquillian>
Loading