Merge pull request #62 from steadybit/develop

Release

.github/workflows/build.yml

@@ -30,6 +30,7 @@ jobs:
         run: mvn -s .github/workflows/maven-settings.xml package -B -V
 
       - name: Login to Docker Hub and Publish the Docker Images
+        if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -58,17 +59,6 @@ jobs:
           ./ci/buildAndPushDockerImages.bash latest ${{ github.ref_name }}
           cd ..
 
-      - name: Notify Slack channel
-        uses: 8398a7/action-slack@v3
-        with:
-          status: ${{ job.status }}
-          fields: repo,ref,message,author,workflow,action
-          author_name: github
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required
-        if: always()
-
       - name: Dispatch event to trigger deployment to DEV
         if: github.ref == 'refs/heads/develop'
         run: |

.github/workflows/run-experiments.yml

@@ -4,8 +4,6 @@ on:
   # Run experiment recurrently to always have some example logs in demos
   schedule:
     - cron: "0 1 * * 0"
-  pull_request:
-    types: [opened, reopened]
 
 jobs:
   run_experiments:

bestseller-fashion/Dockerfile

@@ -1,4 +1,9 @@
-FROM openjdk:21
+FROM azul/zulu-openjdk-debian:21
+
+RUN apt-get -qq update && \
+    apt-get -qq -y upgrade && \
+    apt-get -qq -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
 ARG JAR_FILE=target/*.jar
 EXPOSE 8082
 COPY ${JAR_FILE} fashion-bestseller.jar

bestseller-fashion/pom.xml

@@ -15,6 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bestseller-fashion</artifactId>
     <name>steadybit Shopping Demo - Fashion</name>
+    <version>${revision}</version>
     <profiles>
         <profile>
             <id>arm64</id>

bestseller-toys/Dockerfile

@@ -1,4 +1,9 @@
-FROM openjdk:21
+FROM azul/zulu-openjdk-debian:21
+
+RUN apt-get -qq update && \
+    apt-get -qq -y upgrade && \
+    apt-get -qq -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
 ARG JAR_FILE=target/*.jar
 EXPOSE 8081
 COPY ${JAR_FILE} bestseller-toys.jar

bestseller-toys/pom.xml

@@ -15,6 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bestseller-toys</artifactId>
     <name>steadybit Shopping Demo - Toys</name>
+    <version>${revision}</version>
     <profiles>
         <profile>
             <id>arm64</id>

checkout/Dockerfile

@@ -1,4 +1,9 @@
-FROM openjdk:21
+FROM azul/zulu-openjdk-debian:21
+
+RUN apt-get -qq update && \
+    apt-get -qq -y upgrade && \
+    apt-get -qq -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
 ARG JAR_FILE=target/*.jar
 EXPOSE 8085
 COPY ${JAR_FILE} checkout.jar

checkout/pom.xml

@@ -15,6 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>checkout</artifactId>
     <name>steadybit Shopping Demo - checkout</name>
+    <version>${revision}</version>
     <dependencies>
         <dependency>
             <groupId>com.steadybit.demo.shopping</groupId>

gateway/Dockerfile

@@ -1,4 +1,9 @@
-FROM openjdk:21
+FROM azul/zulu-openjdk-debian:21
+
+RUN apt-get -qq update && \
+    apt-get -qq -y upgrade && \
+    apt-get -qq -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
 ARG JAR_FILE=target/*.jar
 EXPOSE 8080
 COPY ${JAR_FILE} gateway.jar

gateway/pom.xml

@@ -15,6 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>gateway</artifactId>
     <name>steadybit Shopping Demo - Gateway</name>
+    <version>${revision}</version>
     <profiles>
         <profile>
             <id>arm64</id>

hot-deals/Dockerfile

@@ -1,4 +1,9 @@
-FROM openjdk:21
+FROM azul/zulu-openjdk-debian:21
+
+RUN apt-get -qq update && \
+    apt-get -qq -y upgrade && \
+    apt-get -qq -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
 ARG JAR_FILE=target/*.jar
 EXPOSE 8083
 COPY ${JAR_FILE} hot-deals.jar

hot-deals/pom.xml

@@ -15,6 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hot-deals</artifactId>
     <name>steadybit Shopping Demo - Hot Deals</name>
+    <version>${revision}</version>
     <profiles>
         <profile>
             <id>arm64</id>

inventory-service-mock/Dockerfile

@@ -1,4 +1,9 @@
-FROM openjdk:21
+FROM azul/zulu-openjdk-debian:21
+
+RUN apt-get -qq update && \
+    apt-get -qq -y upgrade && \
+    apt-get -qq -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
 ARG JAR_FILE=target/*.jar
 EXPOSE 8084
 COPY ${JAR_FILE} inventory.jar

inventory-service-mock/pom.xml

@@ -15,6 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>inventory-service-mock</artifactId>
     <name>steadybit Shopping Demo - Inventory Service Mock</name>
+    <version>${revision}</version>
     <profiles>
         <profile>
             <id>arm64</id>

order/Dockerfile

@@ -1,4 +1,9 @@
-FROM openjdk:21
+FROM azul/zulu-openjdk-debian:21
+
+RUN apt-get -qq update && \
+    apt-get -qq -y upgrade && \
+    apt-get -qq -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
 ARG JAR_FILE=target/*.jar
 EXPOSE 8086
 COPY ${JAR_FILE} orders.jar

order/pom.xml

@@ -15,6 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>order</artifactId>
     <name>steadybit Shopping Demo - order</name>
+    <version>${revision}</version>
     <dependencies>
         <dependency>
             <groupId>com.steadybit.demo.shopping</groupId>

pom.xml

@@ -10,6 +10,12 @@
     <artifactId>shopping-demo-parent</artifactId>
     <version>${revision}</version>
     <name>steadybit Shopping Demo - Parent</name>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.1.11</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
     <modules>
         <module>hot-deals</module>
         <module>bestseller-fashion</module>
@@ -28,10 +34,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot-dependencies.version>3.1.11</spring-boot-dependencies.version>
         <spring-cloud.version>2022.0.5</spring-cloud.version>
         <snakeyaml.version>2.0</snakeyaml.version> <!-- remove when updating to spring-boot version including this -->
         <!--plugins-->
+        <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
         <jib-maven-plugin.version>3.3.2</jib-maven-plugin.version>
@@ -40,6 +46,12 @@
     </properties>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <!-- remove if included in spring-security-rsa / CVE-2024-30172 -->
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk18on</artifactId>
+                <version>1.78</version>
+            </dependency>
             <dependency>
                 <groupId>com.steadybit.demo.shopping</groupId>
                 <artifactId>shared</artifactId>
@@ -50,14 +62,6 @@
                 <artifactId>shopping-ui</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <!-- Import dependency management from Spring Boot -->
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot-dependencies.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
@@ -75,6 +79,11 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>flatten-maven-plugin</artifactId>
+                    <version>${flatten-maven-plugin.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>license-maven-plugin</artifactId>
@@ -83,7 +92,6 @@
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot-dependencies.version}</version>
                     <executions>
                         <execution>
                             <goals>
@@ -126,6 +134,31 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <!-- Tidy up all POMs before they are published -->
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                        <configuration>
+                            <updatePomFile>true</updatePomFile>
+                            <flattenMode>oss</flattenMode>
+                            <embedBuildProfileDependencies>true</embedBuildProfileDependencies>
+                            <pomElements>
+                                <distributionManagement>remove</distributionManagement>
+                            </pomElements>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
     <profiles>
         <profile>
@@ -167,13 +200,26 @@
     </profiles>
 
     <repositories>
+        <repository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
         <repository>
             <id>spring-snapshots</id>
             <name>Spring Snapshots</name>
             <url>https://repo.spring.io/libs-snapshot-local</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
         </repository>
         <repository>
             <id>spring-milestones</id>
@@ -183,13 +229,5 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>spring-releases</id>
-            <name>Spring Releases</name>
-            <url>https://repo.spring.io/release</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 </project>

shared/pom.xml

@@ -15,6 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <name>steadybit Shopping Demo - Shared</name>
     <artifactId>shared</artifactId>
+    <version>${revision}</version>
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>