Merge pull request #23825 from arjantijms/jakarta_update2
Update Jakarta dependencies
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 8c9102b..1771c65 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -81,11 +81,11 @@
<!-- Jakarta Faces -->
<jakarta.faces-api.version>4.0.0-M3</jakarta.faces-api.version>
- <mojarra.version>4.0.0-M4</mojarra.version>
+ <mojarra.version>4.0.0-M5</mojarra.version>
<!-- Jakarta WebSocket -->
<jakarta.websocket-api.version>2.1.0</jakarta.websocket-api.version>
- <tyrus.version>2.0.2</tyrus.version>
+ <tyrus.version>2.1.0-M1</tyrus.version>
<!-- Jakarta Concurrency -->
<jakarta.concurrent-api.version>2.0.0</jakarta.concurrent-api.version>
@@ -118,7 +118,7 @@
<!-- Jakarta Batch -->
<jakarta.batch-api.version>2.1.0</jakarta.batch-api.version>
- <jbatch.version>2.1.0-M2-SNAPSHOT</jbatch.version>
+ <jbatch.version>2.1.0-M2</jbatch.version>
<!-- Jakarta Enterprise beans -->
<jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
@@ -127,7 +127,7 @@
<jakarta.jsonp-api.version>2.1.0</jakarta.jsonp-api.version>
<parsson.version>1.1.0</parsson.version>
<jsonp-jaxrs.version>2.0.1</jsonp-jaxrs.version>
- <jakarta.json.bind-api.version>3.0.0-RC1</jakarta.json.bind-api.version>
+ <jakarta.json.bind-api.version>3.0.0</jakarta.json.bind-api.version>
<yasson.version>3.0.0-RC1</yasson.version>
<!-- Jakarta Pages -->
@@ -144,8 +144,8 @@
<jstl-impl.version>3.0.0-M1</jstl-impl.version>
<!-- Jakarta CDI -->
- <jakarta.cdi-api.version>4.0.0.Beta3</jakarta.cdi-api.version>
- <weld.version>5.0.0.Beta1</weld.version>
+ <jakarta.cdi-api.version>4.0.0</jakarta.cdi-api.version>
+ <weld.version>5.0.0.CR1</weld.version>
<jboss.classfilewriter.version>1.2.5.Final</jboss.classfilewriter.version>
<!-- Jakarta MVC -->
diff --git a/snapshots/hibernate-validator/pom.xml b/snapshots/hibernate-validator/pom.xml
index e8e86d1..c756519 100644
--- a/snapshots/hibernate-validator/pom.xml
+++ b/snapshots/hibernate-validator/pom.xml
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<properties>
- <snapshots.sources.url>https://github.com/jakartaredhat/hibernate-validator/archive/refs/heads/main.zip</snapshots.sources.url>
+ <snapshots.sources.url>https://github.com/omnifaces/hibernate-validator/archive/refs/heads/main.zip</snapshots.sources.url>
<snapshots.sources.directory>${project.build.directory}/hibernate-validator-main</snapshots.sources.directory>
</properties>
diff --git a/snapshots/jbatch/pom.xml b/snapshots/jbatch/pom.xml
deleted file mode 100644
index 8cd9182..0000000
--- a/snapshots/jbatch/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2021 Contributors to the Eclipse Foundation. 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
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.main.snapshots</groupId>
- <artifactId>snapshotsmodule</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>jbatch-snapshot</artifactId>
- <packaging>pom</packaging>
- <name>jBatch master SNAPSHOT</name>
-
- <properties>
- <snapshots.sources.url>https://github.com/WASdev/standards.jsr352.jbatch/archive/refs/heads/master.zip</snapshots.sources.url>
- <snapshots.sources.directory>${project.build.directory}/standards.jsr352.jbatch-master</snapshots.sources.directory>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/snapshots/pom.xml b/snapshots/pom.xml
index 7fdab79..964aefb 100644
--- a/snapshots/pom.xml
+++ b/snapshots/pom.xml
@@ -33,7 +33,6 @@
<description>Temporary snapshot modules</description>
<modules>
- <module>jbatch</module>
<module>hibernate-validator</module>
</modules>
@@ -84,7 +83,7 @@
<pomIncludes>
<pomInclude>pom.xml</pomInclude>
</pomIncludes>
- <goals>clean install -Pstaging -DskipTests -Dmaven.test.skip=true</goals>
+ <goals>clean source:jar install -Pstaging -DskipTests -Dmaven.test.skip=true</goals>
</configuration>
</execution>
</executions>
