Skip to content

Commit 2b667a4

Browse files
sualehsualeh
committed
v17.1.2
1 parent d6544ac commit 2b667a4

File tree

26 files changed

+138
-132
lines changed

26 files changed

+138
-132
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.fatehi</groupId>
88
<artifactId>schemacrawler-database-plugins-parent</artifactId>
9-
<version>17.1.1</version>
9+
<version>17.1.2</version>
1010
<relativePath>./schemacrawler-database-plugins-parent/pom.xml</relativePath>
1111
</parent>
1212
<artifactId>schemacrawler-database-plugins-aggregator</artifactId>

‎schemacrawler-access/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>us.fatehi</groupId>
77
<artifactId>schemacrawler-database-plugins-parent</artifactId>
8-
<version>17.1.1</version>
8+
<version>17.1.2</version>
99
<relativePath>../schemacrawler-database-plugins-parent/pom.xml</relativePath>
1010
</parent>
1111
<artifactId>schemacrawler-access</artifactId>

‎schemacrawler-access/src/main/java/schemacrawler/server/access/AccessDatabaseConnector.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.logging.Level;
1212
import java.util.logging.Logger;
1313
import java.util.regex.Pattern;
14+
1415
import schemacrawler.tools.databaseconnector.DatabaseConnector;
1516
import schemacrawler.tools.executable.commandline.PluginCommand;
1617
import us.fatehi.utility.datasource.DatabaseConnectionSourceBuilder;

‎schemacrawler-access/src/test/java/schemacrawler/integration/test/AccessTest.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010

1111
import static org.hamcrest.MatcherAssert.assertThat;
1212
import static schemacrawler.test.utility.ExecutableTestUtility.executableExecution;
13-
import static schemacrawler.test.utility.FileHasContent.classpathResource;
14-
import static schemacrawler.test.utility.FileHasContent.hasSameContentAs;
15-
import static schemacrawler.test.utility.FileHasContent.outputOf;
16-
import static schemacrawler.test.utility.TestUtility.copyResourceToTempFile;
17-
import static schemacrawler.test.utility.TestUtility.failTestSetup;
13+
import static us.fatehi.test.utility.TestUtility.copyResourceToTempFile;
14+
import static us.fatehi.test.utility.extensions.FileHasContent.classpathResource;
15+
import static us.fatehi.test.utility.extensions.FileHasContent.hasSameContentAs;
16+
import static us.fatehi.test.utility.extensions.FileHasContent.outputOf;
1817

19-
import java.io.IOException;
2018
import java.nio.file.Path;
2119
import java.util.regex.Pattern;
20+
2221
import org.junit.jupiter.api.BeforeEach;
2322
import org.junit.jupiter.api.Test;
2423
import org.junit.jupiter.api.TestInstance;
2524
import org.junit.jupiter.api.TestInstance.Lifecycle;
25+
2626
import schemacrawler.schemacrawler.InfoLevel;
2727
import schemacrawler.schemacrawler.LimitOptionsBuilder;
2828
import schemacrawler.schemacrawler.LoadOptionsBuilder;
@@ -37,16 +37,11 @@
3737
public class AccessTest extends BaseAdditionalDatabaseTest {
3838

3939
@BeforeEach
40-
public void createDatabase() {
41-
try {
42-
40+
public void createDatabase() throws Exception {
4341
Class.forName("net.ucanaccess.jdbc.UcanaccessDriver");
4442
final Path databaseFile = copyResourceToTempFile("/Books2010.accdb");
4543
createDataSource(
4644
"jdbc:ucanaccess://" + databaseFile + ";showSchema=true;sysSchema=true", null, null);
47-
} catch (final ClassNotFoundException | IOException e) {
48-
failTestSetup("Could not create database", e);
49-
}
5045
}
5146

5247
@Test

‎schemacrawler-access/src/test/java/schemacrawler/integration/test/CommandLineHelpTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
package schemacrawler.integration.test;
1010

1111
import static org.hamcrest.MatcherAssert.assertThat;
12-
import static schemacrawler.test.utility.FileHasContent.classpathResource;
13-
import static schemacrawler.test.utility.FileHasContent.hasNoContent;
14-
import static schemacrawler.test.utility.FileHasContent.hasSameContentAs;
15-
import static schemacrawler.test.utility.FileHasContent.outputOf;
12+
import static us.fatehi.test.utility.extensions.FileHasContent.classpathResource;
13+
import static us.fatehi.test.utility.extensions.FileHasContent.hasNoContent;
14+
import static us.fatehi.test.utility.extensions.FileHasContent.hasSameContentAs;
15+
import static us.fatehi.test.utility.extensions.FileHasContent.outputOf;
16+
1617
import org.junit.jupiter.api.Test;
1718
import schemacrawler.Main;
18-
import schemacrawler.test.utility.CaptureSystemStreams;
19-
import schemacrawler.test.utility.CapturedSystemStreams;
20-
import schemacrawler.test.utility.ResolveTestContext;
21-
import schemacrawler.test.utility.TestContext;
19+
import us.fatehi.test.utility.extensions.CaptureSystemStreams;
20+
import us.fatehi.test.utility.extensions.CapturedSystemStreams;
21+
import us.fatehi.test.utility.extensions.ResolveTestContext;
22+
import us.fatehi.test.utility.extensions.TestContext;
2223

2324
@ResolveTestContext
2425
@CaptureSystemStreams

‎schemacrawler-cassandra/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>us.fatehi</groupId>
77
<artifactId>schemacrawler-database-plugins-parent</artifactId>
8-
<version>17.1.1</version>
8+
<version>17.1.2</version>
99
<relativePath>../schemacrawler-database-plugins-parent/pom.xml</relativePath>
1010
</parent>
1111
<artifactId>schemacrawler-cassandra</artifactId>
@@ -32,7 +32,7 @@
3232

3333
<dependency>
3434
<groupId>org.testcontainers</groupId>
35-
<artifactId>cassandra</artifactId>
35+
<artifactId>testcontainers-cassandra</artifactId>
3636
<scope>test</scope>
3737
</dependency>
3838

‎schemacrawler-cassandra/src/test/java/schemacrawler/integration/test/CassandraTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,34 @@
1010

1111
import static org.hamcrest.MatcherAssert.assertThat;
1212
import static org.junit.jupiter.api.Assertions.fail;
13-
import static schemacrawler.integration.test.utility.CassandraTestUtility.newCassandraContainer;
1413
import static schemacrawler.test.utility.ExecutableTestUtility.executableExecution;
15-
import static schemacrawler.test.utility.FileHasContent.classpathResource;
16-
import static schemacrawler.test.utility.FileHasContent.hasSameContentAs;
17-
import static schemacrawler.test.utility.FileHasContent.outputOf;
14+
import static us.fatehi.test.integration.utility.CassandraTestUtility.newCassandraContainer;
15+
import static us.fatehi.test.utility.extensions.FileHasContent.classpathResource;
16+
import static us.fatehi.test.utility.extensions.FileHasContent.hasSameContentAs;
17+
import static us.fatehi.test.utility.extensions.FileHasContent.outputOf;
1818

1919
import java.net.InetSocketAddress;
2020
import java.util.regex.Pattern;
21+
2122
import org.junit.jupiter.api.BeforeEach;
2223
import org.junit.jupiter.api.Test;
2324
import org.junit.jupiter.api.TestInstance;
2425
import org.junit.jupiter.api.TestInstance.Lifecycle;
2526
import org.testcontainers.cassandra.CassandraContainer;
2627
import org.testcontainers.junit.jupiter.Container;
2728
import org.testcontainers.junit.jupiter.Testcontainers;
29+
2830
import schemacrawler.schemacrawler.InfoLevel;
2931
import schemacrawler.schemacrawler.LimitOptionsBuilder;
3032
import schemacrawler.schemacrawler.LoadOptionsBuilder;
3133
import schemacrawler.schemacrawler.SchemaCrawlerOptions;
3234
import schemacrawler.schemacrawler.SchemaCrawlerOptionsBuilder;
3335
import schemacrawler.schemacrawler.SchemaInfoLevelBuilder;
3436
import schemacrawler.test.utility.BaseAdditionalDatabaseTest;
35-
import schemacrawler.test.utility.HeavyDatabaseTest;
3637
import schemacrawler.tools.command.text.schema.options.SchemaTextOptions;
3738
import schemacrawler.tools.command.text.schema.options.SchemaTextOptionsBuilder;
3839
import schemacrawler.tools.executable.SchemaCrawlerExecutable;
40+
import us.fatehi.test.utility.extensions.HeavyDatabaseTest;
3941

4042
@HeavyDatabaseTest("cassandra")
4143
@TestInstance(Lifecycle.PER_CLASS)

‎schemacrawler-cassandra/src/test/java/schemacrawler/integration/test/CommandLineHelpTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
package schemacrawler.integration.test;
1010

1111
import static org.hamcrest.MatcherAssert.assertThat;
12-
import static schemacrawler.test.utility.FileHasContent.classpathResource;
13-
import static schemacrawler.test.utility.FileHasContent.hasNoContent;
14-
import static schemacrawler.test.utility.FileHasContent.hasSameContentAs;
15-
import static schemacrawler.test.utility.FileHasContent.outputOf;
12+
import static us.fatehi.test.utility.extensions.FileHasContent.classpathResource;
13+
import static us.fatehi.test.utility.extensions.FileHasContent.hasNoContent;
14+
import static us.fatehi.test.utility.extensions.FileHasContent.hasSameContentAs;
15+
import static us.fatehi.test.utility.extensions.FileHasContent.outputOf;
16+
1617
import org.junit.jupiter.api.Test;
1718

1819
import schemacrawler.Main;
19-
import schemacrawler.test.utility.CaptureSystemStreams;
20-
import schemacrawler.test.utility.CapturedSystemStreams;
21-
import schemacrawler.test.utility.ResolveTestContext;
22-
import schemacrawler.test.utility.TestContext;
20+
import us.fatehi.test.utility.extensions.CaptureSystemStreams;
21+
import us.fatehi.test.utility.extensions.CapturedSystemStreams;
22+
import us.fatehi.test.utility.extensions.ResolveTestContext;
23+
import us.fatehi.test.utility.extensions.TestContext;
2324

2425
@ResolveTestContext
2526
@CaptureSystemStreams

‎schemacrawler-database-plugins-distrib/pom.xml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.fatehi</groupId>
88
<artifactId>schemacrawler-parent</artifactId>
9-
<version>17.1.1</version>
9+
<version>17.1.2</version>
1010
</parent>
1111
<artifactId>schemacrawler-database-plugins-distrib</artifactId>
1212
<packaging>pom</packaging>
@@ -56,15 +56,6 @@
5656
</dependency>
5757
</dependencies>
5858
<build>
59-
<pluginManagement>
60-
<plugins>
61-
<plugin>
62-
<groupId>org.codehaus.mojo</groupId>
63-
<artifactId>license-maven-plugin</artifactId>
64-
<version>2.7.0</version>
65-
</plugin>
66-
</plugins>
67-
</pluginManagement>
6859
<plugins>
6960
<plugin>
7061
<groupId>org.apache.maven.plugins</groupId>
@@ -101,7 +92,7 @@
10192
<configuration>
10293
<licensesOutputDirectory>${project.build.directory}/_licenses</licensesOutputDirectory>
10394
<licensesOutputFile>
104-
${project.build.directory}/_licenses/licenses..xml</licensesOutputFile>
95+
${project.build.directory}/_licenses/licenses.xml</licensesOutputFile>
10596
<excludedScopes>test,provided</excludedScopes>
10697
<cleanLicensesOutputDirectory>true</cleanLicensesOutputDirectory>
10798
</configuration>

‎schemacrawler-database-plugins-parent/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.fatehi</groupId>
88
<artifactId>schemacrawler-parent</artifactId>
9-
<version>17.1.1</version>
9+
<version>17.1.2</version>
1010
</parent>
1111
<artifactId>schemacrawler-database-plugins-parent</artifactId>
1212
<packaging>pom</packaging>
@@ -38,6 +38,12 @@
3838
<version>${project.version}</version>
3939
<scope>test</scope>
4040
</dependency>
41+
<dependency>
42+
<groupId>us.fatehi</groupId>
43+
<artifactId>schemacrawler-test-utility</artifactId>
44+
<version>${project.version}</version>
45+
<scope>test</scope>
46+
</dependency>
4147
<dependency>
4248
<groupId>us.fatehi</groupId>
4349
<artifactId>schemacrawler-api</artifactId>
@@ -59,12 +65,6 @@
5965
<scope>test</scope>
6066
</dependency>
6167

62-
<dependency>
63-
<groupId>org.testcontainers</groupId>
64-
<artifactId>cassandra</artifactId>
65-
<scope>test</scope>
66-
</dependency>
67-
6868
</dependencies>
6969
<build>
7070
<plugins>

0 commit comments

Comments
 (0)