Merge branch 'master' into fix_fossa_springboot_starter

Signed-off-by: Artur Souza <artursouza.ms@outlook.com>
dapr · Jan 15, 2024 · 7c14cae · 7c14cae
2 parents 9ddb43c + 7eb24ff
commit 7c14cae
Show file tree

Hide file tree

Showing 30 changed files with 1,982 additions and 78 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,22 +21,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11, 13, 15, 16 ]
-        spring-boot-version: [ 2.7.18 ]
+        java: [ 17 ]
+        spring-boot-version: [ 3.0.13 ]
         experimental: [ false ]
         include:
-          - java: 11
+          - java: 17
+            spring-boot-version: 2.7.18
+            experimental: false
+          - java: 17
             spring-boot-version: 2.6.14
             experimental: false
-          - java: 11
+          - java: 17
             spring-boot-version: 2.5.7
             experimental: false
-          - java: 11
-            spring-boot-version: 2.4.0
-            experimental: false
-          - java: 11
-            spring-boot-version: 2.3.6.RELEASE
-            experimental: false
     env:
       GOVER: "1.20"
       GOOS: linux
@@ -152,7 +149,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     env:
-      JDK_VER: 11
+      JDK_VER: 17
       OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }}
       OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }}
       GPG_KEY: ${{ secrets.GPG_KEY }}
@@ -178,7 +175,7 @@ jobs:
           echo "DEPLOY_OSSRH=true" >> $GITHUB_ENV
       - name: Install jars
         if: env.DEPLOY_OSSRH == 'true'
-        run: ./mvnw clean install -B -q
+        run: ./mvnw install -B -q
       - name: Publish to ossrh
         if: env.DEPLOY_OSSRH == 'true'
         run: |

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false # Keep running if one leg fails.
       matrix:
-        java: [ 11, 13, 15, 16 ]
+        java: [ 17 ]
     env:
       GOVER: "1.20"
       GOOS: linux

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -18,12 +18,13 @@
   <properties>
     <protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
     <protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.deploy.skip>true</maven.deploy.skip>
     <spotbugs.fail>false</spotbugs.fail>
     <opentelemetry.version>0.14.0</opentelemetry.version>
+    <springboot.version>3.0.13</springboot.version>
   </properties>
 
   <dependencies>
@@ -66,12 +67,12 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.7.18</version>
+      <version>${springboot.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>2.7.18</version>
+      <version>${springboot.version}</version>
     </dependency>
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
@@ -111,7 +112,7 @@
     </dependency>
     <dependency>
       <groupId>io.dapr</groupId>
-      <artifactId>dapr-sdk-springboot</artifactId>
+      <artifactId>dapr-sdk-springboot3</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -134,6 +135,11 @@
       <artifactId>retry4j</artifactId>
       <version>0.15.0</version>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -176,7 +182,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <release>11</release>
+          <release>${java.version}</release>
         </configuration>
       </plugin>
       <plugin>
@@ -212,6 +218,14 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <!-- Skip checkstyle for auto-generated code -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/examples/src/main/java/io/dapr/examples/OpenTelemetryInterceptor.java b/examples/src/main/java/io/dapr/examples/OpenTelemetryInterceptor.java
@@ -22,9 +22,9 @@
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Collections;
 
 @Component

diff --git a/pom.xml b/pom.xml
@@ -22,8 +22,8 @@
     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
     <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <maven.deploy.skip>true</maven.deploy.skip>
     <!--
         manually declare durabletask-client's jackson dependencies for workflows sdk
@@ -32,13 +32,11 @@
         -->
     <jackson.version>2.12.3</jackson.version>
     <gpg.skip>true</gpg.skip>
-    <spotbugs.version>4.0.0-RC1</spotbugs.version>
     <spotbugs.fail>true</spotbugs.fail>
     <spotbugs.exclude.filter.file>../spotbugs-exclude.xml</spotbugs.exclude.filter.file>
-    <springboot.version>2.7.18</springboot.version>
     <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
-    <failsafe.version>3.1.2</failsafe.version>
-    <surefire.version>3.1.2</surefire.version>
+    <failsafe.version>3.2.2</failsafe.version>
+    <surefire.version>3.2.2</surefire.version>
     <junit-bom.version>5.7.2</junit-bom.version>
   </properties>
 
@@ -60,6 +58,11 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>2.0.9</version>
+      </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-bom</artifactId>
@@ -120,7 +123,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.11</version>
         <executions>
           <execution>
             <goals>
@@ -132,7 +135,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.20</version>
+        <version>1.23</version>
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
@@ -154,7 +157,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.6</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>sign-artifacts</id>
@@ -175,7 +178,7 @@
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.8</version>
+        <version>1.6.13</version>
         <extensions>true</extensions>
         <configuration>
           <serverId>ossrh</serverId>
@@ -186,7 +189,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.3.1</version>
         <configuration>
           <configLocation>checkstyle.xml</configLocation>
           <encoding>UTF-8</encoding>
@@ -219,15 +222,7 @@
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>4.1.4</version>
-        <dependencies>
-          <!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
-          <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs</artifactId>
-            <version>${spotbugs.version}</version>
-          </dependency>
-        </dependencies>
+        <version>4.8.2.0</version>
         <configuration>
           <excludeFilterFile>${spotbugs.exclude.filter.file}</excludeFilterFile>
           <failOnError>${spotbugs.fail}</failOnError>
@@ -316,7 +311,12 @@
     <module>sdk-actors</module>
     <module>sdk-workflows</module>
     <module>sdk-springboot</module>
+    <module>sdk-springboot3</module>
     <module>examples</module>
+    <!-- don't add sdk-tests to the build, 
+      it's only used for CI testing by github action
+    <module>sdk-tests</module>
+    -->
   </modules>
 
 </project>
diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
@@ -95,7 +95,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.11</version>
         <executions>
           <execution>
             <id>default-prepare-agent</id>

diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml
@@ -130,7 +130,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.11</version>
         <executions>
           <execution>
             <id>default-prepare-agent</id>