RCx versions update (up to new staging/central artifacts) (#4036) Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java index 8994d11..c81f860 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java
@@ -67,7 +67,7 @@ @Test public void testRecursiveResourceEnumerationOfAllPackages() throws IOException { - final int actualEntries = countJarEntriesByPattern(Pattern.compile(".*\\.(class|properties|xml)")); + final int actualEntries = countJarEntriesByPattern(Pattern.compile(".*\\.(class|properties|xml|md)")); final int scannedEntries = countJarEntriesUsingScanner("", true); assertThat("Failed to enumerate all contents of javax.ws.rs-api", scannedEntries, equalTo(actualEntries)); }
diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy b/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy index 18caacb..103cc52 100644 --- a/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy +++ b/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy
@@ -12,7 +12,7 @@ allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*System*"] (org.osgi.framework.PackagePermission) } "packageToSystem"; allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*additional-bundle*"] (java.security.AllPermission) } "allToAdditional"; allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*javassist*"] (java.security.AllPermission) } "allToJavassist"; -allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*javax.ws.rs*"] (java.security.AllPermission) } "allToJavaxWsRs"; +allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jakarta.ws.rs*"] (java.security.AllPermission) } "allToJavaxWsRs"; allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jetty*"] (java.security.AllPermission) } "allToJetty"; allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*hk2*"] (java.security.AllPermission) } "allToHk2"; allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*osgi*"] (java.security.AllPermission) } "allToOsgi";
diff --git a/pom.xml b/pom.xml index a949c3a..92390c7 100644 --- a/pom.xml +++ b/pom.xml
@@ -2039,14 +2039,14 @@ <javax.annotation.bundle.version>1.3.2</javax.annotation.bundle.version> <javax.el.version>3.0.2</javax.el.version> <javax.el.impl.version>3.0.2</javax.el.impl.version> - <javax.interceptor.version>1.2.3</javax.interceptor.version> + <javax.interceptor.version>1.2.4</javax.interceptor.version> <javax.persistence.version>2.2.2</javax.persistence.version> <javax.validation.api.version>2.0.1.Final</javax.validation.api.version> <jaxb.api.version>2.3.2</jaxb.api.version> <jaxb.ri.version>2.3.2</jaxb.ri.version> <jsonb.api.version>1.0.1</jsonb.api.version> <jaxrs.api.spec.version>2.1</jaxrs.api.spec.version> - <jaxrs.api.impl.version>2.1.3</jaxrs.api.impl.version> + <jaxrs.api.impl.version>2.1.5</jaxrs.api.impl.version> <jboss.logging.version>3.3.0.Final</jboss.logging.version> <jersey1.version>1.19.3</jersey1.version> <jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version> @@ -2058,8 +2058,8 @@ <jmockit.version>1.41</jmockit.version> <jsonp.ri.version>1.1.5</jsonp.ri.version> <jsonp.jaxrs.version>1.1.5</jsonp.jaxrs.version> - <jsp.version>2.3.4</jsp.version> - <jstl.version>1.2.3</jstl.version> + <jsp.version>2.3.5</jsp.version> + <jstl.version>1.2.4</jstl.version> <jta.api.version>1.3.2</jta.api.version> <kryo.version>4.0.1</kryo.version> <mimepull.version>1.9.11</mimepull.version>