Closes #2131: Migrate to java17

Taskana · Aug 3, 2023 · feb76cb · feb76cb
1 parent e501023
commit feb76cb
Show file tree

Hide file tree

Showing 16 changed files with 172 additions and 143 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  JAVA_VERSION: 11
+  JAVA_VERSION: 17
   NODE_VERSION: 16.14.2
 
   ARTIFACTS_CYPRESS_TESTS_NAME: cypress-tests

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/...n-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java b/...n-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java
@@ -49,7 +49,9 @@ public String getUserid() {
   }
 
   @Override
+  @SuppressWarnings("removal")
   public List<String> getGroupIds() {
+    // TODO replace with Subject.current() when migrating to newer Version then 17
     Subject subject = Subject.getSubject(AccessController.getContext());
     LOGGER.trace("Subject of caller: {}", subject);
     if (subject != null) {
@@ -125,7 +127,9 @@ private String getUserIdFromWsSubject() {
     return null;
   }
 
+  @SuppressWarnings("removal")
   private String getUserIdFromJaasSubject() {
+    // TODO replace with Subject.current() when migrating to newer Version then 17
     Subject subject = Subject.getSubject(AccessController.getContext());
     LOGGER.trace("Subject of caller: {}", subject);
     if (subject != null) {

diff --git a/...common/src/main/java/pro/taskana/common/internal/configuration/parser/PropertyParser.java b/...common/src/main/java/pro/taskana/common/internal/configuration/parser/PropertyParser.java
@@ -36,7 +36,7 @@ public interface PropertyParser<T> {
               new SimpleParser<>(String.class, Function.identity()),
               new SimpleParser<>(ZoneId.class, ZoneId::of))
           .collect(
-              Collectors.toUnmodifiableMap(PropertyParser::getTargetClass, Function.identity()));
+              Collectors.toUnmodifiableMap(PropertyParser::getTargetClass, t -> t));
 
   static PropertyParser<?> getPropertyParser(Class<?> forClass) {
     forClass = ReflectionUtil.wrap(forClass);

diff --git a/history/taskana-simplehistory-rest-spring/pom.xml b/history/taskana-simplehistory-rest-spring/pom.xml
@@ -192,11 +192,7 @@
               <doclet>capital.scalable.restdocs.jsondoclet.ExtractDocumentationAsJsonDoclet</doclet>
               <docletArtifact>
                 <groupId>capital.scalable</groupId>
-                <!--
-                    currently the jdk9+ version of this doclet has a very bad bug.
-                    see: https://github.com/ScaCap/spring-auto-restdocs/issues/412
-                -->
-                <artifactId>spring-auto-restdocs-json-doclet</artifactId>
+                <artifactId>spring-auto-restdocs-json-doclet-jdk9</artifactId>
                 <version>${version.auto-restdocs}</version>
               </docletArtifact>
               <destDir>generated-javadoc-json</destDir>

diff --git a/lib/taskana-cdi/src/test/resources/arquillian.xml b/lib/taskana-cdi/src/test/resources/arquillian.xml
@@ -10,11 +10,13 @@
         name="serverConfig">../../../../src/test/resources/int-test-standalone.xml
       </property>
       <!--      <property name="javaVmArguments">-->
-      <!--        -Dh2.bindAddress=127.0.0.1-->
+      <!--        - -add-opens java.base/java.util=ALL-UNNAMED-->
       <!--        -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y-->
+      <!--        -Dh2.bindAddress=127.0.0.1-->
       <!--        -Djava.util.logging.manager=org.jboss.logmanager.LogManager-->
       <!--      </property>-->
       <property name="javaVmArguments">
+        --add-opens java.base/java.util=ALL-UNNAMED
         -Dh2.bindAddress=127.0.0.1
         -Djava.util.logging.manager=org.jboss.logmanager.LogManager
       </property>