Merge pull request #23818 from arjantijms/expressly500M1
Integrate ExpressLy 5.0.0-M1
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index a2c0097..9d13997 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -74,7 +74,7 @@
<!-- Jakarta Expression Language -->
<jakarta.el-api.version>5.0.0</jakarta.el-api.version>
- <expressly.version>5.0.0-SNAPSHOT</expressly.version>
+ <expressly.version>5.0.0-M1</expressly.version>
<!-- Jakarta Servlet -->
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
diff --git a/snapshots/expressly/pom.xml b/snapshots/expressly/pom.xml
deleted file mode 100644
index b2d46c0..0000000
--- a/snapshots/expressly/pom.xml
+++ /dev/null
@@ -1,49 +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>expressly-snapshot</artifactId>
- <packaging>pom</packaging>
-
- <properties>
- <snapshots.sources.url>https://github.com/eclipse-ee4j/expressly/archive/refs/heads/master.zip</snapshots.sources.url>
- <snapshots.sources.directory>${project.build.directory}/expressly-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 afcf3b5..7fdab79 100644
--- a/snapshots/pom.xml
+++ b/snapshots/pom.xml
@@ -34,7 +34,6 @@
<modules>
<module>jbatch</module>
- <module>expressly</module>
<module>hibernate-validator</module>
</modules>
