From 6e76a3abc8c19b7091a8d27366aaa407d331cc93 Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Tue, 14 Nov 2023 15:48:32 -0600
Subject: [PATCH] WN-5141

- use eclipse transformer on sitemesh2
---
 apps/showcase/pom.xml       |  5 +--
 plugins/pom.xml             |  5 +--
 plugins/sitemesh/pom.xml    |  5 +--
 pom.xml                     |  6 ++--
 sitemesh2-jakarta/README.md |  3 ++
 sitemesh2-jakarta/pom.xml   | 71 +++++++++++++++++++++++++++++++++++++
 6 files changed, 85 insertions(+), 10 deletions(-)
 create mode 100644 sitemesh2-jakarta/README.md
 create mode 100644 sitemesh2-jakarta/pom.xml

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index d44e6436f..4b7af4fab 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -118,8 +118,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.sitemesh</groupId>
-            <artifactId>sitemesh</artifactId>
+           <groupId>org.apache.struts</groupId>
+           <artifactId>struts2-sitemesh2-jakarta</artifactId>
+           <version>${project.version}</version>
         </dependency>
 
        <dependency>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index e73d12e7e..11d3d4131 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -46,10 +46,7 @@
         <module>osgi</module>
         <module>plexus</module>
         <module>rest</module>
-        
-        <!-- TODO -->
-        <!--module>sitemesh</module-->
-        
+        <module>sitemesh</module>        
         <module>spring</module>
         <module>testng</module>
         <module>tiles</module>
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index fe2af7fba..353e7ed6a 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -33,8 +33,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.sitemesh</groupId>
-            <artifactId>sitemesh</artifactId>
+           <groupId>org.apache.struts</groupId>
+           <artifactId>struts2-sitemesh2-jakarta</artifactId>
+           <version>${project.version}</version>
         </dependency>
 
         <!-- Velocity -->
diff --git a/pom.xml b/pom.xml
index bdb2be073..beb16e25e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
     <modules>
         <module>bom</module>
         <module>freemarker-jakarta</module>
+        <module>sitemesh2-jakarta</module>
         <module>core</module>
         <module>plugins</module>
         <module>bundles</module>
@@ -120,6 +121,7 @@
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <freemarker.version>2.3.32</freemarker.version>
+        <sitemesh.version>2.5.0</sitemesh.version>
 
         <!-- Site generation -->
         <fluido-skin.version>1.9</fluido-skin.version>
@@ -690,9 +692,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.sitemesh</groupId>
+                <groupId>opensymphony</groupId>
                 <artifactId>sitemesh</artifactId>
-                <version>3.2.0-M2</version>
+                <version>${sitemesh.version}</version>
             </dependency>
 
             <!-- Velocity -->
diff --git a/sitemesh2-jakarta/README.md b/sitemesh2-jakarta/README.md
new file mode 100644
index 000000000..84a96a2ae
--- /dev/null
+++ b/sitemesh2-jakarta/README.md
@@ -0,0 +1,3 @@
+# Struts 2 Sitemesh2 Jakarta
+This uses the eclipse transformer maven plugin to make the Sitemesh2 dependency Jakarta EE 9+ compatible.
+
diff --git a/sitemesh2-jakarta/pom.xml b/sitemesh2-jakarta/pom.xml
new file mode 100644
index 000000000..3a13dd18c
--- /dev/null
+++ b/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>6.4.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>