Skip to content

Commit 46a8fce

Browse files
markphipmarkphip
committed
Update to Subversion 1.9.x
1 parent 300d817 commit 46a8fce

File tree

7 files changed

+13
-50
lines changed

7 files changed

+13
-50
lines changed

‎base/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.tigris.svnclientadapter</groupId>
1111
<artifactId>multi</artifactId>
12-
<version>1.8.16</version>
12+
<version>1.9.4</version>
1313
</parent>
1414

1515
<licenses>

‎cmdline/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.tigris.svnclientadapter</groupId>
1111
<artifactId>multi</artifactId>
12-
<version>1.8.16</version>
12+
<version>1.9.4</version>
1313
</parent>
1414

1515
<licenses>
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.tigris.svnclientadapter</groupId>
2525
<artifactId>adapter-base</artifactId>
26-
<version>1.8.16</version>
26+
<version>1.9.4</version>
2727
</dependency>
2828
</dependencies>
2929

‎javahl/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.tigris.svnclientadapter</groupId>
1111
<artifactId>multi</artifactId>
12-
<version>1.8.16</version>
12+
<version>1.9.4</version>
1313
</parent>
1414

1515
<licenses>
@@ -31,12 +31,12 @@
3131
<dependency>
3232
<groupId>org.tigris.svnclientadapter</groupId>
3333
<artifactId>adapter-base</artifactId>
34-
<version>1.8.16</version>
34+
<version>1.9.4</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.apache.subversion</groupId>
3838
<artifactId>javahl</artifactId>
39-
<version>1.8.16</version>
39+
<version>1.9.4</version>
4040
</dependency>
4141
</dependencies>
4242

‎javahl/src/main/java/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapterFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,15 @@ public static boolean isAvailable() {
182182
try {
183183
ISVNClient svnClient = new SVNClient();
184184
Version version = svnClient.getVersion();
185-
if (version.getMajor() == 1 && version.getMinor() == 8)
185+
if (version.getMajor() == 1 && version.getMinor() == 9)
186186
available = true;
187187
else {
188188
available = false;
189-
javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded. Subversion 1.8.x required.");
189+
javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded. Subversion 1.9.x required.");
190190
}
191191
} catch (UnsatisfiedLinkError e) {
192192
available = false;
193-
javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded. 1.8.x or later required.");
193+
javaHLErrors = new StringBuffer("Incompatible JavaHL library loaded. 1.9.x or later required.");
194194
}
195195
}
196196
}

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.tigris.svnclientadapter</groupId>
55
<artifactId>multi</artifactId>
6-
<version>1.8.16</version>
6+
<version>1.9.4</version>
77
<name>svnClientAdapter</name>
88
<url>https://github.com/subclipse/svnclientadapter</url>
99
<packaging>pom</packaging>

‎settings.xml

-28
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,4 @@
88
<password>${env.BINTRAY_PASSWORD}</password>
99
</server>
1010
</servers>
11-
<profiles>
12-
<profile>
13-
<repositories>
14-
<repository>
15-
<snapshots>
16-
<enabled>false</enabled>
17-
</snapshots>
18-
<id>bintray-subclipse-maven</id>
19-
<name>bintray</name>
20-
<url>http://dl.bintray.com/subclipse/maven</url>
21-
</repository>
22-
</repositories>
23-
<pluginRepositories>
24-
<pluginRepository>
25-
<snapshots>
26-
<enabled>false</enabled>
27-
</snapshots>
28-
<id>bintray-subclipse-maven</id>
29-
<name>bintray-plugins</name>
30-
<url>http://dl.bintray.com/subclipse/maven</url>
31-
</pluginRepository>
32-
</pluginRepositories>
33-
<id>bintray</id>
34-
</profile>
35-
</profiles>
36-
<activeProfiles>
37-
<activeProfile>bintray</activeProfile>
38-
</activeProfiles>
3911
</settings>

‎svnkit/pom.xml

+3-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.tigris.svnclientadapter</groupId>
1010
<artifactId>multi</artifactId>
11-
<version>1.8.16</version>
11+
<version>1.9.4</version>
1212
</parent>
1313

1414
<licenses>
@@ -17,26 +17,17 @@
1717
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
1818
</license>
1919
</licenses>
20-
21-
<repositories>
22-
<repository>
23-
<id>tmatesoft-svnkit</id>
24-
<name>tmatesoft</name>
25-
<url>http://maven.tmatesoft.com/content/repositories/releases/</url>
26-
</repository>
27-
</repositories>
28-
2920

3021
<dependencies>
3122
<dependency>
3223
<groupId>org.tigris.svnclientadapter</groupId>
3324
<artifactId>adapter-base</artifactId>
34-
<version>1.8.16</version>
25+
<version>1.9.4</version>
3526
</dependency>
3627
<dependency>
3728
<groupId>org.tigris.svnclientadapter</groupId>
3829
<artifactId>adapter-javahl</artifactId>
39-
<version>1.8.16</version>
30+
<version>1.9.4</version>
4031
</dependency>
4132
<dependency>
4233
<groupId>org.tmatesoft.svnkit</groupId>

0 commit comments

Comments
 (0)