Merge branch 'release/4.2.x' into safe-gauges

dropwizard · Jun 13, 2022 · e9cae39 · e9cae39
2 parents 55983e1 + 55e604c
commit e9cae39
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,14 +25,14 @@ jobs:
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.java_version }}
-    - uses: actions/cache@v3.0.3
+    - uses: actions/cache@v3.0.4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Cache SonarCloud packages
-      uses: actions/cache@v3.0.3
+      uses: actions/cache@v3.0.4
       if: ${{ env.SONAR_TOKEN != null && env.SONAR_TOKEN != '' && matrix.java_version == '11' }}
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
         server-password: CI_DEPLOY_PASSWORD
         gpg-passphrase: GPG_PASSPHRASE
         gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-    - uses: actions/cache@v3.0.3
+    - uses: actions/cache@v3.0.4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -135,4 +135,4 @@ github:
     # add a "Review in Gitpod" button as a comment to pull requests
     addComment: true
     # add a "Review in Gitpod" button to the pull request's description
-    addBadge: true
+    addBadge: false
diff --git a/metrics-caffeine/pom.xml b/metrics-caffeine/pom.xml
@@ -36,7 +36,7 @@
             <dependency>
                 <groupId>org.checkerframework</groupId>
                 <artifactId>checker-qual</artifactId>
-                <version>3.22.0</version>
+                <version>3.22.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/metrics-caffeine3/pom.xml b/metrics-caffeine3/pom.xml
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.checkerframework</groupId>
                 <artifactId>checker-qual</artifactId>
-                <version>3.22.0</version>
+                <version>3.22.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/metrics-jdbi3/pom.xml b/metrics-jdbi3/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <javaModuleName>com.codahale.metrics.jdbi3</javaModuleName>
-        <jdbi3.version>3.29.0</jdbi3.version>
+        <jdbi3.version>3.30.0</jdbi3.version>
     </properties>
 
     <dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
         <jetty11.version>11.0.9</jetty11.version>
         <slf4j.version>1.7.36</slf4j.version>
         <assertj.version>3.23.1</assertj.version>
-        <mockito.version>4.6.0</mockito.version>
+        <mockito.version>4.6.1</mockito.version>
         <junit.version>4.13.1</junit.version>
         <hamcrest.version>1.3</hamcrest.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
@@ -277,6 +277,19 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.cyclonedx</groupId>
+                        <artifactId>cyclonedx-maven-plugin</artifactId>
+                        <version>2.7.0</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>makeAggregateBom</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
         </profile>