Skip to content

Commit 96fefdc

Browse files
committed
Upgrading ConnId
1 parent 373c44b commit 96fefdc

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<groupId>net.tirasa.connid</groupId>
3232
<artifactId>connid</artifactId>
33-
<version>1.5.2.0</version>
33+
<version>1.5.3.0-SNAPSHOT</version>
3434
</parent>
3535

3636
<groupId>net.tirasa.connid.bundles.db</groupId>
@@ -82,7 +82,7 @@
8282
</mailingLists>
8383

8484
<properties>
85-
<connid.version>1.5.2.0</connid.version>
85+
<connid.version>1.5.3.0-SNAPSHOT</connid.version>
8686
<commons.version>1.5.2.0</commons.version>
8787
<rootpom.basedir>${basedir}</rootpom.basedir>
8888

@@ -133,9 +133,9 @@
133133
<artifactId>license-maven-plugin</artifactId>
134134
<inherited>true</inherited>
135135
<configuration>
136-
<header>https://raw.githubusercontent.com/Tirasa/ConnId/connid-${connid.version}/java/src/main/resources/header.txt</header>
136+
<header>https://raw.githubusercontent.com/Tirasa/ConnId/connid-1.5.2.1/java/src/main/resources/header.txt</header>
137137
<headerDefinitions>
138-
<headerDefinition>https://raw.githubusercontent.com/Tirasa/ConnId/connid-${connid.version}/java/src/main/resources/java-single-star.xml</headerDefinition>
138+
<headerDefinition>https://raw.githubusercontent.com/Tirasa/ConnId/connid-1.5.2.1/java/src/main/resources/java-single-star.xml</headerDefinition>
139139
</headerDefinitions>
140140
<excludes>
141141
<exclude>README.md</exclude>
@@ -172,7 +172,7 @@
172172
<plugin>
173173
<groupId>org.gaul</groupId>
174174
<artifactId>modernizer-maven-plugin</artifactId>
175-
<version>2.9.0</version>
175+
<version>3.2.0</version>
176176
<configuration>
177177
<javaVersion>${targetJdk}</javaVersion>
178178
</configuration>
@@ -223,8 +223,8 @@
223223

224224
<repositories>
225225
<repository>
226-
<id>sonatype</id>
227-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
226+
<id>central-portal-snapshots</id>
227+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
228228
<releases>
229229
<enabled>false</enabled>
230230
</releases>
@@ -233,5 +233,4 @@
233233
</snapshots>
234234
</repository>
235235
</repositories>
236-
237236
</project>

scriptedsql/src/main/java/net/tirasa/connid/bundles/db/scriptedsql/ScriptedSQLConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ public void validate() {
509509
*/
510510
public String formatUrlTemplate() {
511511
LOG.info("format UrlTemplate");
512-
final StringBuffer b = new StringBuffer();
512+
final StringBuilder b = new StringBuilder();
513513
final String url = getJdbcUrlTemplate();
514514
final int len = url.length();
515515
for (int i = 0; i < len; i++) {

table/src/test/java/net/tirasa/connid/bundles/db/table/DatabaseTableTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
import java.io.File;
3333
import java.math.BigDecimal;
34+
import java.nio.file.Paths;
3435
import java.sql.Connection;
3536
import java.sql.DriverManager;
3637
import java.sql.PreparedStatement;
@@ -91,7 +92,7 @@ public static void createDatabase() throws Exception {
9192
final String url;
9293
if (StringUtil.isNotBlank(DRIVER) && DRIVER.contains("derby")) {
9394
if (StringUtil.isNotBlank(DB)) {
94-
final File f = new File(DB);
95+
final File f = Paths.get(DB).toFile();
9596
// clear out the test database directory..
9697
IOUtil.delete(f);
9798
}
@@ -129,7 +130,7 @@ public static void deleteDatabase() {
129130
if (StringUtil.isNotBlank(DRIVER) && DRIVER.contains("derby")) {
130131
DriverManager.getConnection(URL + ";shutdown=true");
131132
if (StringUtil.isNotBlank(DB)) {
132-
final File f = new File(DB);
133+
final File f = Paths.get(DB).toFile();
133134
// clear out the test database directory..
134135
IOUtil.delete(f);
135136
}

0 commit comments

Comments
 (0)