Bump blaze build system to v1.5.1

fizzed · Nov 4, 2023 · 33c4946 · 33c4946
1 parent 61ddd98
commit 33c4946
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 15 deletions.
diff --git a/.blaze/blaze.java b/.blaze/blaze.java
@@ -38,7 +38,7 @@ public void generate() {
 
     @Task(order=3, value="Demo of rendering a template into a string.")
     public void render() {
-        exec("mvn", "-pl", "rocker-test-java6", "-am", "test", "-Pexec-java6test",
+        exec("mvn", "-pl", "rocker-test-template", "-am", "test", "-Pexec-java6test",
             "-DskipTests=true", "-Dexec.classpathScope=test",
             "-Dexec.mainClass=com.fizzed.rocker.bin.RenderMain").run();
     }
@@ -52,24 +52,23 @@ public void hot_reload() {
 
     @Task(order=5, value="Demo of asynchronously sending a template in an Undertow-based HTTP server.")
     public void undertow() {
-        exec("mvn", "-pl", "rocker-test-java8", "-am", "test", "-Pexec-java8test",
+        exec("mvn", "-pl", "rocker-test-template", "-am", "test", "-Pexec-java8test",
             "-DskipTests=true", "-Dexec.classpathScope=test",
             "-Dexec.mainClass=com.fizzed.rocker.bin.UndertowMain").run();
     }
 
     @Task(order=6, value="Demo of asynchronously sending a template in an Netty-based HTTP server.")
     public void netty() {
-        exec("mvn", "-pl", "rocker-test-java8", "-am", "test", "-Pexec-java8test",
+        exec("mvn", "-pl", "rocker-test-template", "-am", "test", "-Pexec-java8test",
             "-DskipTests=true", "-Dexec.classpathScope=test",
             "-Dexec.mainClass=com.fizzed.rocker.bin.NettyMain").run();
     }
 
     @Task(order=99, value="Use by maintainers only. Updates REAME.md with latest git tag.")
     public void after_release() throws Exception {
-        Integer exitValue
-            = exec("git", "diff-files", "--quiet")
-                .exitValues(0,1)
-                .run();
+        int exitValue = (int)exec("git", "diff-files", "--quiet")
+            .exitValues(0,1)
+            .run();
 
         if (exitValue == 1) {
             fail("Uncommitted changes in git. Commit them first then re-run this task");
@@ -83,13 +82,12 @@ public void after_release() throws Exception {
 
     private String latest_tag() {
         // get latest tag and trim off "v"
-        String latestTag
-            = exec("git", "describe", "--abbrev=0", "--tags")
-                .pipeOutput(Streamables.captureOutput())
-                .runCaptureOutput()
-                .toString()
-                .trim()
-                .substring(1);
+        String latestTag = exec("git", "describe", "--abbrev=0", "--tags")
+            .pipeOutput(Streamables.captureOutput())
+            .runCaptureOutput()
+            .toString()
+            .trim()
+            .substring(1);
 
         return latestTag;
     }

diff --git a/.blaze/pom.xml b/.blaze/pom.xml
@@ -0,0 +1,64 @@
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>blaze</groupId>
+  <artifactId>rocker-blaze</artifactId>
+  <version>0.0.1</version>
+
+  <!--
+  THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT BY HAND!
+
+  Edit or create a <blaze-script>.conf file, and re-run the generate-maven-project command.
+  -->
+
+  <properties>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.install.skip>true</maven.install.skip>
+    <maven.deploy.skip>true</maven.deploy.skip>
+  </properties>
+  <build>
+    <sourceDirectory>${project.basedir}</sourceDirectory>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>com.fizzed</groupId>
+      <artifactId>blaze-ivy</artifactId>
+      <version>1.5.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.11.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>2.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>com.typesafe</groupId>
+      <artifactId>config</artifactId>
+      <version>1.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ivy</groupId>
+      <artifactId>ivy</artifactId>
+      <version>2.5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fizzed</groupId>
+      <artifactId>blaze-core</artifactId>
+      <version>1.5.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>2.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>org.zeroturnaround</groupId>
+      <artifactId>zt-exec</artifactId>
+      <version>1.12</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Rocker Templates by Fizzed
 ==========================
 
+## TBD
+
+ - Java 8 is now minimum supported version (Java 21 will no longer compile < 8)
+ - Merged rocker-test-java7 and rocker-test-java8 modules together into rocker-test-template
+ - Blaze build system updated to v1.5.1 (which works on Java 21)
+ - CI automated tests for Java 21
+
 #### 1.4.0 - 2023-10-11
 
  - Java 6 support dropped. Java 7 is now minimum.

diff --git a/blaze.jar b/blaze.jar
diff --git a/pom.xml b/pom.xml
@@ -140,7 +140,7 @@
             <dependency>
                 <groupId>io.undertow</groupId>
                 <artifactId>undertow-core</artifactId>
-                <version>1.3.18.Final</version>
+                <version>2.3.7.Final</version>
                 <scope>test</scope>
             </dependency>
 

diff --git a/rocker-test-template/pom.xml b/rocker-test-template/pom.xml
@@ -73,6 +73,27 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>exec-java8test</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.3.2</version>
+                        <executions>
+                            <execution>
+                                <id>exec-run</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <dependencies>