Skip to content

Commit 7a1dba5

Browse files
author
Jacek Gębal
committed
Removed explicit OJDBC dependency.
The OJDBC is now brought with utPLSQL-java-api. Updated project version. Updated library dependencies. Update default values for local testing.
1 parent 7128cf0 commit 7a1dba5

4 files changed

Lines changed: 48 additions & 39 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
ORACLE_PASSWORD: oracle
4040
DB_URL: "//localhost:1521/FREEPDB1"
4141
DB_USER: APP
42-
DB_PASS: APP
42+
DB_PASS: pass
4343
ports:
4444
- 1521:1521
4545
options: >-

pom.xml

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.utplsql</groupId>
66
<artifactId>cli</artifactId>
7-
<version>3.1.10-SNAPSHOT</version>
7+
<version>3.2.01-SNAPSHOT</version>
88

99
<name>utPLSQL CLI</name>
1010
<description>CLI for running Unit Tests with utPLSQL v3+.</description>
@@ -14,11 +14,13 @@
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<maven.compiler.release>11</maven.compiler.release>
1616
<junit.jupiter.version>5.12.2</junit.jupiter.version>
17-
<oracle.jdbc.version>21.18.0.0</oracle.jdbc.version>
1817
<picocli.version>4.7.7</picocli.version>
19-
<logback.version>1.2.11</logback.version>
18+
<logback.version>1.5.18</logback.version>
2019
<hamcrest.version>2.2</hamcrest.version>
2120
<travisBuildNumber>local</travisBuildNumber>
21+
22+
<sonar.organization>utplsql</sonar.organization>
23+
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
2224
</properties>
2325

2426
<licenses>
@@ -29,25 +31,44 @@
2931
</license>
3032
</licenses>
3133

34+
<issueManagement>
35+
<system>GitHub Issues</system>
36+
<url>https://github.com/utPLSQL/utPLSQL-java-api/issues</url>
37+
</issueManagement>
38+
39+
<developers>
40+
<developer>
41+
<name>Vinicius Avellar Moreira</name>
42+
<organization>utPLSQL.org</organization>
43+
<organizationUrl>https://utplsql.org</organizationUrl>
44+
<email>[email protected]</email>
45+
</developer>
46+
<developer>
47+
<name>Samuel Nitsche</name>
48+
<organization>utPLSQL.org</organization>
49+
<organizationUrl>https://utplsql.org</organizationUrl>
50+
<email>[email protected]</email>
51+
</developer>
52+
<developer>
53+
<name>Jacek Gebal</name>
54+
<organization>utPLSQL.org</organization>
55+
<organizationUrl>https://utplsql.org</organizationUrl>
56+
<email>[email protected]</email>
57+
</developer>
58+
<developer>
59+
<name>Simon Martinelli</name>
60+
<organization>utPLSQL.org</organization>
61+
<organizationUrl>https://utplsql.org</organizationUrl>
62+
<email>[email protected]</email>
63+
<url>https://martinelli.ch</url>
64+
</developer>
65+
</developers>
66+
3267
<dependencies>
3368
<dependency>
3469
<groupId>org.utplsql</groupId>
3570
<artifactId>utplsql-java-api</artifactId>
3671
<version>3.2.2</version>
37-
<exclusions>
38-
<exclusion>
39-
<groupId>com.oracle.ojdbc</groupId>
40-
<artifactId>ucp</artifactId>
41-
</exclusion>
42-
<exclusion>
43-
<groupId>com.oracle.ojdbc</groupId>
44-
<artifactId>ojdbc8</artifactId>
45-
</exclusion>
46-
<exclusion>
47-
<groupId>com.oracle.ojdbc</groupId>
48-
<artifactId>orai18n</artifactId>
49-
</exclusion>
50-
</exclusions>
5172
</dependency>
5273
<dependency>
5374
<groupId>javax.xml.bind</groupId>
@@ -64,23 +85,6 @@
6485
<artifactId>picocli</artifactId>
6586
<version>${picocli.version}</version>
6687
</dependency>
67-
<dependency>
68-
<groupId>com.oracle.database.jdbc</groupId>
69-
<artifactId>ojdbc11</artifactId>
70-
<version>${oracle.jdbc.version}</version>
71-
<exclusions>
72-
<exclusion>
73-
<groupId>com.oracle.database.jdbc</groupId>
74-
<artifactId>ucp</artifactId>
75-
</exclusion>
76-
</exclusions>
77-
</dependency>
78-
<dependency>
79-
<groupId>com.oracle.database.nls</groupId>
80-
<artifactId>orai18n</artifactId>
81-
<version>${oracle.jdbc.version}</version>
82-
</dependency>
83-
8488
<!-- Test -->
8589
<dependency>
8690
<groupId>org.junit.jupiter</groupId>
@@ -98,6 +102,11 @@
98102

99103
<build>
100104
<plugins>
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-compiler-plugin</artifactId>
108+
<version>3.13.0</version>
109+
</plugin>
101110
<plugin>
102111
<groupId>org.codehaus.mojo</groupId>
103112
<artifactId>appassembler-maven-plugin</artifactId>

src/test/java/org/utplsql/cli/CliVersionInfoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ class CliVersionInfoTest {
88

99
@Test
1010
void getCliVersionInfo() {
11-
assertTrue(CliVersionInfo.getVersion().startsWith("3.1"));
11+
assertTrue(CliVersionInfo.getVersion().startsWith("3.2"));
1212
}
1313
}

src/test/java/org/utplsql/cli/TestHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ class TestHelper {
1919
private static String sPass;
2020

2121
static {
22-
sUrl = EnvironmentVariableUtil.getEnvValue("DB_URL", "192.168.99.100:1521:XE");
23-
sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "app");
24-
sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "app");
22+
sUrl = EnvironmentVariableUtil.getEnvValue("DB_URL", "//localhost:1521/FREEPDB1");
23+
sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "APP");
24+
sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "pass");
2525
}
2626

2727
static RunPicocliCommand createPicocliRunCommand(String... args ) {

0 commit comments

Comments
 (0)