Prepare 2.28 rc3
* Adopt new JTA
* Prevent versions of jaxb in OSGi environment
* Change modules NOTICE files extension not to colide with main Jersey NOTICE.md
diff --git a/core-common/src/main/resources/META-INF/NOTICE.md b/core-common/src/main/resources/META-INF/NOTICE.markdown
similarity index 100%
rename from core-common/src/main/resources/META-INF/NOTICE.md
rename to core-common/src/main/resources/META-INF/NOTICE.markdown
diff --git a/core-server/src/main/resources/META-INF/NOTICE.md b/core-server/src/main/resources/META-INF/NOTICE.markdown
similarity index 100%
rename from core-server/src/main/resources/META-INF/NOTICE.md
rename to core-server/src/main/resources/META-INF/NOTICE.markdown
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
index abf68cd..bbef869 100644
--- a/examples/extended-wadl-webapp/pom.xml
+++ b/examples/extended-wadl-webapp/pom.xml
@@ -128,6 +128,11 @@
<artifactId>jaxb-osgi</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
index 0ac7009..60cfebe 100644
--- a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
+++ b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
@@ -98,6 +98,8 @@
// javax.annotation must go first!
mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
+ //JAXB-API
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
junitBundles(),
@@ -125,8 +127,6 @@
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-grizzly2-http")
.versionAsInProject(),
- //JAXB-API
- mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
//SUN JAXB IMPL OSGI
mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
systemPackage("com.sun.source.tree"),
diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml
index 9e026c8..fbfde1d 100644
--- a/examples/osgi-helloworld-webapp/functional-test/pom.xml
+++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml
@@ -142,6 +142,11 @@
<artifactId>jaxb-osgi</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- uncomment the following dependency to get ability
to run felix console in the test -->
<!--dependency>
diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml
index 8bd6365..1da0b4d 100644
--- a/examples/osgi-http-service/functional-test/pom.xml
+++ b/examples/osgi-http-service/functional-test/pom.xml
@@ -134,7 +134,11 @@
<artifactId>jaxb-osgi</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/media/jaxb/pom.xml b/media/jaxb/pom.xml
index 5261e7c..805a89f 100644
--- a/media/jaxb/pom.xml
+++ b/media/jaxb/pom.xml
@@ -104,6 +104,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>javax.xml.bind.*;version="!",*</Import-Package>
<Export-Package>org.glassfish.jersey.jaxb.*;version=${project.version}</Export-Package>
</instructions>
<unpackBundle>true</unpackBundle>
diff --git a/media/json-jackson/src/main/resources/META-INF/NOTICE.md b/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown
similarity index 100%
rename from media/json-jackson/src/main/resources/META-INF/NOTICE.md
rename to media/json-jackson/src/main/resources/META-INF/NOTICE.markdown
diff --git a/pom.xml b/pom.xml
index b3ebf7b..c88ad7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1651,7 +1651,7 @@
<dependency>
<groupId>org.glassfish.main.ejb</groupId>
- <artifactId>ejb-container</artifactId>
+ <artifactId>ejb-container</artifactId>
<version>${gf.impl.version}</version>
</dependency>
<dependency>
@@ -1988,7 +1988,7 @@
<jsonp.jaxrs.version>1.1.5</jsonp.jaxrs.version>
<jsp.version>2.3.4</jsp.version>
<jstl.version>1.2.3</jstl.version>
- <jta.api.version>1.3.1</jta.api.version>
+ <jta.api.version>1.3.2</jta.api.version>
<kryo.version>4.0.1</kryo.version>
<mimepull.version>1.9.11</mimepull.version>
<mockito.version>1.10.19</mockito.version>
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
index f377ae7..77fb6b1 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
@@ -130,7 +130,7 @@
// javax.annotation has to go first!
mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
-
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
junitBundles(),
// HK2
@@ -170,8 +170,7 @@
// Jersey Injection provider
mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
// Jaxb - api
- mavenBundle().groupId("com.sun.activation").artifactId("jakarta.activation").versionAsInProject(),
- mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject()
+ mavenBundle().groupId("com.sun.activation").artifactId("jakarta.activation").versionAsInProject()
));
}
