Merge pull request #469 from grails/pre-release-7.0.0-M1

Remove sitemesh dependency & update asset-pipeline to 5.0.5
grails · Dec 23, 2024 · 332425e · 332425e
2 parents 0c0e085 + 1f84ccd
commit 332425e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java b/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java
@@ -101,11 +101,6 @@ public void apply(GeneratorContext generatorContext) {
                 .artifactId("gsp")
                 .implementation());
 
-        generatorContext.addDependency(Dependency.builder()
-                .groupId("org.sitemesh")
-                .lookupArtifactId("grails-plugin-sitemesh3")
-                .implementation());
-
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         generatorContext.addTemplate("mainLayout", new URLTemplate(getViewFolderPath() + "layouts/main.gsp", classLoader.getResource("gsp/main.gsp")));
         generatorContext.addTemplate("index", new URLTemplate(getViewFolderPath() + "index.gsp", classLoader.getResource("gsp/index.gsp")));

diff --git a/grails-forge-core/src/main/resources/pom.xml b/grails-forge-core/src/main/resources/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>com.bertramlabs.plugins</groupId>
             <artifactId>asset-pipeline-gradle</artifactId>
-            <version>5.0.4</version>
+            <version>5.0.5</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -107,10 +107,5 @@
             <artifactId>micronaut-serde-jackson</artifactId>
             <version>2.11.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.sitemesh</groupId>
-            <artifactId>grails-plugin-sitemesh3</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>