Merge from main-3

.github/actions/build-images/build-images.sh

@@ -4,8 +4,8 @@ if [ "$TAG" == "" ]; then
     exit 1
 fi
 if [ "$DEFAULT_JDK" = "" ]; then
-    echo "DEFAULT_JDK not found using 11"
-    DEFAULT_JDK=11
+    echo "DEFAULT_JDK not found using 17"
+    DEFAULT_JDK=17
 else
     echo "DEFAULT_JDK=$DEFAULT_JDK"
 fi
@@ -20,7 +20,7 @@ function pack_image {
     fi
     echo "Creating: $REPO:$TAG-jdk$v"
     # --buildpack "paketo-buildpacks/[email protected]" --buildpack "paketo-buildpacks/[email protected]"
-    pack build --builder gcr.io/paketo-buildpacks/builder:base \
+    pack build --builder paketobuildpacks/builder-jammy-base:latest \
             --path "$JAR" \
             --trust-builder --verbose \
             --env BP_JVM_VERSION=$v "$REPO:$TAG-jdk$v"
@@ -37,7 +37,7 @@ for ((i = 0; i < LEN; i++)); do
     IMAGE="$(jq -r --argjson index $i '.include[$index] | .image' .github/workflows/images.json)"
     ARTIFACT_ID="$(jq -r --argjson index $i '.include[$index] | .name' .github/workflows/images.json)"
     # 8 11 17 21
-    for v in 8 11 17; do
+    for v in 17 21; do
         pack_image "$TARGET/$ARTIFACT_ID"  $IMAGE $v $ARTIFACT_ID
         RC=$?
         if [ $RC -ne 0 ]; then

.github/workflows/build-image.sh

@@ -13,8 +13,8 @@ if [ "$TAG" == "" ]; then
     exit 1
 fi
 if [ "$DEFAULT_JDK" = "" ]; then
-    echo "DEFAULT_JDK not found using 11"
-    DEFAULT_JDK=11
+    echo "DEFAULT_JDK not found using 17"
+    DEFAULT_JDK=17
 else
     echo "DEFAULT_JDK=$DEFAULT_JDK"
 fi
@@ -55,7 +55,8 @@ if [ ! -f "$JAR" ]; then
         exit $RC
     fi
 fi
-for v in 8 11 17; do
+# TODO add Java 21 when packeto supports it
+for v in 17; do
     echo "Creating: $REPO:$TAG-jdk$v"
     pack build --builder gcr.io/paketo-buildpacks/builder:base \
         --path "$JAR" \
@@ -93,9 +94,5 @@ for v in 8 11 17; do
         fi
     fi
 done
-#if [ "$PUSH" == "true" ]; then
-#    echo "Pruning Docker"
-#    docker system prune -f
-#    docker system prune --volumes -f
-#fi
+
 

.github/workflows/build-images.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'liberica'
       - name: Load matrix
         id: matrix
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'liberica'
       - name: Install pack
         uses: jvalkeal/[email protected]
@@ -81,7 +81,7 @@ jobs:
         shell: bash
         env:
           TAG: ${{ needs.prepare.outputs.version }}
-          DEFAULT_JDK: '11'
+          DEFAULT_JDK: '17'
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           DELETE_TAGS: ${{ inputs.delete-tags }}

.github/workflows/build-snapshot-controller.yml

@@ -39,7 +39,7 @@ jobs:
               "workflow_dispatch": {
                 "owner": "spring-cloud",
                 "repo": "spring-cloud-dataflow-ui",
-                "ref": "main",
+                "ref": "main-3",
                 "workflow": "build-snapshot-worker.yml"
               }
             },

.github/workflows/build-snapshot-worker.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:
@@ -116,7 +116,7 @@ jobs:
             ${{ runner.os }}-m2-${{ matrix.db }}
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'liberica'
       - uses: jvalkeal/setup-maven@v1
         with:

.github/workflows/build-uaa-test.yml

@@ -17,7 +17,7 @@ jobs:
           path: src/docker/uaa/uaa
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'liberica'
       - name: Build UAA Test Image
         shell: bash

.github/workflows/ci-images.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-java@v3
         if: ${{ inputs.version == null || inputs.version == '' }}
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'liberica'
       - name: Version from POM
         if: ${{ inputs.version == null || inputs.version == '' }}

.github/workflows/ci-it-db.yml

@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:
@@ -40,7 +40,7 @@ jobs:
           -Dgroups=${{ matrix.group }} \
           -Pfailsafe \
           --batch-mode \
-          test
+          verify
     - name: Integration Test Report for ${{ matrix.group }}
       id: test_report
       uses: dorny/test-reporter@v1
@@ -77,7 +77,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'liberica'
       - uses: jvalkeal/setup-maven@v1
         with:

.github/workflows/ci-it-performance.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:
@@ -37,7 +37,7 @@ jobs:
           -Dgroups=performance \
           -Pfailsafe \
           --batch-mode \
-          test
+          verify
     - name: Test Report
       uses: dorny/test-reporter@v1
       if: ${{ success() || failure() }}

.github/workflows/ci-it-security.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:

.github/workflows/ci-pr.yml

@@ -10,7 +10,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - name: Build
       shell: bash

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
 #     jdk8
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:
@@ -121,7 +121,7 @@ jobs:
           ${{ runner.os }}-m2-${{ matrix.db }}
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:

.github/workflows/fix-deployment-files.yml

@@ -3,7 +3,7 @@ name: Fix Deployment Files
 on:
   push:
     branches:
-      - main
+      - main-3
 
 jobs:
   build:
@@ -18,7 +18,7 @@ jobs:
 
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:

.github/workflows/milestone-worker.yml

@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:

.github/workflows/next-dev-version-worker.yml

@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'liberica'
     - uses: jvalkeal/setup-maven@v1
       with:

.github/workflows/publish-docs.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'liberica'
       - uses: jvalkeal/setup-maven@v1
         with:

.github/workflows/release-worker.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'liberica'
       - uses: jvalkeal/setup-maven@v1
         with:

.github/workflows/workflow.adoc

@@ -0,0 +1,71 @@
+= Workflow Reference
+
+This README serves as a guide to the GitHub Action workflows included in this repository.
+It outlines the purpose and functionality of each workflow, detailing their role in the CI and release processes.
+Additionally, this document provides an overview of the scripts and actions utilized in these workflows, offering insights into how they work together in SCDF's CI/CD pipeline.
+
+This document is a work in progress, and as various workflows are updated, the documentation will be revised to reflect both existing and new behaviors.
+
+
+== Building Docker Images and pushing the containers to DockerHub
+.This diagram shows the flow of execution of how workflows create Docker imges.
+```
+┌─────────────────────────┐
+│                         │
+│                         │
+│build-snapshot-worker.yml┼────┐
+│                         │    │
+│                         │    │
+└─────────────────────────┘    │
+┌─────────────────────────┐    │
+│                         │    │
+│                         │    │
+│     ci-images.yml       ┼────┤     ┌─────────────────────────┐         ┌─────────────────────────┐
+│                         │    │     │                         │         │                         │
+│                         │    │     │                         │         │                         │
+└─────────────────────────┘    ├────►│     build-images.yml    ┼────────►│      build-image.sh     │
+┌─────────────────────────┐    │     │                         │         │                         │
+│                         │    │     │                         │         │                         │
+│                         │    │     └───────────┬─────────────┘         └─────────────────────────┘
+│         ci.yml          ┼────┤                 │
+│                         │    │                 │
+│                         │    │     ┌───────────┴─────────────┐
+└─────────────────────────┘    │     │                         │       
+┌─────────────────────────┐    │     │                         │
+│                         │    │     │       images.json       │
+│                         │    │     │                         │
+│    release-worker.yml   ┼────┘     │                         │
+│                         │          └─────────────────────────┘
+│                         │
+└─────────────────────────┘                                                                                                                                                 
+```
+
+Part of the release and CI process involves creating and pushing images to a registry (such as DockerHub) for the Dataflow server, Skipper server, CTR app, and other components.
+This process is managed by the `build-images` (build-images.yml)  workflow. While the `build-images` workflow is typically not run independently, it is invoked by other workflows that handle CI builds and releases.
+The `build-images` workflow determines which images to create based on the `images.json` file.
+This file contains metadata on the primary SCDF components that need to have an associated image.
+Each entry specifies the location (directory) where the jar can be found, jar name, and image name for each artifact that will be used to construct the image.
+For each entry in the `images.json` file, the workflow calls the `build-image.sh` script, which retrieves the jar, builds the image, and then pushes it to the registry.
+
+SCDF also provides images for external applications that support some of the optional features that are offered by dataflow.
+These include Grafana and Prometheus local.
+These images are created and pushed using the docker/build-push-action@v2 action.
+
+=== Scripts used to build images
+As mentioned above, the `build-image.sh` script is responsible for building the specified image based on the parameters provided and then pushing the image to Dockerhub.
+This script uses Paketo to build an image for each of the supported Java versions using the corresponding jar file.
+The resulting image name will look something like `spring-cloud-dataflow-server:3.0.0-SNAPSHOT-jdk17`.
+Additionally, the script creates a default image using the default Java version as specified by the `DEFAULT_JDK` environment variable.
+
+The format for running the `build-image.sh` is as follows:
+[source, bash]
+```
+bash
+./build-image.sh <directory containing the jar> <The name of the image to create> <name of the jar>
+```
+
+There is an optional `DEFAULT_JDK` environment variable that allows you to set the JDK version for the default image created.
+If not the script will set it to its current setting (which as of the writing of this document is `17`).
+
+NOTE: When new releases of Java are available and are compliant with the SCDF release, they need to be added to the `build-image.sh` script.
+

.gitignore

@@ -22,6 +22,7 @@ logs/
 scdf-logs/
 .attach_pid*
 .jfrog/
+.gradle
 
 # Eclipse artifacts, including WTP generated manifests
 .classpath

.springjavaformatconfig

@@ -1 +1 @@
-java-baseline=8
+java-baseline=17

.vscode/launch.json

@@ -36,6 +36,16 @@
             "request": "attach",
             "hostName": "localhost",
             "port": 5005
+        },
+        {
+            "type": "java",
+            "name": "SKIPPER default",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole",
+            "mainClass": "org.springframework.cloud.skipper.server.app.SkipperServerApplication",
+            "projectName": "spring-cloud-skipper-server",
+            "args": ""
         }
     ]
 }