Merge pull request #204 from utPLSQL/bugfix/update_dependencies

pesse · web-flow · commit bc0673874c37 · 2022-06-09T09:10:24.000+02:00
Update dependencies
diff --git a/pom.xml b/pom.xml
@@ -43,32 +43,32 @@
       <dependency>
           <groupId>javax.xml.bind</groupId>
           <artifactId>jaxb-api</artifactId>
-          <version>2.3.0</version>
+          <version>2.3.1</version>
       </dependency>
       <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
-          <version>1.2.3</version>
+          <version>1.2.11</version>
       </dependency>
       <dependency>
           <groupId>info.picocli</groupId>
           <artifactId>picocli</artifactId>
-          <version>4.0.0-beta-1b</version>
+          <version>4.6.3</version>
       </dependency>
       <dependency>
-          <groupId>com.oracle.ojdbc</groupId>
+          <groupId>com.oracle.database.jdbc</groupId>
           <artifactId>ojdbc8</artifactId>
           <version>${oracle.jdbc.version}</version>
           <scope>compile</scope>
           <exclusions>
               <exclusion>
-                  <groupId>com.oracle.ojdbc</groupId>
+                  <groupId>com.oracle.database.jdbc</groupId>
                   <artifactId>ucp</artifactId>
               </exclusion>
           </exclusions>
       </dependency>
      <dependency>
-          <groupId>com.oracle.ojdbc</groupId>
+          <groupId>com.oracle.database.nls</groupId>
           <artifactId>orai18n</artifactId>
           <version>${oracle.jdbc.version}</version>
           <scope>compile</scope>
diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java
@@ -1,11 +1,15 @@
 package org.utplsql.cli;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
 import java.util.List;
 
 public class Cli {
 
+    private static final Logger logger = LoggerFactory.getLogger(Cli.class);
+
     static final int DEFAULT_ERROR_CODE = 1;
 
     public static void main(String[] args) {
@@ -17,6 +21,8 @@ public static void main(String[] args) {
 
     static int runPicocliWithExitCode(String[] args) {
 
+        logger.debug("Args: "+String.join(", ", args));
+
         CommandLine commandLine = new CommandLine(UtplsqlPicocliCommand.class);
         commandLine.setTrimQuotes(true);
 
diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java
@@ -104,7 +104,7 @@ public class RunPicocliCommand implements IRunCommand {
     private List<Format> reporters = new ArrayList<>();
 
     static class Format {
-        @Option(names = {"-f", "--format"}, required = true, description = "Enables specified format reporting")
+        @Option(names = {"-f", "--format"}, description = "Enables specified format reporting")
         String format;
         @Option(names = {"-o"}, description = "Outputs format to file")
         String outputFile;
diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java
@@ -54,11 +54,12 @@ private void setThickOrThinJdbcUrl(OracleDataSource ds) throws SQLException {
         ds.setPassword(config.getPassword());
 
         for (ConnectStringPossibility possibility : possibilities) {
+            logger.debug("Try connecting {}", possibility.getMaskedConnectString(config));
             ds.setURL(possibility.getConnectString(config));
             try (Connection ignored = ds.getConnection()) {
                 logger.info("Use connection string {}", possibility.getMaskedConnectString(config));
                 return;
-            } catch (UnsatisfiedLinkError | Exception e) {
+            } catch (Error | Exception e) {
                 errors.add(possibility.getMaskedConnectString(config) + ": " + e.getMessage());
                 lastException = e;
             }
diff --git a/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java b/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java
@@ -240,4 +240,13 @@ void testFileMappingWithoutDetails() throws Exception {
         assertNull( testMapperConfig.getTypeSubexpression());
         assertNull( testMapperConfig.getNameSubexpression());
     }
+
+    @Test
+    void negatedTag() throws Exception {
+        RunCommandConfig config = parseForConfig("run",
+                TestHelper.getConnectionString(),
+                "--tags=\"-dontwantit\"");
+
+        assertThat(config.getTags(), hasItemInArray("-dontwantit") );
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -240,4 +240,13 @@ void testFileMappingWithoutDetails() throws Exception {`
`240`	`240`	`assertNull( testMapperConfig.getTypeSubexpression());`
`241`	`241`	`assertNull( testMapperConfig.getNameSubexpression());`
`242`	`242`	`}`
	`243`	`+`
	`244`	`+ @Test`
	`245`	`+ void negatedTag() throws Exception {`
	`246`	`+ RunCommandConfig config = parseForConfig("run",`
	`247`	`+ TestHelper.getConnectionString(),`
	`248`	`+ "--tags=\"-dontwantit\"");`
	`249`	`+`
	`250`	`+ assertThat(config.getTags(), hasItemInArray("-dontwantit") );`
	`251`	`+ }`
`243`	`252`	`}`