Merge pull request #23783 from arjantijms/tags300
Integrate Tags 3.0.0-RC1/M1.
diff --git a/appserver/pom.xml b/appserver/pom.xml
index dbc8fc0..b3c26a6 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -152,8 +152,8 @@
<stax2-api.version>4.2.1</stax2-api.version>
<!-- Jakarta Standard Tag Library -->
- <jstl-api.version>3.0.0-SNAPSHOT</jstl-api.version>
- <jstl-impl.version>3.0.0-SNAPSHOT</jstl-impl.version>
+ <jstl-api.version>3.0.0-RC1</jstl-api.version>
+ <jstl-impl.version>3.0.0-M1</jstl-impl.version>
<!-- CDI -->
<cdi-api.version>4.0.0.Beta3</cdi-api.version>
diff --git a/snapshots/pom.xml b/snapshots/pom.xml
index f88c431..4412e76 100644
--- a/snapshots/pom.xml
+++ b/snapshots/pom.xml
@@ -36,7 +36,6 @@
<description>Temporary snapshot modules</description>
<modules>
- <module>tags</module>
<module>jbatch</module>
</modules>
</project>
diff --git a/snapshots/tags/pom.xml b/snapshots/tags/pom.xml
deleted file mode 100644
index f70aba3..0000000
--- a/snapshots/tags/pom.xml
+++ /dev/null
@@ -1,97 +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>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>tags-snapshot</artifactId>
- <packaging>pom</packaging>
- <name>Tags master SNAPSHOT</name>
-
- <properties>
- <tags.url>https://github.com/eclipse-ee4j/jstl-api/archive/refs/heads/master.zip</tags.url>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-tags</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <url>${tags.url}</url>
- <unpack>true</unpack>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.1</version>
- <executions>
- <execution>
- <id>tags-api</id>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <streamLogs>true</streamLogs>
- <projectsDirectory>${project.build.directory}/jstl-api-master/api</projectsDirectory>
- <pomIncludes>
- <pomInclude>pom.xml</pomInclude>
- </pomIncludes>
- <goals>clean install -P staging</goals>
- </configuration>
- </execution>
- <execution>
- <id>tags-impl</id>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <streamLogs>true</streamLogs>
- <projectsDirectory>${project.build.directory}/jstl-api-master/impl</projectsDirectory>
- <pomIncludes>
- <pomInclude>pom.xml</pomInclude>
- </pomIncludes>
- <goals>clean install -P staging</goals>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
