You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/22 06:02:19 UTC
svn commit: r1485055 - in /subversion/branches/1.8.x: ./ STATUS
subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
Author: svn-role
Date: Wed May 22 04:02:19 2013
New Revision: 1485055
URL: http://svn.apache.org/r1485055
Log:
Merge the 1.8.x-libsvnjavahl-version branch:
* r1483913
Fix hard-coded version in JavaHL's JNI loader.
Justification:
We don't want to try to use the 1.7 libraries.
Branch: ^/subversion/branches/1.8.x-libsvnjavahl-version
Votes:
+1: philip, rhuijben, breser
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.8.x-libsvnjavahl-version:r1483910-1485054
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1485055&r1=1485054&r2=1485055&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 22 04:02:19 2013
@@ -143,11 +143,3 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1483913
- Fix hard-coded version in JavaHL's JNI loader.
- Justification:
- We don't want to try to use the 1.7 libraries.
- Branch: ^/subversion/branches/1.8.x-libsvnjavahl-version
- Votes:
- +1: philip, rhuijben, breser
-
Modified: subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java?rev=1485055&r1=1485054&r2=1485055&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java (original)
+++ subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java Wed May 22 04:02:19 2013
@@ -131,10 +131,10 @@ public class NativeResources
{
initNativeLibrary();
version = new Version();
- if (!version.isAtLeast(1, 7, 0))
+ if (!version.isAtLeast(1, 8, 0))
{
throw new LinkageError("Native library version must be at least " +
- "1.7.0, but is only " + version);
+ "1.8.0, but is only " + version);
}
}