Consolidate 'grace-web-sitemesh' into 'grace-web-gsp'

grace-plugin-gsp/build.gradle

@@ -6,7 +6,6 @@ dependencies {
     api project(":grace-plugin-codecs")
     api project(":grace-web-gsp")
     api project(":grace-web-mvc")
-    api project(":grace-web-sitemesh")
     api project(":grace-web-taglib")
     api project(":grace-web-url-mappings")
     api libs.spring.boot.autoconfigure

grace-web-gsp/build.gradle

@@ -1,8 +1,10 @@
 dependencies {
     api project(":grace-gsp")
     api project(":grace-web")
-    api project(":grace-web-sitemesh")
 
+    api libs.sitemesh, {
+        exclude module: 'jakarta.servlet-api'
+    }
     compileOnly libs.ant
     compileOnlyApi libs.jakarta.servlet
     // Required for JSP support

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2024 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

grace-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java → grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

settings.gradle

@@ -31,10 +31,8 @@ include (
         'grace-views-json',
         'grace-views-markup',
         'grace-web',
-        // 'grace-web-common',
         'grace-web-gsp',
         'grace-web-mvc',
-        'grace-web-sitemesh',
         'grace-web-taglib',
         'grace-web-url-mappings',