svn commit: r1934377 - in subversion/branches/1.15.x: . build/ac-macros

Author: svn-role
Date: Tue May 19 04:02:26 2026
New Revision: 1934377

Log:
Merge r1933877 from trunk:

 * r1933877
   Silence all deprecation warnings from the org.tigris JavaHL package.
   Justification:
     Unnecessary warnings hide actual problems.
   Depends: 
   Votes:
     +1: brane, dsahlberg, jcorvel

Modified:
   subversion/branches/1.15.x/   (props changed)
   subversion/branches/1.15.x/STATUS
   subversion/branches/1.15.x/build/ac-macros/java.m4

Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS	Tue May 19 04:02:18 2026	(r1934376)
+++ subversion/branches/1.15.x/STATUS	Tue May 19 04:02:26 2026	(r1934377)
@@ -52,14 +52,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1933877
-   Silence all deprecation warnings from the org.tigris JavaHL package.
-   Justification:
-     Unnecessary warnings hide actual problems.
-   Depends: 
-   Votes:
-     +1: brane, dsahlberg, jcorvel
-
  * r1933892
    Make the JavaHL JAR an automatic module.
    Justification:

Modified: subversion/branches/1.15.x/build/ac-macros/java.m4
==============================================================================
--- subversion/branches/1.15.x/build/ac-macros/java.m4	Tue May 19 04:02:18 2026	(r1934376)
+++ subversion/branches/1.15.x/build/ac-macros/java.m4	Tue May 19 04:02:26 2026	(r1934377)
@@ -178,15 +178,12 @@ AC_DEFUN(SVN_FIND_JDK,
 
       if test "$enable_debugging" = "yes"; then
         JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path $JAVAC_FLAGS"
-        if test -z "$JAVAC_COMPAT_FLAGS"; then
-          JAVAC_COMPAT_FLAGS="$JAVAC_FLAGS -Xlint:-unchecked -Xlint:-deprecation -Xlint:-dep-ann -Xlint:-rawtypes"
-        fi
       else
         dnl Ignore warnings about deprecated version 8 (from --release 8)
-        JAVAC_FLAGS="-Xlint:options"
-        if test -z "$JAVAC_COMPAT_FLAGS"; then
-          JAVAC_COMPAT_FLAGS="$JAVAC_FLAGS"
-        fi
+        JAVAC_FLAGS="-Xlint:-options $JAVAC_FLAGS"
+      fi
+      if test -z "$JAVAC_COMPAT_FLAGS"; then
+        JAVAC_COMPAT_FLAGS="$JAVAC_FLAGS -Xlint:-unchecked -Xlint:-deprecation -Xlint:-dep-ann -Xlint:-rawtypes"
       fi
     fi