You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ja...@apache.org on 2018/05/19 14:48:35 UTC

svn commit: r1831895 - in /subversion/trunk: build/ac-macros/java.m4 build/generator/gen_win.py configure.ac subversion/bindings/javahl/README

Author: jamessan
Date: Sat May 19 14:48:35 2018
New Revision: 1831895

URL: http://svn.apache.org/viewvc?rev=1831895&view=rev
Log:
Bump minimum JDK version required for JavaHL to 1.8, in preparation for the
changes needed to support Java 10

* subversion/bindings/javahl/README
  (): Update JDK version requirements.

* configure.ac
  (JAVA_OLDEST_WORKING_VER): Set to 1.8

* build/ac-macros/java.m4
  (SVN_FIND_JDK): Set Java source version to 1.8.

* build/generator/gen_win.py
  (get_proj_sources): Set Java source and target version to 1.8.

Modified:
    subversion/trunk/build/ac-macros/java.m4
    subversion/trunk/build/generator/gen_win.py
    subversion/trunk/configure.ac
    subversion/trunk/subversion/bindings/javahl/README

Modified: subversion/trunk/build/ac-macros/java.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/java.m4?rev=1831895&r1=1831894&r2=1831895&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/java.m4 (original)
+++ subversion/trunk/build/ac-macros/java.m4 Sat May 19 14:48:35 2018
@@ -166,7 +166,7 @@ AC_DEFUN(SVN_FIND_JDK,
     # The release for "-source" could actually be greater than that
     # of "-target", if we want to cross-compile for lesser JVMs.
     if test -z "$JAVAC_FLAGS"; then
-      JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.6"
+      JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.8"
       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

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1831895&r1=1831894&r2=1831895&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Sat May 19 14:48:35 2018
@@ -375,7 +375,7 @@ class WinGeneratorBase(gen_win_dependenc
 
           cbuild = ("%s -g -Xlint -Xlint:-options " +
                     per_project_flags +
-                    " -target 1.5 -source 1.5 -classpath "
+                    " -target 1.8 -source 1.8 -classpath "
                     " %s -d %s "
                     " -sourcepath %s $(InputPath)") \
                    % tuple(map(self.quote, (javac_exe, classes,

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1831895&r1=1831894&r2=1831895&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sat May 19 14:48:35 2018
@@ -1306,7 +1306,7 @@ fi
 AC_PATH_PROGS(PYTHON, "$PYTHON", none)
 
 # The minimum version for the JVM runtime for our Java bytecode.
-JAVA_OLDEST_WORKING_VER='1.6'
+JAVA_OLDEST_WORKING_VER='1.8'
 # SVN_CHECK_JDK sets $JAVA_CLASSPATH
 SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
 

Modified: subversion/trunk/subversion/bindings/javahl/README
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/README?rev=1831895&r1=1831894&r2=1831895&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/README (original)
+++ subversion/trunk/subversion/bindings/javahl/README Sat May 19 14:48:35 2018
@@ -5,7 +5,7 @@ JavaHL provides a (mostly native, using
 a high level Java API for Subversion, which was originally targeted for
 implementors of GUI clients and IDE plug-ins for Subversion.  JavaHL
 currently provides a minimal-but-complete set of APIs which expose the
-core Subversion C API to Java.  It requires a JRE 1.6+ (runtime).
+core Subversion C API to Java.  It requires a JRE 1.8+ (runtime).
 
 It is currently quite mature, and can be considered for production use.
 
@@ -14,7 +14,7 @@ Build system
 ------------
 
 JavaHL should compile and run under Linux, Win32, and Mac OS X with
-JDK 1.6+ and a C++ compiler with a complete implementation of
+JDK 1.8+ and a C++ compiler with a complete implementation of
 C++98 (for example, GCC 3.2 and older cannot compile JavaHL 1.9+).
 
 Its build will produce both a native library (libsvnjavahl-1.so on Unix



Re: svn commit: r1831895 - in /subversion/trunk: build/ac-macros/java.m4 build/generator/gen_win.py configure.ac subversion/bindings/javahl/README

Posted by Johan Corveleyn <jc...@gmail.com>.
On Thu, Sep 27, 2018 at 10:58 AM Julian Foad <ju...@apache.org> wrote:
>
> James McCoy wrote:
> > Index: docs/release-notes/1.11.html
> [...]
> > +<p>The JavaHL bindings have been updated to be compatible with Java 10.  Due
> > +to required build changes, JavaHL now requires at least Java 8 to compile.</p>
> [...]
>
> +1. Please commit it.

Yes, excellent. Thanks.

-- 
Johan

Re: svn commit: r1831895 - in /subversion/trunk: build/ac-macros/java.m4 build/generator/gen_win.py configure.ac subversion/bindings/javahl/README

Posted by Julian Foad <ju...@apache.org>.
James McCoy wrote:
> Index: docs/release-notes/1.11.html
[...]
> +<p>The JavaHL bindings have been updated to be compatible with Java 10.  Due
> +to required build changes, JavaHL now requires at least Java 8 to compile.</p>
[...]

+1. Please commit it.

-- 
- Julian

Re: svn commit: r1831895 - in /subversion/trunk: build/ac-macros/java.m4 build/generator/gen_win.py configure.ac subversion/bindings/javahl/README

Posted by James McCoy <ja...@jamessan.com>.
On Tue, Sep 25, 2018 at 10:04:18AM +0200, Johan Corveleyn wrote:
> On Sat, May 19, 2018 at 4:48 PM <ja...@apache.org> wrote:
> >
> > Author: jamessan
> > Date: Sat May 19 14:48:35 2018
> > New Revision: 1831895
> >
> > URL: http://svn.apache.org/viewvc?rev=1831895&view=rev
> > Log:
> > Bump minimum JDK version required for JavaHL to 1.8, in preparation for the
> > changes needed to support Java 10
> 
> I think this should be mentioned in the 1.11 release notes (and the
> possibility to build javahl with JDK 10 as well). Now it's only
> mentioned in CHANGES, but I think it deserves a bit more visibility

Something like this?

Index: docs/release-notes/1.11.html
===================================================================
--- docs/release-notes/1.11.html	(revision 1842065)
+++ docs/release-notes/1.11.html	(working copy)
@@ -485,6 +485,26 @@
 
 </div> <!-- client-server-improvements -->
 
+<div class="h3" id="apis">
+<h3>API changes, improvements and language bindings
+    (<em>client and server</em>)
+  <a class="sectionlink" href="#apis"
+    title="Link to this section">&para;</a>
+</h3>
+
+<div class="h4" id="javahl">
+<h4>JavaHL Updates
+  <a class="sectionlink" href="#javahl"
+    title="Link to this section">&para;</a>
+</h4>
+
+<p>The JavaHL bindings have been updated to be compatible with Java 10.  Due
+to required build changes, JavaHL now requires at least Java 8 to compile.</p>
+
+</div>  <!-- javahl -->
+
+</div>  <!-- apis -->
+
 </div>  <!-- enhancements -->
 
 <div class="h2" id="issues">

-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB

Re: svn commit: r1831895 - in /subversion/trunk: build/ac-macros/java.m4 build/generator/gen_win.py configure.ac subversion/bindings/javahl/README

Posted by Johan Corveleyn <jc...@gmail.com>.
On Sat, May 19, 2018 at 4:48 PM <ja...@apache.org> wrote:
>
> Author: jamessan
> Date: Sat May 19 14:48:35 2018
> New Revision: 1831895
>
> URL: http://svn.apache.org/viewvc?rev=1831895&view=rev
> Log:
> Bump minimum JDK version required for JavaHL to 1.8, in preparation for the
> changes needed to support Java 10

I think this should be mentioned in the 1.11 release notes (and the
possibility to build javahl with JDK 10 as well). Now it's only
mentioned in CHANGES, but I think it deserves a bit more visibility
...

    * Bump minimum JDK version required for JavaHL to 1.8 (r1831895)
    * Enable building against Java 10 (r1841180 et al)

-- 
Johan