This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/jakarta-modules
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c25e0e67a189e75efd63eb12983bcdc559cf3001
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sat Dec 16 17:37:09 2023 +0100
Moves JakartaEE related modules into dedicate subdirectory
---
freemarker-jakarta/pom.xml | 71 --------------------
.../freemarker-jakarta}/README.md | 1 +
jakarta/freemarker-jakarta/pom.xml | 71 ++++++++++++++++++++
jakarta/pom.xml | 48 ++++++++++++++
.../sitemesh2-jakarta}/README.md | 1 +
jakarta/sitemesh2-jakarta/pom.xml | 71 ++++++++++++++++++++
.../velocity-tools-jsp-jakarta}/README.md | 1 +
jakarta/velocity-tools-jsp-jakarta/pom.xml | 77 ++++++++++++++++++++++
.../velocity-tools-view-jakarta}/README.md | 1 +
jakarta/velocity-tools-view-jakarta/pom.xml | 71 ++++++++++++++++++++
pom.xml | 42 ++++++------
sitemesh2-jakarta/pom.xml | 71 --------------------
velocity-tools-jsp-jakarta/pom.xml | 77 ----------------------
velocity-tools-view-jakarta/pom.xml | 71 --------------------
14 files changed, 362 insertions(+), 312 deletions(-)
diff --git a/freemarker-jakarta/pom.xml b/freemarker-jakarta/pom.xml
deleted file mode 100644
index d4b6b766c..000000000
--- a/freemarker-jakarta/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<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
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>struts2-freemarker-jakarta</artifactId>
- <packaging>jar</packaging>
- <name>Struts 2 Jakarta EE Compatible Freemarker</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.transformer</groupId>
- <artifactId>transformer-maven-plugin</artifactId>
- <version>0.5.0</version>
- <extensions>true</extensions>
- <configuration>
- <rules>
- <jakartaDefaults>true</jakartaDefaults>
- </rules>
- </configuration>
- <executions>
- <execution>
- <id>eclipse-transformer-freemarker-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <artifact>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
- </artifact>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/freemarker-jakarta/README.md b/jakarta/freemarker-jakarta/README.md
similarity index 99%
rename from freemarker-jakarta/README.md
rename to jakarta/freemarker-jakarta/README.md
index 8702074d9..b3bf61124 100644
--- a/freemarker-jakarta/README.md
+++ b/jakarta/freemarker-jakarta/README.md
@@ -1,3 +1,4 @@
# Struts 2 Freemarker Jakarta
+
This uses the eclipse transformer maven plugin to make the Freemarker
dependency Jakarta EE 9+ compatible.
diff --git a/jakarta/freemarker-jakarta/pom.xml
b/jakarta/freemarker-jakarta/pom.xml
new file mode 100644
index 000000000..32e7e2e09
--- /dev/null
+++ b/jakarta/freemarker-jakarta/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<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
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-parent</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>struts2-freemarker-jakarta</artifactId>
+ <packaging>jar</packaging>
+ <name>Struts 2 Jakarta EE Compatible Freemarker</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.site.skip>true</maven.site.skip>
+ <maven.site.deploy.skip>true</maven.site.deploy.skip>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.transformer</groupId>
+ <artifactId>transformer-maven-plugin</artifactId>
+ <version>0.5.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <rules>
+ <jakartaDefaults>true</jakartaDefaults>
+ </rules>
+ </configuration>
+ <executions>
+ <execution>
+ <id>eclipse-transformer-freemarker-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <artifact>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
+ </artifact>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/jakarta/pom.xml b/jakarta/pom.xml
new file mode 100644
index 000000000..a4987ae2b
--- /dev/null
+++ b/jakarta/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<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
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-parent</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>struts2-jakarta</artifactId>
+ <packaging>pom</packaging>
+ <name>Struts 2 Jakarta EE Compatible modules</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.site.skip>true</maven.site.skip>
+ <maven.site.deploy.skip>true</maven.site.deploy.skip>
+ </properties>
+
+ <modules>
+ <module>freemarker-jakarta</module>
+ <module>sitemesh2-jakarta</module>
+ <module>velocity-tools-view-jakarta</module>
+ <module>velocity-tools-jsp-jakarta</module>
+ </modules>
+
+</project>
diff --git a/sitemesh2-jakarta/README.md b/jakarta/sitemesh2-jakarta/README.md
similarity index 99%
rename from sitemesh2-jakarta/README.md
rename to jakarta/sitemesh2-jakarta/README.md
index 84a96a2ae..f8382b49b 100644
--- a/sitemesh2-jakarta/README.md
+++ b/jakarta/sitemesh2-jakarta/README.md
@@ -1,3 +1,4 @@
# Struts 2 Sitemesh2 Jakarta
+
This uses the eclipse transformer maven plugin to make the Sitemesh2
dependency Jakarta EE 9+ compatible.
diff --git a/jakarta/sitemesh2-jakarta/pom.xml
b/jakarta/sitemesh2-jakarta/pom.xml
new file mode 100644
index 000000000..d5f427e37
--- /dev/null
+++ b/jakarta/sitemesh2-jakarta/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<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
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-parent</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>struts2-sitemesh2-jakarta</artifactId>
+ <packaging>jar</packaging>
+ <name>Struts 2 Jakarta EE Compatible Sitemesh2</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.site.skip>true</maven.site.skip>
+ <maven.site.deploy.skip>true</maven.site.deploy.skip>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.transformer</groupId>
+ <artifactId>transformer-maven-plugin</artifactId>
+ <version>0.5.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <rules>
+ <jakartaDefaults>true</jakartaDefaults>
+ </rules>
+ </configuration>
+ <executions>
+ <execution>
+ <id>eclipse-transformer-freemarker-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <artifact>
+ <groupId>opensymphony</groupId>
+ <artifactId>sitemesh</artifactId>
+ <version>${sitemesh.version}</version>
+ </artifact>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/velocity-tools-jsp-jakarta/README.md
b/jakarta/velocity-tools-jsp-jakarta/README.md
similarity index 99%
rename from velocity-tools-jsp-jakarta/README.md
rename to jakarta/velocity-tools-jsp-jakarta/README.md
index a91b06a96..56d5a8521 100644
--- a/velocity-tools-jsp-jakarta/README.md
+++ b/jakarta/velocity-tools-jsp-jakarta/README.md
@@ -1,3 +1,4 @@
# Struts 2 Velocity Tools Jsp Jakarta
+
This uses the eclipse transformer maven plugin to make the Velocity Tools Jsp
dependency Jakarta EE 9+ compatible.
diff --git a/jakarta/velocity-tools-jsp-jakarta/pom.xml
b/jakarta/velocity-tools-jsp-jakarta/pom.xml
new file mode 100644
index 000000000..1b8eb0314
--- /dev/null
+++ b/jakarta/velocity-tools-jsp-jakarta/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<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
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-parent</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
+ <packaging>jar</packaging>
+ <name>Struts 2 Jakarta EE Compatible Velocity Tools Jsp</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.site.skip>true</maven.site.skip>
+ <maven.site.deploy.skip>true</maven.site.deploy.skip>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.transformer</groupId>
+ <artifactId>transformer-maven-plugin</artifactId>
+ <version>0.5.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <rules>
+ <jakartaDefaults>true</jakartaDefaults>
+ </rules>
+ </configuration>
+ <executions>
+ <execution>
+ <id>eclipse-transformer-velocity-tools-jsp-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <artifact>
+ <groupId>org.apache.velocity.tools</groupId>
+
<artifactId>velocity-tools-view-jsp</artifactId>
+ <version>${velocity-tools.version}</version>
+ </artifact>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity.tools</groupId>
+ <artifactId>velocity-tools-generic</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/velocity-tools-view-jakarta/README.md
b/jakarta/velocity-tools-view-jakarta/README.md
similarity index 99%
rename from velocity-tools-view-jakarta/README.md
rename to jakarta/velocity-tools-view-jakarta/README.md
index 422068ce1..b89f0c704 100644
--- a/velocity-tools-view-jakarta/README.md
+++ b/jakarta/velocity-tools-view-jakarta/README.md
@@ -1,3 +1,4 @@
# Struts 2 Velocity Tools Jakarta
+
This uses the eclipse transformer maven plugin to make the Velocity Tools
dependency Jakarta EE 9+ compatible.
diff --git a/jakarta/velocity-tools-view-jakarta/pom.xml
b/jakarta/velocity-tools-view-jakarta/pom.xml
new file mode 100644
index 000000000..4d081a9ca
--- /dev/null
+++ b/jakarta/velocity-tools-view-jakarta/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<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
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-parent</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
+ <packaging>jar</packaging>
+ <name>Struts 2 Jakarta EE Compatible Velocity Tools View</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.site.skip>true</maven.site.skip>
+ <maven.site.deploy.skip>true</maven.site.deploy.skip>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.transformer</groupId>
+ <artifactId>transformer-maven-plugin</artifactId>
+ <version>0.5.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <rules>
+ <jakartaDefaults>true</jakartaDefaults>
+ </rules>
+ </configuration>
+ <executions>
+ <execution>
+ <id>eclipse-transformer-velocity-tools-view-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <artifact>
+ <groupId>org.apache.velocity.tools</groupId>
+ <artifactId>velocity-tools-view</artifactId>
+ <version>${velocity-tools.version}</version>
+ </artifact>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/pom.xml b/pom.xml
index c281e2840..4427594e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,8 @@
* under the License.
*/
-->
-<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/maven-v4_0_0.xsd";>
+<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/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
@@ -82,10 +83,7 @@
<modules>
<module>bom</module>
- <module>freemarker-jakarta</module>
- <module>sitemesh2-jakarta</module>
- <module>velocity-tools-view-jakarta</module>
- <module>velocity-tools-jsp-jakarta</module>
+ <module>jakarta</module>
<module>core</module>
<module>plugins</module>
<module>apps</module>
@@ -96,7 +94,7 @@
<name>The Apache Software License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
- <comments />
+ <comments/>
</license>
</licenses>
@@ -305,10 +303,10 @@
<useDefaultExcludes>true</useDefaultExcludes>
<addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
<licenses>
- <licens
implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20" />
+ <licens
implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
</licenses>
<licenseFamilies>
- <licenseFamily
implementation="org.apache.rat.license.Apache20LicenseFamily" />
+ <licenseFamily
implementation="org.apache.rat.license.Apache20LicenseFamily"/>
</licenseFamilies>
<includes>
<include>pom.xml</include>
@@ -357,7 +355,7 @@
<id>enforce</id>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -517,10 +515,10 @@
<version>1.0.8</version>
<exclusions>
<exclusion>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
@@ -682,9 +680,9 @@
</dependency>
<dependency>
- <groupId>org.apache.velocity.tools</groupId>
- <artifactId>velocity-tools-generic</artifactId>
- <version>${velocity-tools.version}</version>
+ <groupId>org.apache.velocity.tools</groupId>
+ <artifactId>velocity-tools-generic</artifactId>
+ <version>${velocity-tools.version}</version>
</dependency>
<dependency>
@@ -1024,9 +1022,9 @@
<!-- CDI & Weld -->
<dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>4.0.0</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>4.0.0</version>
</dependency>
<dependency>
@@ -1034,10 +1032,10 @@
<artifactId>weld-core-impl</artifactId>
<version>5.1.2.Final</version>
<exclusions>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/sitemesh2-jakarta/pom.xml b/sitemesh2-jakarta/pom.xml
deleted file mode 100644
index 6ed9de6fd..000000000
--- a/sitemesh2-jakarta/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<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
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>struts2-sitemesh2-jakarta</artifactId>
- <packaging>jar</packaging>
- <name>Struts 2 Jakarta EE Compatible Sitemesh2</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.transformer</groupId>
- <artifactId>transformer-maven-plugin</artifactId>
- <version>0.5.0</version>
- <extensions>true</extensions>
- <configuration>
- <rules>
- <jakartaDefaults>true</jakartaDefaults>
- </rules>
- </configuration>
- <executions>
- <execution>
- <id>eclipse-transformer-freemarker-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <artifact>
- <groupId>opensymphony</groupId>
- <artifactId>sitemesh</artifactId>
- <version>${sitemesh.version}</version>
- </artifact>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/velocity-tools-jsp-jakarta/pom.xml
b/velocity-tools-jsp-jakarta/pom.xml
deleted file mode 100644
index 92fd1ac95..000000000
--- a/velocity-tools-jsp-jakarta/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<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
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
- <packaging>jar</packaging>
- <name>Struts 2 Jakarta EE Compatible Velocity Tools Jsp</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.transformer</groupId>
- <artifactId>transformer-maven-plugin</artifactId>
- <version>0.5.0</version>
- <extensions>true</extensions>
- <configuration>
- <rules>
- <jakartaDefaults>true</jakartaDefaults>
- </rules>
- </configuration>
- <executions>
- <execution>
- <id>eclipse-transformer-velocity-tools-jsp-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <artifact>
- <groupId>org.apache.velocity.tools</groupId>
- <artifactId>velocity-tools-view-jsp</artifactId>
- <version>${velocity-tools.version}</version>
- </artifact>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity.tools</groupId>
- <artifactId>velocity-tools-generic</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/velocity-tools-view-jakarta/pom.xml
b/velocity-tools-view-jakarta/pom.xml
deleted file mode 100644
index d25f71203..000000000
--- a/velocity-tools-view-jakarta/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<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
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
- <packaging>jar</packaging>
- <name>Struts 2 Jakarta EE Compatible Velocity Tools View</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.site.skip>true</maven.site.skip>
- <maven.site.deploy.skip>true</maven.site.deploy.skip>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.transformer</groupId>
- <artifactId>transformer-maven-plugin</artifactId>
- <version>0.5.0</version>
- <extensions>true</extensions>
- <configuration>
- <rules>
- <jakartaDefaults>true</jakartaDefaults>
- </rules>
- </configuration>
- <executions>
- <execution>
- <id>eclipse-transformer-velocity-tools-view-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <artifact>
- <groupId>org.apache.velocity.tools</groupId>
- <artifactId>velocity-tools-view</artifactId>
- <version>${velocity-tools.version}</version>
- </artifact>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
