Merge branch 'main' into conditional-github-pages

Author: dhoard

.editorconfig

@@ -4,7 +4,7 @@ root = true
 max_line_length = 100
 indent_size = 2
 
-[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mise.lock,mvnm,mvnw.cmd,generate-protobuf.sh,super-linter.env,.gitleaksignore}]
+[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mvnm,mvnw.cmd,generate-protobuf.sh,super-linter.env,.gitleaksignore}]
 max_line_length = 200
 
 [{grafana-dashboard-*.json,.editorconfig}]

.github/dependabot.yml

@@ -13,6 +13,8 @@ jobs:
         with:
           persist-credentials: false
         uses: actions/checkout@v4
-      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
+      - uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
+        env:
+          MISE_ENABLE_TOOLS: oats,java
       - name: Run acceptance tests
         run: mise run acceptance-test

.github/workflows/acceptance-tests.yml

@@ -12,7 +12,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
+      - uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
+        env:
+          MISE_ENABLE_TOOLS: java,protoc
       - name: Cache local Maven repository
         uses: actions/cache@v4
         with:

.github/workflows/build.yml

@@ -37,7 +37,9 @@ jobs:
           persist-credentials: false
           fetch-tags: "true"
           fetch-depth: 0
-      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
+      - uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
+        env:
+          MISE_ENABLE_TOOLS: hugo,java
         with:
           cache: "false"
       - name: Setup Pages

.github/workflows/github-pages.yaml

@@ -13,6 +13,8 @@ jobs:
         with:
           persist-credentials: false
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
+      - uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
+        env:
+          MISE_ENABLE_TOOLS: lychee,zizmor
       - name: Lint
         run: mise run lint-rest

.github/workflows/lint-rest.yml

@@ -13,6 +13,8 @@ jobs:
         with:
           persist-credentials: false
         uses: actions/checkout@v4
-      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
+      - uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
+        env:
+          MISE_ENABLE_TOOLS: java
       - name: Run native tests
         run: mise run native-test

.github/workflows/native-tests.yml

@@ -47,7 +47,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Publish to Apache Maven Central
-        run: mvn deploy -P release -Dmaven.test.skip=true
+        run: mvn deploy -P 'release,!default' -Dmaven.test.skip=true
         env:
           MAVEN_USERNAME: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_USERNAME }}
           MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_PASSWORD }}

.github/workflows/release.yml

@@ -16,7 +16,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: jdx/mise-action@c94f0bf9e520b150e34c017db785461f7e71c5fb # v2.1.1
+      - uses: jdx/mise-action@13abe502c30c1559a5c37dff303831bab82c9402 # v2.2.3
+        env:
+          MISE_ENABLE_TOOLS: java
       - name: Cache local Maven repository
         uses: actions/cache@v4
         with:

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

@@ -36,14 +36,14 @@ services:
       - -jar
       - /example-greeting-service.jar
   collector:
-    image: otel/opentelemetry-collector-contrib:0.85.0
+    image: otel/opentelemetry-collector-contrib:0.126.0
     network_mode: host
     volumes:
       - ./config/otelcol-config.yaml:/config.yaml
     command:
       - --config=file:/config.yaml
   prometheus:
-    image: prom/prometheus:v2.47.0
+    image: prom/prometheus:v2.55.1
     network_mode: host
     volumes:
       - ./config/prometheus.yaml:/prometheus.yaml
@@ -52,14 +52,14 @@ services:
       - --enable-feature=native-histograms
       - --config.file=/prometheus.yaml
   tempo:
-    image: grafana/tempo:2.2.3
+    image: grafana/tempo:2.7.2
     network_mode: host
     volumes:
       - ./config/tempo-config.yaml:/config.yaml
     command:
       - --config.file=/config.yaml
   grafana:
-    image: grafana/grafana:10.1.2
+    image: grafana/grafana:10.4.19
     network_mode: host
     ports:
       - "3000:3000"