Some more backgrounds (#21)

k8s/slogan-generator-deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: slogan-generator
-        image: greystone/slogan-generator:0.1.12-SNAPSHOT
+        image: greystone/slogan-generator:0.1.16
         ports:
         - containerPort: 9090
         command: ["java"]

pom.xml

@@ -32,7 +32,7 @@ Copyright (C) Marcus Hirt, 2024
     <modelVersion>4.0.0</modelVersion>
     <groupId>se.hirt</groupId>
     <artifactId>slogan-generator</artifactId>
-    <version>0.1.16-SNAPSHOT</version>
+    <version>0.1.18git -SNAPSHOT</version>
 
     <properties>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>

release.sh

@@ -3,10 +3,22 @@ export DOCKER_BUILDKIT=1
 docker buildx create --name multi-arch-builder --use
 docker buildx inspect --bootstrap
 
-# Extract version from pom.xml
-VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+# Extract version from pom.xml and remove -SNAPSHOT
+VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//')
 
+# Update the version in pom.xml
+mvn versions:set -DnewVersion=$VERSION
+mvn versions:commit
+
+# Build the project
 ./mvnw package
 
 # Only building with the release tag - latest is built on each commit to GitHub
 docker buildx build -f src/main/docker/Dockerfile.jvm --platform linux/amd64,linux/arm64 -t greystone/slogan-generator:$VERSION --push .
+
+# Revert version in pom.xml to next development version
+NEXT_DEV_VERSION="${VERSION%.*}.$((${VERSION##*.} + 1))-SNAPSHOT"
+mvn versions:set -DnewVersion=$NEXT_DEV_VERSION
+mvn versions:commit
+
+echo "Released version $VERSION and updated the pom to the next development version $NEXT_DEV_VERSION"

src/main/java/se/hirt/slogan/ImageGenerator.java

@@ -45,6 +45,7 @@
 @ApplicationScoped
 public class ImageGenerator {
 	public enum Background {
+		BLUE("blue"),
 		CITY("city"),
 		CLOUDS("clouds"),
 		LAKE("lake"),
@@ -56,6 +57,7 @@ public enum Background {
 		NEBULA("nebula"),
 		NIGHT("night"),
 		OCEAN("ocean"),
+		PURPLE("purple"),
 		SUNSET("sunset");
 
 		private final String fileName;

src/main/java/se/hirt/slogan/TestResource.java

@@ -71,7 +71,7 @@ public String testImages() {
 		html.append("<table>");
 		html.append("<tr><th>Slogan</th><th>Item</th><th>Background</th><th>Image</th></tr>");
 
-		String[] items = {"JDK Mission Control", "Java", "OpenJDK"};
+		String[] items = {"JDK Mission Control", "Java"};
 		for (String item : items) {
 			for (ImageGenerator.Background bg : ImageGenerator.Background.values()) {
 				String staticSlogan = sloganGenerator.generateSlogan(item);