Update to SVNkit 1.8.0

.gitattributes

@@ -10,6 +10,7 @@ svnkit-cli/src/main/scripts/jsvn eol=lf
 svnkit-distribution/src/main/licenses/LICENSE-ANTLR.txt eol=lf
 svnkit-distribution/src/main/licenses/LICENSE-JAVAHL.txt eol=lf
 svnkit-distribution/src/main/licenses/LICENSE-JNA.txt eol=lf
+svnkit-distribution/src/main/licenses/LICENSE-JSCH.txt eol=lf
 svnkit-distribution/src/main/licenses/LICENSE-SEQUENCE.txt eol=lf
 svnkit-distribution/src/main/licenses/LICENSE-SQLJET.txt eol=lf
 svnkit-distribution/src/main/licenses/LICENSE-TRILEAD.txt eol=lf

CHANGES.txt

@@ -1,4 +1,14 @@
-== version 1.7.9 ==
+== version 1.8.0 ==
+
++ Subversion 1.8.0 working copy and repositories format support. 
+
+== version 1.7.11 ==
+
++ Eclipse update site issues fixed.
++ Minor performance improvements.
++ Minor stability improvements and bugfixes. 
+
+== version 1.7.10 ==
 
 + SSH agent support added via JSCH library.
 + Minor stability improvements and bugfixes. 

LICENSE.txt

@@ -6,7 +6,7 @@ are not externally-maintained libraries (e.g. Trilead SSH library).
 All the source code and compiled classes in package org.tigris.subversion.javahl
 except SvnClient class are covered by the license in JAVAHL-LICENSE file
 
-Copyright (c) 2004-2012 TMate Software. All rights reserved.
+Copyright (c) 2004-2013 TMate Software. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 
 are permitted provided that the following conditions are met:

README.txt

@@ -26,10 +26,9 @@ SVNKit allows to work with Subversion repositories and Subversion working copies
 direct repository access as well as support for all high level Subversion operation that are 
 available with the command line Subversion client. 
 
-This version of SVNKit supports all major Subversion 1.7.6 features.
+This version of SVNKit supports all major Subversion 1.8 features.
 
-This version of SVNKit supports both new (1.7, sqlite db) and old (1.6 and older) working copy formats 
-as well as all versions of Subversion repositories since 1.0.
+This version of SVNKit supports 1.8 and 1.6 working copy formats; 1.7 working copies need to be upgraded to 1.8 format.
 
 4. RESOURCES
 

build.gradle

@@ -1,10 +1,10 @@
 group = 'org.tmatesoft.svnkit'
-version = '1.7.10-jenkins-1'
+version = '1.8.0-jenkins-1'
 
 project.ext {
    release = true
    target = '1.5'
-   compatibleSvnVersion = '1.7.9'
+   compatibleSvnVersion = '1.8.1'
 }
 
 apply from: 'build.pom.gradle'
@@ -89,7 +89,7 @@ configure(javaProjects()) {
 project(':svnkit') {
     dependencies {
         compile 'de.regnis.q.sequence:sequence-library:1.0.2'
-        compile 'org.tmatesoft.sqljet:sqljet:1.1.7'
+        compile 'org.tmatesoft.sqljet:sqljet:1.1.9'
         compile 'net.java.dev.jna:jna:3.4.0'
         compile 'com.trilead:trilead-ssh2:1.0.0-build217'
         compile 'com.jcraft:jsch.agentproxy.connector-factory:0.0.6'
@@ -103,9 +103,8 @@ project(':svnkit') {
 project(':svnkit-javahl16') {
     dependencies {
         compile project(path: ':svnkit')
-        compile 'org.apache.subversion:svn-javahl-api:1.7.9'
-
-        testCompile 'org.apache.subversion:svn-javahl-tests:1.7.9'
+        compile 'org.apache.subversion:svn-javahl-api:1.8.1'
+        testCompile 'org.apache.subversion:svn-javahl-tests:1.8.1'
     }
     artifacts { maven jar, sourcesJar, javadocJar }
 }
@@ -160,7 +159,7 @@ project(':svnkit-distribution') {
 
         osgi project(path: ':svnkit-osgi', configuration: 'archives')
         osgi 'com.trilead:trilead-ssh2-osgi:1.0.0-build217'
-        osgi 'org.tmatesoft.sqljet:sqljet-osgi:1.1.7'
+        osgi 'org.tmatesoft.sqljet:sqljet-osgi:1.1.9'
         osgi 'net.java.dev.jna:jna-osgi:3.4.0'
     }
 }
@@ -173,5 +172,4 @@ task publish(dependsOn: [':svnkit-distribution:buildAll']) {
     ant.unzip(src: new File(project(':svnkit-distribution').distsDir, "svnkit-${version}-all.zip"), dest: toDir.absolutePath) {
        cutdirsmapper(dirs: '1')
     }    
-    ant.chmod(dir: new File(toDir, 'bin').absolutePath, perm: 'ugo+rx', includes: '**/**', excludes: '**/*.bat')
-}
+    ant.chmod(dir: new File(toDir, 'bin').absolutePath, perm: 'ugo+rx', includes: '**/**', excludes: '**/*.bat')}

pom.xml

@@ -1,109 +1,159 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.jenkins-ci.svnkit</groupId>
-  <artifactId>svnkit</artifactId>
-  <version>1.7.10-jenkins-1</version>
-  <name>SVNKit</name>
-  <description>A pure Java Subversion library, formerly known as JavaSVN</description>
-  <url>http://svnkit.com/</url>
-  <licenses>
-    <license>
-      <url>http://svnkit.com/license.html</url>
-    </license>
-  </licenses>
-  <distributionManagement>
-    <downloadUrl>http://svnkit.com/download/index.php</downloadUrl>
-    <repository>
-      <id>maven.jenkins-ci.org</id>
-      <url>http://maven.jenkins-ci.org:8081/content/repositories/releases/</url>
-    </repository>
-  </distributionManagement>
-  <properties>
-    <skipTests>true</skipTests><!-- run by Gradle -->
-  </properties>
-  <build>
-    <sourceDirectory>svnkit/src/main/java</sourceDirectory>
-    <testSourceDirectory>svnkit/src/test/java</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>svnkit/src/test/resources</directory>
-      </testResource>
-    </testResources>
-    <resources>
-      <resource>
-        <directory>svnkit/src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <!-- fake out maven and install the binary artifact -->
-      <plugin>
-        <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
-        <artifactId>maven-antrun-extended-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <exec command="./gradlew clean assemble" />
-                <attachArtifact file="./svnkit/build/libs/svnkit-${project.version}.jar"/>
-                <attachArtifact file="./svnkit/build/libs/svnkit-${project.version}-sources.jar" classifier="sources" type="jar"/>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>net.java.dev.jna</groupId>
-      <artifactId>jna</artifactId>
-      <version>3.4.0</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci</groupId>
-      <artifactId>trilead-ssh2</artifactId>
-      <version>build217-jenkins-1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jsch.agentproxy.connector-factory</artifactId>
-      <version>0.0.6</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jsch.agentproxy.svnkit-trilead-ssh2</artifactId>
-      <version>0.0.6</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.tmatesoft.sqljet</groupId>
-      <artifactId>sqljet</artifactId>
-      <version>1.1.7</version>
-    </dependency>
-    <dependency>
-      <groupId>de.regnis.q.sequence</groupId>
-      <artifactId>sequence-library</artifactId>
-      <version>1.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.9</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jenkins-ci.svnkit</groupId>
+    <artifactId>svnkit</artifactId>
+    <version>1.8.0-jenkins-1</version>
+    <name>SVNKit</name>
+    <description>A pure Java Subversion library, formerly known as JavaSVN</description>
+    <url>http://svnkit.com/</url>
+    <licenses>
+        <license>
+            <url>http://svnkit.com/license.html</url>
+        </license>
+    </licenses>
+    <distributionManagement>
+        <downloadUrl>http://svnkit.com/download/index.php</downloadUrl>
+        <repository>
+            <id>maven.jenkins-ci.org</id>
+            <url>http://maven.jenkins-ci.org:8081/content/repositories/releases/</url>
+        </repository>
+    </distributionManagement>
+    <properties>
+        <skipTests>true</skipTests><!-- run by Gradle -->
+    </properties>
+    <build>
+        <sourceDirectory>svnkit/src/main/java</sourceDirectory>
+        <testSourceDirectory>svnkit/src/test/java</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>svnkit/src/test/resources</directory>
+            </testResource>
+        </testResources>
+        <resources>
+            <resource>
+                <directory>svnkit/src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <!-- fake out maven and install the binary artifact -->
+            <plugin>
+                <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
+                <artifactId>maven-antrun-extended-plugin</artifactId>
+                <version>1.43</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <exec command="${gradle.cmd} clean assemble ${gradle.addition}" />
+                                <attachArtifact file="./svnkit/build/libs/svnkit-${project.version}.jar"/>
+                                <attachArtifact file="./svnkit/build/libs/svnkit-${project.version}-sources.jar" classifier="sources" type="jar"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build> 
+    <dependencies>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>3.4.0</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci</groupId>
+            <artifactId>trilead-ssh2</artifactId>
+            <version>build217-jenkins-1</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch.agentproxy.connector-factory</artifactId>
+            <version>0.0.6</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch.agentproxy.svnkit-trilead-ssh2</artifactId>
+            <version>0.0.6</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.tmatesoft.sqljet</groupId>
+            <artifactId>sqljet</artifactId>
+            <version>1.1.9</version>
+        </dependency>
+        <dependency>
+            <groupId>de.regnis.q.sequence</groupId>
+            <artifactId>sequence-library</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.9</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-  <repositories>
-    <repository>
-      <id>repo.jenkins-ci.org</id>
-      <url>http://repo.jenkins-ci.org/public/</url>
-    </repository>
-  </repositories>
+    <repositories>
+        <repository>
+            <id>repo.jenkins-ci.org</id>
+            <url>http://repo.jenkins-ci.org/public/</url>
+        </repository>
+    </repositories>
+
+    <profiles>
+        <profile>
+            <id>non-windows</id>
+            <activation>
+                <os>
+                    <family>!windows</family>
+                </os>
+            </activation>
+            <properties>
+                <gradle.cmd>.\gradlew</gradle.cmd>
+            </properties>
+        </profile>
+        <profile>
+            <id>windows</id>
+            <activation>
+                <os>
+                    <family>windows</family>
+                </os>
+            </activation>
+            <properties>
+                <gradle.cmd>./gradlew.bat</gradle.cmd>
+            </properties>
+        </profile>
+        <profile>
+            <id>svnkit-local</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>local</value>
+                </property>
+            </activation>
+            <properties>
+                <gradle.addition>-x signMaven</gradle.addition>
+            </properties>
+        </profile>
+          <profile>
+            <id>default</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>!local</value>
+                </property>
+            </activation>
+            <properties>
+                <gradle.addition></gradle.addition>
+            </properties>
+        </profile>
+    </profiles>
 </project>

svnkit-cli/src/main/java/org/tmatesoft/svn/cli/AbstractSVNCommandEnvironment.java

@@ -408,7 +408,7 @@ public String getRelativePath(File file) {
         if (commonRoot != null) {
             if (equals(inPath , commonRoot)) {
                 return "";
-            } else if (startsWith(inPath, commonRoot + "/")) {
+            } else if (startsWith(inPath, commonRoot + "/") && !"/".equals(inPath)) {
                 return inPath.substring(commonRoot.length() + 1);
             }
         }

svnkit-cli/src/main/java/org/tmatesoft/svn/cli/svn/SVN.java

@@ -128,6 +128,7 @@ protected void registerOptions() {
         SVNCommandLine.registerOption(SVNOption.SUMMARIZE);
         SVNCommandLine.registerOption(SVNOption.NOTICE_ANCESTRY);
         SVNCommandLine.registerOption(SVNOption.NO_DIFF_DELETED);
+        SVNCommandLine.registerOption(SVNOption.NO_DIFF_ADDED);
         SVNCommandLine.registerOption(SVNOption.STOP_ON_COPY);
         SVNCommandLine.registerOption(SVNOption.LIMIT);
         SVNCommandLine.registerOption(SVNOption.AUTHOR_OF_INTEREST);
@@ -138,6 +139,7 @@ protected void registerOptions() {
         SVNCommandLine.registerOption(SVNOption.PASSWORD);
         SVNCommandLine.registerOption(SVNOption.NO_AUTH_CACHE);
         SVNCommandLine.registerOption(SVNOption.NON_INTERACTIVE);
+        SVNCommandLine.registerOption(SVNOption.FORCE_INTERACTIVE);
         SVNCommandLine.registerOption(SVNOption.WITH_ALL_REVPROPS);
         SVNCommandLine.registerOption(SVNOption.SHOW_REVS);
         SVNCommandLine.registerOption(SVNOption.REINTEGRATE);
@@ -147,7 +149,10 @@ protected void registerOptions() {
         SVNCommandLine.registerOption(SVNOption.CONFIG_OPTION);
 
         SVNCommandLine.registerOption(SVNOption.STRIP);
-
+        SVNCommandLine.registerOption(SVNOption.SHOW_INHERITED_PROPS);
+        SVNCommandLine.registerOption(SVNOption.INCLUDE_EXTERNALS);
+        SVNCommandLine.registerOption(SVNOption.PROPERTIES_ONLY);
+
     }
 
     protected boolean needArgs() {