julianf...@apache.org wrote on Mon, 11 Dec 2017 21:18 +0000:
> Increment the trunk version number, and introduce a new CHANGES
> section for the upcoming 1.10.0 release.
> +++
> subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
> Mon Dec 11 21:18:29 2017
> @@ -143,7 +143,7 @@ public class NativeResources
> {
> initNativeLibrary();
> version = new Version();
> - if (!version.isAtLeast(1, 10, 0))
> + if (!version.isAtLeast(1, 11, 0))
> {
> throw new LinkageError("Native library version must be at least
> " +
> "1.10.0, but is only " + version);
The error message should be updated too.
I don't have a javahl build env; does the following compile?
Index:
subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
===================================================================
---
subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
(revision 1817844)
+++
subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
(working copy)
@@ -141,12 +141,15 @@
*/
private static final void init()
{
+ final int SVN_VER_MAJOR = 1;
+ final int SVN_VER_MINOR = 11;
initNativeLibrary();
version = new Version();
- if (!version.isAtLeast(1, 11, 0))
+ if (!version.isAtLeast(SVN_VER_MAJOR, SVN_VER_MINOR, 0))
{
throw new LinkageError("Native library version must be at least " +
- "1.10.0, but is only " + version);
+ SVN_VER_MAJOR + "." + SVN_VER_MINOR + ".0,"
+
+ "but is only " + version);
}
runtimeVersion = new RuntimeVersion();
