set java 21 in v25 projects, more fixes for jackson api usage

Author: manolo

scripts/pit/lib/lib-patch-v25.sh

@@ -46,10 +46,10 @@ applyv25patches() {
   esac
   ## TODO: document in migration guide to 25
   patchImports 'import com.fasterxml.jackson.core.type.TypeReference;' 'import tools.jackson.core.type.TypeReference;'
-  patchImports 'import com.fasterxml.jackson.databind.node.ObjectNode;' 'import tools.jackson.databind.node.ObjectNode;'
-  patchImports 'import com.fasterxml.jackson.databind.node.ArrayNode;' 'import tools.jackson.databind.node.ArrayNode;'
+  patchImports 'import com.fasterxml.jackson.databind' 'import tools.jackson.databind'
   patchImports 'import org.springframework.boot.autoconfigure.domain.EntityScan;' 'import org.springframework.boot.persistence.autoconfigure.EntityScan;'
   patchImports 'import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;' 'import org.springframework.boot.webmvc.autoconfigure.error.ErrorMvcAutoConfiguration;'
+  patchMapper
 
   diff_=`git diff $D $F | egrep '^[+-]'`
   [ -z "$TEST" -a -n "$diff_" ] && echo "" && warn "Patched sources\n" && dim "====== BEGIN ======\n\n$diff_\n======  END  ======"
@@ -339,4 +339,22 @@ patchLumoImports() {
       fi
     fi
   done
+}
+
+## TODO: needs to be documented in vaadin migration guide to 25
+patchMapper() {
+  # Find all Java files that contain the JavaTimeModule registration
+  local java_files=$(grep -rl ".*mapper.registerModule.*JavaTimeModule.*" . --include="*.java" 2>/dev/null)
+  [ -z "$java_files" ] && return 0
+
+  local file
+  for file in $java_files; do
+    [ -z "$TEST" ] && warn "patching ObjectMapper configuration in $file" || cmd "## patching ObjectMapper configuration in $file"
+
+    # Remove the JavaTimeModule registration line
+    perl -pi -e 's|.*mapper.registerModule.*JavaTimeModule.*||' "$file"
+
+    # Replace IOException with Exception in the same file
+    perl -pi -e 's|catch \(IOException|catch (Exception|g' "$file"
+  done
 }

scripts/pit/lib/lib-patch.sh

@@ -55,9 +55,15 @@ applyPatches() {
       ;;
   esac
   case "$vers_" in
+    ## The minimum version of Java supported by vaadin is 17, hence we test for it
+    23*|24*)
+      setJavaVersion 17
+      ;;
     25.0.0*)
+      ## The minimum version of Java supported by vaadin is 17, hence we test for it
+      setJavaVersion 21
       [ "$type_" = next ] && applyv25patches $app_
-    ;;
+      ;;
   esac
 
   # always successful
@@ -84,15 +90,6 @@ isUnsupported() {
   return 1
 }
 
-## The minimum version of Java supported by vaadin is 17, hence we test for it
-downgradeJava() {
-  [ ! -f pom.xml ] && return
-  grep -q '<java.version>21</java.version>' pom.xml || return
-  cmd "perl -pi -e 's|<java.version>21</java.version>|<java.version>17</java.version>|' pom.xml"
-  perl -pi -e 's|<java.version>21</java.version>|<java.version>17</java.version>|' pom.xml
-  [ -n "$TEST" ] || warn "Downgraded Java version from 21 to 17 in pom.xml"
-}
-
 ## Moves quarkus dependency to the bottom of the dependencyManagement block
 moveQuarkusBomToBottom() {
   changeBlock  \

scripts/pit/lib/lib-utils.sh

@@ -1084,3 +1084,15 @@ validateToken() {
   [ "$H" != true ] && err "No pull access $H" && return 1
   return 0
 }
+
+## change java version in pom files
+## $1 new version
+setJavaVersion() {
+  for i in `getPomFiles`; do
+    local v=`grep '</java.version>' pom.xml  | sed -e 's|[^0-9]||g'`
+    [ -z "$v" -o "$v" = "$1" ] && return
+    cmd "perl -pi -e 's|<java.version>\d+</java.version>|<java.version>'$1'</java.version>|' $i"
+    perl -pi -e 's|<java.version>\d+</java.version>|<java.version>'$1'</java.version>|' $i
+    [ -n "$TEST" ] || warn "Changed Java version from $v to $1 in $i"
+  done
+}