Skip to content

Commit

Permalink
Back to ConnId 1.6.0.0-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
ilgrosso committed Dec 30, 2024
1 parent 597d6d6 commit 2f1cf6b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 25 deletions.
22 changes: 2 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>net.tirasa.connid</groupId>
<artifactId>connid</artifactId>
<version>1.6.0.0-RC3</version>
<version>1.6.0.0-SNAPSHOT</version>
</parent>

<groupId>net.tirasa.connid.bundles.db</groupId>
Expand Down Expand Up @@ -82,7 +82,7 @@
</mailingLists>

<properties>
<connid.version>1.6.0.0-RC3</connid.version>
<connid.version>1.6.0.0-SNAPSHOT</connid.version>
<rootpom.basedir>${basedir}</rootpom.basedir>

<targetJdk>21</targetJdk>
Expand Down Expand Up @@ -201,24 +201,6 @@
</executions>
</plugin>

<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<version>2.9.0</version>
<configuration>
<javaVersion>${targetJdk}</javaVersion>
</configuration>
<executions>
<execution>
<id>modernizer-check</id>
<phase>verify</phase>
<goals>
<goal>modernizer</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Put NOTICE and LICENSE files in all artifacts and javadocs -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.File;
import java.math.BigDecimal;
import java.nio.file.Path;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
Expand Down Expand Up @@ -91,9 +91,8 @@ public static void createDatabase() throws Exception {
final String url;
if (StringUtil.isNotBlank(DRIVER) && DRIVER.contains("derby")) {
if (StringUtil.isNotBlank(DB)) {
final File f = new File(DB);
// clear out the test database directory..
IOUtil.delete(f);
IOUtil.delete(Path.of(DB).toFile());
}
url = URL + ";create=true";
} else {
Expand Down Expand Up @@ -129,9 +128,8 @@ public static void deleteDatabase() {
if (StringUtil.isNotBlank(DRIVER) && DRIVER.contains("derby")) {
DriverManager.getConnection(URL + ";shutdown=true");
if (StringUtil.isNotBlank(DB)) {
final File f = new File(DB);
// clear out the test database directory..
IOUtil.delete(f);
IOUtil.delete(Path.of(DB).toFile());
}
}
} catch (Exception ex) {
Expand Down

0 comments on commit 2f1cf6b

Please sign in to comment.