From 70e18d8b5a30f181840d412565e9d2f6b00da586 Mon Sep 17 00:00:00 2001
From: Maarten Mulders <mthmulders@users.noreply.github.com>
Date: Tue, 31 Aug 2021 00:32:32 +0200
Subject: [PATCH] Prepare build for Java16 (#598)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Upgrade Mockito to latest version

* Run GitHub Actions on Java 11 and 16

* Run JUnit tests with `--add-opens java.base/java.util=ALL-UNNAMED`

* Move Surefire JVM arguments to Maven property

* Update build.yml

* Update validate.yml

* simplily build singleton dapr http (#590)

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Add Automerge workflow (#605)

* Add Automerge workflow

The automerge workflow will check for complete and approved pull requests and will merge them automatically.

Sources:
- For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge")
- https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue.

Resolves https://github.com/dapr/java-sdk/issues/603

* Update automerge-bot.yml

* Update automerge-bot.yml

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Cleanup Maven POM files (#604)

Added fixed versions for maven-deploy-plugin & spring-boot-maven-plugin as this would otherwise break in a future maven version.

Also fixed some indenting and removed duplicate declarations.

Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>

* Add support for @PostMapping("/path") to pub/sub topic subscriptions (#583)

* Remove duplicate dependency

* Transform into managed dependencies

* Remove old JUnit version from dependencies

* Add tests for DaprBeanPostProcessor

* Also register PostMappings that use value

* Modify existing pub/sub test to no use @PostMapping(path="...")

* Remove added dependencies on AssertJ, Spring Test and Servlet API

* Remove test in favour of the sdk-tests one

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Run JUnit tests in all modules with java.base/java.util and java.base/java.lang opened to all modules

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>
Co-authored-by: 浩 <inf2inf2@outlook.com>
Co-authored-by: Tom Cools <tom.cools@live.be>
Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>
---
 .github/workflows/build.yml    | 5 ++++-
 .github/workflows/validate.yml | 5 ++++-
 pom.xml                        | 3 ++-
 sdk/pom.xml                    | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7ea05cf3..bce6eb45e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,12 +16,15 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 11, 13, 15, 16 ]
     env:
       GOVER: 1.15.0
       GOOS: linux
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
-      JDK_VER: 13.0.x
+      JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.3.0-rc.1
       DAPR_RUNTIME_VER: 1.3.0-rc.1
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.3.0-rc.1/install/install.sh
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 6b67f229f..c15c39ce1 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -21,12 +21,15 @@ on:
 jobs:
   validate:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 11, 13, 15, 16 ]
     env:
       GOVER: 1.15.0
       GOOS: linux
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
-      JDK_VER: 13.0.x
+      JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.3.0-rc.1
       DAPR_RUNTIME_VER: 1.3.0-rc.1
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh
diff --git a/pom.xml b/pom.xml
index f38dc98db..ab1afdea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
     <spotbugs.version>4.0.0-RC1</spotbugs.version>
     <spotbugs.fail>true</spotbugs.fail>
     <springboot.version>2.3.5.RELEASE</springboot.version>
+    <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
   </properties>
 
   <distributionManagement>
@@ -76,7 +77,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>3.6.0</version>
+        <version>3.11.2</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 5e2210071..405674f05 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -30,6 +30,9 @@
   <properties>
     <maven.deploy.skip>false</maven.deploy.skip>
     <grpc.version>1.39.0</grpc.version>
+    <argLine>
+      --add-opens java.base/java.util=ALL-UNNAMED
+    </argLine>
   </properties>
 
   <dependencies>