From bbbdbb57b3e778be44fbdba40656cc1bb627cbd0 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 12 Mar 2020 22:08:39 +0100 Subject: [PATCH 001/133] Add command-line param `--coverage-schemes` --- src/main/java/org/utplsql/cli/RunPicocliCommand.java | 8 +++++++- .../java/org/utplsql/cli/config/RunCommandConfig.java | 8 ++++++-- src/test/java/org/utplsql/cli/PicocliRunCommandTest.java | 4 +++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java index da0d871..c87826b 100644 --- a/src/main/java/org/utplsql/cli/RunPicocliCommand.java +++ b/src/main/java/org/utplsql/cli/RunPicocliCommand.java @@ -28,6 +28,11 @@ public class RunPicocliCommand implements IRunCommand { split = ",") private List tags = new ArrayList<>(); + @Option(names = {"--coverage-schemes"}, + description = "comma-separated list of schemas on which coverage should be gathered", + split = ",") + private List coverageSchemes = new ArrayList<>(); + @Option( names = {"-c", "--color"}, @@ -238,7 +243,8 @@ public RunCommandConfig getRunCommandConfig() { enableDbmsOutput, randomTestOrder, randomTestOrderSeed, - tags.toArray(new String[0])); + tags.toArray(new String[0]), + coverageSchemes.toArray(new String[0])); } private RunAction getRunAction() { diff --git a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java index 4418a45..2ea4223 100644 --- a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java +++ b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java @@ -22,9 +22,10 @@ public class RunCommandConfig extends ConnectionConfig { private boolean randomTestOrder = false; private final Integer randomTestOrderSeed; private final String[] tags; + private final String[] coverageSchemes; - @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags"}) - public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags) { + @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags", "coverageSchemes"}) + public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags, String[] coverageSchemes) { super(connectString); this.suitePaths = suitePaths; this.reporters = reporters; @@ -41,6 +42,7 @@ public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfi this.randomTestOrder = randomTestOrder; this.randomTestOrderSeed = randomTestOrderSeed; this.tags = tags; + this.coverageSchemes = coverageSchemes; } public String[] getSuitePaths() { @@ -102,4 +104,6 @@ public boolean isRandomTestOrder() { public Integer getRandomTestOrderSeed() { return randomTestOrderSeed; } + + public String[] getCoverageSchemes() { return coverageSchemes; } } diff --git a/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java b/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java index 809912d..a7b4eb5 100644 --- a/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java +++ b/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java @@ -48,7 +48,8 @@ void runCommandAllArguments() throws Exception { "-type_mapping=\"tsql=PACKAGE BODY\"", "-owner_subexpression=1", "-type_subexpression=2", - "-name_subexpression=3"); + "-name_subexpression=3", + "--coverage-schemes=schema1,other_schema"); assertNotNull(config.getConnectString()); assertThat( config.getSuitePaths(), is(new String[]{"app.betwnstr", "app.basic"})); @@ -65,6 +66,7 @@ void runCommandAllArguments() throws Exception { assertEquals( 123, config.getRandomTestOrderSeed() ); assertNotNull( config.getReporters() ); assertEquals( 1, config.getReporters().length ); + assertThat( config.getCoverageSchemes(), is(new String[]{"schema1", "other_schema"}) ); // Source FileMapping assertNotNull(config.getSourceMapping()); From 4059d91311889126dbbd257520a202e69f3e0b8c Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 12 Mar 2020 22:32:30 +0100 Subject: [PATCH 002/133] Use 3.1.9-SNAPSHOT version of java-api --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3b38f34..4da718b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.8-SNAPSHOT + 3.1.9-SNAPSHOT jar cli @@ -23,7 +23,7 @@ org.utplsql java-api - 3.1.8 + 3.1.9-SNAPSHOT compile From a97124537fdefa180d2d0c3652fa2bb6f3b238fb Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 12 Mar 2020 22:35:20 +0100 Subject: [PATCH 003/133] Pass `--coverage-schemes` to TestRunner --- src/main/java/org/utplsql/cli/RunAction.java | 3 ++- .../java/org/utplsql/cli/RunCommandArgumentsTest.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java index 29d248b..d91108a 100644 --- a/src/main/java/org/utplsql/cli/RunAction.java +++ b/src/main/java/org/utplsql/cli/RunAction.java @@ -165,7 +165,8 @@ TestRunner newTestRunner(List reporterList) { .excludeObjects(Arrays.asList(config.getExcludePackages())) .randomTestOrder(config.isRandomTestOrder()) .randomTestOrderSeed(config.getRandomTestOrderSeed()) - .addTags(Arrays.asList(config.getTags())); + .addTags(Arrays.asList(config.getTags())) + .addCoverageSchemes(Arrays.asList(config.getCoverageSchemes())); } private void outputMainInformation() { diff --git a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java index a2f0a9a..add6844 100644 --- a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java @@ -18,6 +18,7 @@ public void allArgumentsAreRecognized() { "-o=sonar_result.xml", "-s", "--tags=tag1,tag2", + "--coverage-schemes=schema1,some_other_schema", "-d", "-c", "--failure-exit-code=10", @@ -64,4 +65,14 @@ void provideTags() { TestRunner testRunner = runCmd.newTestRunner(new ArrayList<>()); assertThat( testRunner.getOptions().tags, contains("tag1", "tag.2") ); } + + @Test + void provideCoverageSchemes() { + IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), + "--coverage-schemes=schema-1,some_other_schema" + ); + + TestRunner testRunner = runCmd.newTestRunner(new ArrayList<>()); + assertThat( testRunner.getOptions().coverageSchemes, contains("schema-1", "some_other_schema") ); + } } From efe4e534ca1dc28d9bdb7d7764018d23e6aa111d Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 12 Mar 2020 22:44:30 +0100 Subject: [PATCH 004/133] Add `--coverage-schemes` to README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index fd518ec..d3d4e17 100644 --- a/README.md +++ b/README.md @@ -179,6 +179,9 @@ utplsql run "my/Username"/"myP@ssword"@connectstring -seed - Sets the seed to use for random test execution order. If set, it sets -random to true (--random-test-order-seed) + +--coverage-schemes - A comma separated list of schemas on which coverage should be gathered + Format: --coverage-schemes=schema1[,schema2[,schema3]] ``` Parameters -f, -o, -s are correlated. That is parameters -o and -s are controlling outputs for reporter specified by the preceding -f parameter. From 1bc62661eccf2acde07b908f9620e6e60e15effa Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 12 Mar 2020 23:31:45 +0100 Subject: [PATCH 005/133] Refactor to Builder-pattern for RunCommandConfig --- .../org/utplsql/cli/RunPicocliCommand.java | 37 +++--- .../utplsql/cli/config/RunCommandConfig.java | 114 +++++++++++++++++- 2 files changed, 132 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java index c87826b..a90ffd9 100644 --- a/src/main/java/org/utplsql/cli/RunPicocliCommand.java +++ b/src/main/java/org/utplsql/cli/RunPicocliCommand.java @@ -227,24 +227,25 @@ public RunCommandConfig getRunCommandConfig() { } } - return new RunCommandConfig( - connectionString, - suitePaths.toArray(new String[0]), - reporterConfigs.toArray(new ReporterConfig[0]), - colorConsole, - failureExitCode, - skipCompatibilityCheck, - splitOrEmpty(includeObjects), - splitOrEmpty(excludeObjects), - sourceFileMapping, - testFileMapping, - loggerConfigLevel, - timeoutInMinutes, - enableDbmsOutput, - randomTestOrder, - randomTestOrderSeed, - tags.toArray(new String[0]), - coverageSchemes.toArray(new String[0])); + return new RunCommandConfig.Builder() + .connectString(connectionString) + .suitePaths(suitePaths.toArray(new String[0])) + .reporters(reporterConfigs.toArray(new ReporterConfig[0])) + .outputAnsiColor(colorConsole) + .failureExitCode(failureExitCode) + .skipCompatibilityCheck(skipCompatibilityCheck) + .includePackages(splitOrEmpty(includeObjects)) + .excludePackages(splitOrEmpty(excludeObjects)) + .sourceMapping(sourceFileMapping) + .testMapping(testFileMapping) + .logConfigLevel(loggerConfigLevel) + .timeoutInMinutes(timeoutInMinutes) + .dbmsOutput(enableDbmsOutput) + .randomTestOrder(randomTestOrder) + .randomTestOrderSeed(randomTestOrderSeed) + .tags(tags.toArray(new String[0])) + .coverageSchemes(coverageSchemes.toArray(new String[0])) + .create(); } private RunAction getRunAction() { diff --git a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java index 2ea4223..a07b6f6 100644 --- a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java +++ b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java @@ -105,5 +105,117 @@ public Integer getRandomTestOrderSeed() { return randomTestOrderSeed; } - public String[] getCoverageSchemes() { return coverageSchemes; } + public String[] getCoverageSchemes() { + return coverageSchemes; + } + + public static class Builder { + + private String connectString; + private String[] suitePaths; + private ReporterConfig[] reporters; + private boolean outputAnsiColor; + private Integer failureExitCode; + private boolean skipCompatibilityCheck; + private String[] includePackages; + private String[] excludePackages; + private FileMapperConfig sourceMapping; + private FileMapperConfig testMapping; + private ConfigLevel logConfigLevel; + private Integer timeoutInMinutes; + private boolean dbmsOutput; + private boolean randomTestOrder; + private Integer randomTestOrderSeed; + private String[] tags; + private String[] coverageSchemes; + + public Builder connectString(String connectString) { + this.connectString = connectString; + return this; + } + + public Builder suitePaths(String[] suitePaths) { + this.suitePaths = suitePaths; + return this; + } + + public Builder reporters(ReporterConfig[] reporters) { + this.reporters = reporters; + return this; + } + + public Builder outputAnsiColor(boolean outputAnsiColor) { + this.outputAnsiColor = outputAnsiColor; + return this; + } + + public Builder failureExitCode(Integer failureExitCode) { + this.failureExitCode = failureExitCode; + return this; + } + + public Builder skipCompatibilityCheck(boolean skipCompatibilityCheck) { + this.skipCompatibilityCheck = skipCompatibilityCheck; + return this; + } + + public Builder includePackages(String[] includePackages) { + this.includePackages = includePackages; + return this; + } + + public Builder excludePackages(String[] excludePackages) { + this.excludePackages = excludePackages; + return this; + } + + public Builder sourceMapping(FileMapperConfig sourceMapping) { + this.sourceMapping = sourceMapping; + return this; + } + + public Builder testMapping(FileMapperConfig testMapping) { + this.testMapping = testMapping; + return this; + } + + public Builder logConfigLevel(ConfigLevel logConfigLevel) { + this.logConfigLevel = logConfigLevel; + return this; + } + + public Builder timeoutInMinutes(Integer timeoutInMinutes) { + this.timeoutInMinutes = timeoutInMinutes; + return this; + } + + public Builder dbmsOutput(boolean dbmsOutput) { + this.dbmsOutput = dbmsOutput; + return this; + } + + public Builder randomTestOrder(boolean randomTestOrder) { + this.randomTestOrder = randomTestOrder; + return this; + } + + public Builder randomTestOrderSeed(Integer randomTestOrderSeed) { + this.randomTestOrderSeed = randomTestOrderSeed; + return this; + } + + public Builder tags(String[] tags) { + this.tags = tags; + return this; + } + + public Builder coverageSchemes(String[] coverageSchemes) { + this.coverageSchemes = coverageSchemes; + return this; + } + + public RunCommandConfig create() { + return new RunCommandConfig(connectString, suitePaths, reporters, outputAnsiColor, failureExitCode, skipCompatibilityCheck, includePackages, excludePackages, sourceMapping, testMapping, logConfigLevel, timeoutInMinutes, dbmsOutput, randomTestOrder, randomTestOrderSeed, tags, coverageSchemes); + } + } } From 2a7e7166feacd48008d817c09dc7d40e70155fbe Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 12 Mar 2020 23:46:04 +0100 Subject: [PATCH 006/133] Start composable test for RunCommandConfig -> TestRunnerOptions --- .../utplsql/cli/config/RunCommandConfig.java | 10 +++--- ...ConfigParamsArePassedToTestRunnerTest.java | 31 +++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java diff --git a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java index a07b6f6..ea66ffd 100644 --- a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java +++ b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java @@ -112,13 +112,13 @@ public String[] getCoverageSchemes() { public static class Builder { private String connectString; - private String[] suitePaths; + private String[] suitePaths = new String[0]; private ReporterConfig[] reporters; private boolean outputAnsiColor; private Integer failureExitCode; private boolean skipCompatibilityCheck; - private String[] includePackages; - private String[] excludePackages; + private String[] includePackages = new String[0]; + private String[] excludePackages = new String[0]; private FileMapperConfig sourceMapping; private FileMapperConfig testMapping; private ConfigLevel logConfigLevel; @@ -126,8 +126,8 @@ public static class Builder { private boolean dbmsOutput; private boolean randomTestOrder; private Integer randomTestOrderSeed; - private String[] tags; - private String[] coverageSchemes; + private String[] tags = new String[0]; + private String[] coverageSchemes = new String[0]; public Builder connectString(String connectString) { this.connectString = connectString; diff --git a/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java b/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java new file mode 100644 index 0000000..b1b34d4 --- /dev/null +++ b/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java @@ -0,0 +1,31 @@ +package org.utplsql.cli; + +import org.junit.jupiter.api.Test; +import org.utplsql.api.TestRunner; +import org.utplsql.cli.config.RunCommandConfig; + +import java.util.ArrayList; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; + +public class RunCommandConfigParamsArePassedToTestRunnerTest { + + @Test + void tags() { + RunCommandConfig config = new RunCommandConfig.Builder() + .tags(new String[]{"tag1", "tag2"}) + .create(); + TestRunner testRunner = new RunAction(config).newTestRunner(new ArrayList<>()); + assertThat( testRunner.getOptions().tags, contains("tag1", "tag2") ); + } + + @Test + void coverageSchemes() { + RunCommandConfig config = new RunCommandConfig.Builder() + .coverageSchemes(new String[]{"schema1", "another_schema", "and-another-one"}) + .create(); + TestRunner testRunner = new RunAction(config).newTestRunner(new ArrayList<>()); + assertThat( testRunner.getOptions().coverageSchemes, contains("schema1", "another_schema", "and-another-one") ); + } +} From 2473530e7f5f187c89761d0d7d4b6c58a13b345f Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 10 Jun 2021 22:01:55 +0200 Subject: [PATCH 007/133] Start adding descriptions to the tests --- src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java index add6844..d280c2e 100644 --- a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java @@ -1,5 +1,6 @@ package org.utplsql.cli; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.utplsql.api.TestRunner; @@ -11,6 +12,7 @@ public class RunCommandArgumentsTest { @Test + @DisplayName("All arguments are recognized") public void allArgumentsAreRecognized() { IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-p=app", From d56812632858833da896f4cdc278d3a6aea73805 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 10 Jun 2021 23:21:09 +0200 Subject: [PATCH 008/133] Add new --catch-ora-stuck parameter Reson for this that I have the assumption that catch is too greedy, leading to more abort- and retries than necessary. --- src/main/java/org/utplsql/cli/RunAction.java | 3 ++- .../java/org/utplsql/cli/RunPicocliCommand.java | 4 ++++ .../org/utplsql/cli/config/RunCommandConfig.java | 16 +++++++++++++--- .../org/utplsql/cli/RunCommandArgumentsTest.java | 3 ++- ...andConfigParamsArePassedToTestRunnerTest.java | 10 ++++++++++ src/test/java/org/utplsql/cli/RunCommandIT.java | 10 ++++++++++ .../org/utplsql/cli/RunCommandIssue20IT.java | 3 ++- 7 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java index d91108a..ba0faf3 100644 --- a/src/main/java/org/utplsql/cli/RunAction.java +++ b/src/main/java/org/utplsql/cli/RunAction.java @@ -166,7 +166,8 @@ TestRunner newTestRunner(List reporterList) { .randomTestOrder(config.isRandomTestOrder()) .randomTestOrderSeed(config.getRandomTestOrderSeed()) .addTags(Arrays.asList(config.getTags())) - .addCoverageSchemes(Arrays.asList(config.getCoverageSchemes())); + .addCoverageSchemes(Arrays.asList(config.getCoverageSchemes())) + .catchOraStuck(config.isCatchOraStuck()); } private void outputMainInformation() { diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java index a90ffd9..c024a3b 100644 --- a/src/main/java/org/utplsql/cli/RunPicocliCommand.java +++ b/src/main/java/org/utplsql/cli/RunPicocliCommand.java @@ -183,6 +183,9 @@ FileMapperConfig toFileMapperConfig() { @Option(names = "-h", usageHelp = true, description = "display this help and exit") boolean help; + @Option(names = "--catch-ora-stuck", description = "Sets a timeout around Reporter creation and retries when not ready after a while") + boolean catchOraStuck = false; + private RunAction runAction; private String[] splitOrEmpty(String value) { @@ -245,6 +248,7 @@ public RunCommandConfig getRunCommandConfig() { .randomTestOrderSeed(randomTestOrderSeed) .tags(tags.toArray(new String[0])) .coverageSchemes(coverageSchemes.toArray(new String[0])) + .catchOraStuck(catchOraStuck) .create(); } diff --git a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java index ea66ffd..7b92dbe 100644 --- a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java +++ b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java @@ -23,9 +23,10 @@ public class RunCommandConfig extends ConnectionConfig { private final Integer randomTestOrderSeed; private final String[] tags; private final String[] coverageSchemes; + private final boolean catchOraStuck; - @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags", "coverageSchemes"}) - public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags, String[] coverageSchemes) { + @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags", "coverageSchemes", "catchOraStuck"}) + public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags, String[] coverageSchemes, boolean catchOraStuck) { super(connectString); this.suitePaths = suitePaths; this.reporters = reporters; @@ -43,6 +44,7 @@ public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfi this.randomTestOrderSeed = randomTestOrderSeed; this.tags = tags; this.coverageSchemes = coverageSchemes; + this.catchOraStuck = catchOraStuck; } public String[] getSuitePaths() { @@ -109,6 +111,8 @@ public String[] getCoverageSchemes() { return coverageSchemes; } + public boolean isCatchOraStuck() { return catchOraStuck; } + public static class Builder { private String connectString; @@ -128,6 +132,7 @@ public static class Builder { private Integer randomTestOrderSeed; private String[] tags = new String[0]; private String[] coverageSchemes = new String[0]; + private boolean catchOraStuck; public Builder connectString(String connectString) { this.connectString = connectString; @@ -214,8 +219,13 @@ public Builder coverageSchemes(String[] coverageSchemes) { return this; } + public Builder catchOraStuck(boolean catchOraStuck) { + this.catchOraStuck = catchOraStuck; + return this; + } + public RunCommandConfig create() { - return new RunCommandConfig(connectString, suitePaths, reporters, outputAnsiColor, failureExitCode, skipCompatibilityCheck, includePackages, excludePackages, sourceMapping, testMapping, logConfigLevel, timeoutInMinutes, dbmsOutput, randomTestOrder, randomTestOrderSeed, tags, coverageSchemes); + return new RunCommandConfig(connectString, suitePaths, reporters, outputAnsiColor, failureExitCode, skipCompatibilityCheck, includePackages, excludePackages, sourceMapping, testMapping, logConfigLevel, timeoutInMinutes, dbmsOutput, randomTestOrder, randomTestOrderSeed, tags, coverageSchemes, catchOraStuck); } } } diff --git a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java index d280c2e..af368a4 100644 --- a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java @@ -41,7 +41,8 @@ public void allArgumentsAreRecognized() { "-type_mapping=\"sql=PACKAGE BODY\"", "-owner_subexpression=0", "-type_subexpression=0", - "-name_subexpression=0" + "-name_subexpression=0", + "--catch-ora-stuck" ); TestRunner testRunner = runCmd.newTestRunner(new ArrayList<>()); diff --git a/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java b/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java index b1b34d4..2a2e3bb 100644 --- a/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java @@ -8,6 +8,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; +import static org.junit.jupiter.api.Assertions.assertTrue; public class RunCommandConfigParamsArePassedToTestRunnerTest { @@ -28,4 +29,13 @@ void coverageSchemes() { TestRunner testRunner = new RunAction(config).newTestRunner(new ArrayList<>()); assertThat( testRunner.getOptions().coverageSchemes, contains("schema1", "another_schema", "and-another-one") ); } + + @Test + void catchOraStuck() { + RunCommandConfig config = new RunCommandConfig.Builder() + .catchOraStuck(true) + .create(); + TestRunner testRunner = new RunAction(config).newTestRunner(new ArrayList<>()); + assertTrue( testRunner.getOptions().catchOraStuck ); + } } diff --git a/src/test/java/org/utplsql/cli/RunCommandIT.java b/src/test/java/org/utplsql/cli/RunCommandIT.java index e6ac671..291e980 100644 --- a/src/test/java/org/utplsql/cli/RunCommandIT.java +++ b/src/test/java/org/utplsql/cli/RunCommandIT.java @@ -89,4 +89,14 @@ void run_withOutputButNoReporterDefined() throws Exception { assertValidReturnCode(result); } + + @Test + void run_withCatchOraStuck() throws Exception { + int result = TestHelper.runApp("run", + TestHelper.getConnectionString(), + "--catch-ora-stuck", + "--failure-exit-code=2"); + + assertValidReturnCode(result); + } } diff --git a/src/test/java/org/utplsql/cli/RunCommandIssue20IT.java b/src/test/java/org/utplsql/cli/RunCommandIssue20IT.java index 0976706..9db13e0 100644 --- a/src/test/java/org/utplsql/cli/RunCommandIssue20IT.java +++ b/src/test/java/org/utplsql/cli/RunCommandIssue20IT.java @@ -24,7 +24,8 @@ void runLoop() { IRunCommand runCmd = TestHelper.createRunCommand( TestHelper.getConnectionString(), "-p=TEST_BETWNSTR.normal_case", - "-f=ut_documentation_reporter"); + "-f=ut_documentation_reporter", + "--catch-ora-stuck"); List reporterOptionsList = runCmd.getReporterOptionsList(); ReporterOptions reporterOptions1 = reporterOptionsList.get(0); assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName()); From eeb1d5892b30413b0e1966f3230915368d0e5485 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Jan 2022 00:29:35 +0200 Subject: [PATCH 009/133] Fixing failing test for 3.1.11 --- src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java b/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java index bf67f7f..3718a50 100644 --- a/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java +++ b/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java @@ -19,7 +19,7 @@ */ class RunCommandCoverageReporterIT extends AbstractFileOutputTest { - private static final Pattern REGEX_COVERAGE_TITLE = Pattern.compile("([a-zA-Z0-9\\._]+)<\\/a>"); + private static final Pattern REGEX_COVERAGE_TITLE = Pattern.compile("([a-zA-Z ]+ )?([a-zA-Z0-9\\._]+)<\\/a>"); private String getTempCoverageFileName(int counter) { From 5fa8d3881c471163b02ed3dd35f0678bc0a3bdd8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Jan 2022 00:36:24 +0200 Subject: [PATCH 010/133] Fixing failing test for 3.1.11 --- src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java b/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java index 3718a50..e95dce2 100644 --- a/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java +++ b/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java @@ -60,7 +60,7 @@ private boolean hasCoverageListed(String content, String packageName) { Matcher m = REGEX_COVERAGE_TITLE.matcher(content); while (m.find()) { - if (packageName.equals(m.group(1))) + if (packageName.equals(m.group(2))) return true; } From 7733c167fd0fc092f20d0aa6b3030ba122fb9a73 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jan 2022 18:02:43 +0200 Subject: [PATCH 011/133] Adding Github Action to build and test the project --- .github/workflows/build.yml | 87 +++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..5b6c545 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,87 @@ +name: Build and test +on: + push: + branches: [ develop ] + tags: + - v* + pull_request: + branches: [ develop ] + workflow_dispatch: + repository_dispatch: + types: [utPLSQL-build] + +defaults: + run: + shell: bash + +jobs: + build: + name: Test on JDK ${{ matrix.jdk }} with utPLSQL ${{ matrix.utplsql_version }} + runs-on: ubuntu-latest + env: + ORACLE_VERSION: "gvenzl/oracle-xe:18.4.0-slim" + UTPLSQL_VERSION: ${{matrix.utplsql_version}} + UTPLSQL_FILE: ${{matrix.utplsql_file}} + ORACLE_PASSWORD: oracle + DB_URL: "127.0.0.1:1521:XE" + DB_USER: app + DB_PASS: app + + strategy: + fail-fast: false + matrix: + utplsql_version: ["v3.0.1","v3.0.2","v3.0.3","v3.0.4","v3.1.1","v3.1.2","v3.1.3","v3.1.6","v3.1.7","v3.1.8","v3.1.9","v3.1.10","v3.1.11","develop"] + utplsql_file: ["utPLSQL"] + jdk: ['8'] + include: + - utplsql_version: "v3.0.0" + jdk: '8' + utplsql_file: "utPLSQLv3.0.0" + services: + oracle: + image: gvenzl/oracle-xe:18.4.0-slim + env: + ORACLE_PASSWORD: oracle + ports: + - 1521:1521 + options: >- + --health-cmd healthcheck.sh + --health-interval 10s + --health-timeout 5s + --health-retries 10 + --name oracle + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: ${{matrix.jdk}} + cache: 'maven' + + - name: Install utplsql + run: .travis/install_utplsql.sh + + - name: Install demo project + run: .travis/install_demo_project.sh + + - name: Build + run: mvn package -DskipTests + - name: Test + run: mvn package verify jar:jar appassembler:assemble + + slack-workflow-status: + if: always() + name: Post Workflow Status To Slack + needs: [ build, deploy ] + runs-on: ubuntu-latest + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + name: 'Github Actions[bot]' + icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' From e27c07e7c3d6ff45d1dd3ef5dfa800cf4d5d51c1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jan 2022 18:17:21 +0200 Subject: [PATCH 012/133] Adding badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3d4e17..8e397c3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL-cli.svg)](https://github.com/utPLSQL/utPLSQL-cli/releases) [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL-cli.svg)](https://www.apache.org/licenses/LICENSE-2.0) -[![build](https://img.shields.io/travis/utPLSQL/utPLSQL-cli/develop.svg?label=develop%20branch)](https://travis-ci.org/utPLSQL/utPLSQL-cli) +[![Build status](https://github.com/utPLSQL/utPLSQL-cli/actions/workflows/build.yml/badge.svg)](https://github.com/utPLSQL/utPLSQL-cli/actions/workflows/build.yml) ---------- # utPLSQL-cli From eca50c8203f66a56dfdaac6116d33b2922bb785c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jan 2022 18:17:33 +0200 Subject: [PATCH 013/133] testing build on branch --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b6c545..d81721a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: Build and test on: push: - branches: [ develop ] + branches: [ develop, feature/github_actions ] tags: - v* pull_request: From 3e5bdfef4060a902d89b648eb271cc97ecc8a9b5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jan 2022 18:18:27 +0200 Subject: [PATCH 014/133] testing build on branch --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d81721a..6f3c83b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: slack-workflow-status: if: always() name: Post Workflow Status To Slack - needs: [ build, deploy ] + needs: [ build ] runs-on: ubuntu-latest steps: - name: Slack Workflow Notification From 4cc8b839aa566d1de30af93634d6a20b4d8ffa58 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jan 2022 18:38:03 +0200 Subject: [PATCH 015/133] Fixing sh file privileges --- .travis/create_api_user.sh | 0 .travis/create_release.sh | 0 .travis/install_demo_project.sh | 0 .travis/install_utplsql.sh | 0 .travis/start_db.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .travis/create_api_user.sh mode change 100644 => 100755 .travis/create_release.sh mode change 100644 => 100755 .travis/install_demo_project.sh mode change 100644 => 100755 .travis/install_utplsql.sh mode change 100644 => 100755 .travis/start_db.sh diff --git a/.travis/create_api_user.sh b/.travis/create_api_user.sh old mode 100644 new mode 100755 diff --git a/.travis/create_release.sh b/.travis/create_release.sh old mode 100644 new mode 100755 diff --git a/.travis/install_demo_project.sh b/.travis/install_demo_project.sh old mode 100644 new mode 100755 diff --git a/.travis/install_utplsql.sh b/.travis/install_utplsql.sh old mode 100644 new mode 100755 diff --git a/.travis/start_db.sh b/.travis/start_db.sh old mode 100644 new mode 100755 From 51158d04fa3a682494cd9973b6a9d14cac8d71e2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jan 2022 18:41:49 +0200 Subject: [PATCH 016/133] Fixing scripts --- .travis/install_demo_project.sh | 10 +++++----- .travis/install_utplsql.sh | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.travis/install_demo_project.sh b/.travis/install_demo_project.sh index adb9566..20bf1a4 100755 --- a/.travis/install_demo_project.sh +++ b/.travis/install_demo_project.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -ev +set -evx cd $(dirname $(readlink -f $0)) PROJECT_FILE="utPLSQL-demo-project" @@ -13,7 +13,7 @@ grant select any dictionary to ${DB_USER}; exit SQL -cd ${PROJECT_FILE} +cd /${PROJECT_FILE} sqlplus -S -L ${DB_USER}/${DB_PASS}@//127.0.0.1:1521/xe < install.sh.tmp < Date: Wed, 23 Feb 2022 02:06:56 +0200 Subject: [PATCH 017/133] Update of build trigger event --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f3c83b..22e880f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,9 @@ on: pull_request: branches: [ develop ] workflow_dispatch: + repository_dispatch: - types: [utPLSQL-build] + types: [utPLSQL-build,utPLSQL-java-api-build] defaults: run: From b20727dc8bfbb88d259df340dae00b2a7c11e172 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 23 Feb 2022 02:12:14 +0200 Subject: [PATCH 018/133] Fixing demo project install --- .travis/install_demo_project.sh | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/.travis/install_demo_project.sh b/.travis/install_demo_project.sh index 20bf1a4..bafc8f1 100755 --- a/.travis/install_demo_project.sh +++ b/.travis/install_demo_project.sh @@ -17,24 +17,14 @@ cd /${PROJECT_FILE} sqlplus -S -L ${DB_USER}/${DB_PASS}@//127.0.0.1:1521/xe < Date: Thu, 9 Jun 2022 00:21:16 +0200 Subject: [PATCH 019/133] New parameter --ora-stuck-timeout Sets a timeout around Reporter creation and retries when not ready after a while. 0 = no timeout. Fixes #199 Fixes #197 Fixes #196 Fixes #193 Fixes #191 --- README.md | 2 ++ src/main/java/org/utplsql/cli/RunAction.java | 2 +- .../org/utplsql/cli/RunPicocliCommand.java | 6 +++--- .../utplsql/cli/config/RunCommandConfig.java | 18 +++++++++--------- .../utplsql/cli/RunCommandArgumentsTest.java | 2 +- ...dConfigParamsArePassedToTestRunnerTest.java | 7 ++++--- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8e397c3..ba9fe0f 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,8 @@ utplsql run "my/Username"/"myP@ssword"@connectstring --coverage-schemes - A comma separated list of schemas on which coverage should be gathered Format: --coverage-schemes=schema1[,schema2[,schema3]] + +--ora-stuck-timeout - Sets a timeout around Reporter creation and retries when not ready after a while. 0 = no timeout. ``` Parameters -f, -o, -s are correlated. That is parameters -o and -s are controlling outputs for reporter specified by the preceding -f parameter. diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java index ba0faf3..de1be33 100644 --- a/src/main/java/org/utplsql/cli/RunAction.java +++ b/src/main/java/org/utplsql/cli/RunAction.java @@ -167,7 +167,7 @@ TestRunner newTestRunner(List reporterList) { .randomTestOrderSeed(config.getRandomTestOrderSeed()) .addTags(Arrays.asList(config.getTags())) .addCoverageSchemes(Arrays.asList(config.getCoverageSchemes())) - .catchOraStuck(config.isCatchOraStuck()); + .oraStuckTimeout(config.getOraStuckTimeout()); } private void outputMainInformation() { diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java index c024a3b..0bdf33c 100644 --- a/src/main/java/org/utplsql/cli/RunPicocliCommand.java +++ b/src/main/java/org/utplsql/cli/RunPicocliCommand.java @@ -183,8 +183,8 @@ FileMapperConfig toFileMapperConfig() { @Option(names = "-h", usageHelp = true, description = "display this help and exit") boolean help; - @Option(names = "--catch-ora-stuck", description = "Sets a timeout around Reporter creation and retries when not ready after a while") - boolean catchOraStuck = false; + @Option(names = "--ora-stuck-timeout", description = "Sets a timeout around Reporter creation and retries when not ready after a while. 0 = no timeout.") + Integer oraStuckTimeout = 0; private RunAction runAction; @@ -248,7 +248,7 @@ public RunCommandConfig getRunCommandConfig() { .randomTestOrderSeed(randomTestOrderSeed) .tags(tags.toArray(new String[0])) .coverageSchemes(coverageSchemes.toArray(new String[0])) - .catchOraStuck(catchOraStuck) + .oraStuckTimeout(oraStuckTimeout) .create(); } diff --git a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java index 7b92dbe..218466b 100644 --- a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java +++ b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java @@ -23,10 +23,10 @@ public class RunCommandConfig extends ConnectionConfig { private final Integer randomTestOrderSeed; private final String[] tags; private final String[] coverageSchemes; - private final boolean catchOraStuck; + private final Integer oraStuckTimeout; - @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags", "coverageSchemes", "catchOraStuck"}) - public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags, String[] coverageSchemes, boolean catchOraStuck) { + @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags", "coverageSchemes", "oraStuckTimeout"}) + public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags, String[] coverageSchemes, Integer oraStuckTimeout) { super(connectString); this.suitePaths = suitePaths; this.reporters = reporters; @@ -44,7 +44,7 @@ public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfi this.randomTestOrderSeed = randomTestOrderSeed; this.tags = tags; this.coverageSchemes = coverageSchemes; - this.catchOraStuck = catchOraStuck; + this.oraStuckTimeout = oraStuckTimeout; } public String[] getSuitePaths() { @@ -111,7 +111,7 @@ public String[] getCoverageSchemes() { return coverageSchemes; } - public boolean isCatchOraStuck() { return catchOraStuck; } + public Integer getOraStuckTimeout() { return oraStuckTimeout; } public static class Builder { @@ -132,7 +132,7 @@ public static class Builder { private Integer randomTestOrderSeed; private String[] tags = new String[0]; private String[] coverageSchemes = new String[0]; - private boolean catchOraStuck; + private Integer oraStuckTimeout; public Builder connectString(String connectString) { this.connectString = connectString; @@ -219,13 +219,13 @@ public Builder coverageSchemes(String[] coverageSchemes) { return this; } - public Builder catchOraStuck(boolean catchOraStuck) { - this.catchOraStuck = catchOraStuck; + public Builder oraStuckTimeout(Integer oraStuckTimeout) { + this.oraStuckTimeout = oraStuckTimeout; return this; } public RunCommandConfig create() { - return new RunCommandConfig(connectString, suitePaths, reporters, outputAnsiColor, failureExitCode, skipCompatibilityCheck, includePackages, excludePackages, sourceMapping, testMapping, logConfigLevel, timeoutInMinutes, dbmsOutput, randomTestOrder, randomTestOrderSeed, tags, coverageSchemes, catchOraStuck); + return new RunCommandConfig(connectString, suitePaths, reporters, outputAnsiColor, failureExitCode, skipCompatibilityCheck, includePackages, excludePackages, sourceMapping, testMapping, logConfigLevel, timeoutInMinutes, dbmsOutput, randomTestOrder, randomTestOrderSeed, tags, coverageSchemes, oraStuckTimeout); } } } diff --git a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java index af368a4..63be6e2 100644 --- a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java @@ -42,7 +42,7 @@ public void allArgumentsAreRecognized() { "-owner_subexpression=0", "-type_subexpression=0", "-name_subexpression=0", - "--catch-ora-stuck" + "--ora-stuck-timeout=2" ); TestRunner testRunner = runCmd.newTestRunner(new ArrayList<>()); diff --git a/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java b/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java index 2a2e3bb..95d146a 100644 --- a/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java @@ -8,6 +8,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertTrue; public class RunCommandConfigParamsArePassedToTestRunnerTest { @@ -31,11 +32,11 @@ void coverageSchemes() { } @Test - void catchOraStuck() { + void oraStuckTimeout() { RunCommandConfig config = new RunCommandConfig.Builder() - .catchOraStuck(true) + .oraStuckTimeout(2) .create(); TestRunner testRunner = new RunAction(config).newTestRunner(new ArrayList<>()); - assertTrue( testRunner.getOptions().catchOraStuck ); + assertThat( testRunner.getOptions().oraStuckTimeout, equalTo(2) ); } } From 288ca0530b3f41266832328d85583234a7de1b55 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 9 Jun 2022 00:24:46 +0200 Subject: [PATCH 020/133] Fix failing test --- src/test/java/org/utplsql/cli/RunCommandIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/utplsql/cli/RunCommandIT.java b/src/test/java/org/utplsql/cli/RunCommandIT.java index 291e980..95effad 100644 --- a/src/test/java/org/utplsql/cli/RunCommandIT.java +++ b/src/test/java/org/utplsql/cli/RunCommandIT.java @@ -91,10 +91,10 @@ void run_withOutputButNoReporterDefined() throws Exception { } @Test - void run_withCatchOraStuck() throws Exception { + void run_withOraStuckTimeout() throws Exception { int result = TestHelper.runApp("run", TestHelper.getConnectionString(), - "--catch-ora-stuck", + "--ora-stuck-timeout=2", "--failure-exit-code=2"); assertValidReturnCode(result); From a5094839adf72c70bf41d56dddb2b820a57d0b70 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 9 Jun 2022 00:27:57 +0200 Subject: [PATCH 021/133] Fix another test Yes I need my local setup again --- src/test/java/org/utplsql/cli/RunCommandIssue20IT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/utplsql/cli/RunCommandIssue20IT.java b/src/test/java/org/utplsql/cli/RunCommandIssue20IT.java index 9db13e0..8162fc9 100644 --- a/src/test/java/org/utplsql/cli/RunCommandIssue20IT.java +++ b/src/test/java/org/utplsql/cli/RunCommandIssue20IT.java @@ -25,7 +25,7 @@ void runLoop() { TestHelper.getConnectionString(), "-p=TEST_BETWNSTR.normal_case", "-f=ut_documentation_reporter", - "--catch-ora-stuck"); + "--ora-stuck-timeout=3"); List reporterOptionsList = runCmd.getReporterOptionsList(); ReporterOptions reporterOptions1 = reporterOptionsList.get(0); assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName()); From 79d69ffd22345124e79092e68d5d17f7cdf23caa Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 9 Jun 2022 07:20:45 +0200 Subject: [PATCH 022/133] Update dependencies Use logback 1.2.11 to omit known security issues. Use more recent stable versions of jaxb-api and picocli Fixes #203 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4da718b..ca6d8de 100644 --- a/pom.xml +++ b/pom.xml @@ -43,17 +43,17 @@ javax.xml.bind jaxb-api - 2.3.0 + 2.3.1 ch.qos.logback logback-classic - 1.2.3 + 1.2.11 info.picocli picocli - 4.0.0-beta-1b + 4.6.3 com.oracle.ojdbc From e7f62f562ac4b03a9520de063a17d576219dea30 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 26 Aug 2021 16:27:47 +0200 Subject: [PATCH 023/133] Catch "Incompatible version of libocijdbc" Error when trying to connect via thick driver --- .../org/utplsql/cli/datasource/TestedDataSourceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index 8ecfeca..14f7bf4 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -58,7 +58,7 @@ private void setThickOrThinJdbcUrl(OracleDataSource ds) throws SQLException { 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; } From 5313a7ad3c6df2bd5e3d93cc5ef34b9282d60c3d Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 9 Jun 2022 07:55:11 +0200 Subject: [PATCH 024/133] Update oracle dependencies also add a bit more logging --- pom.xml | 6 +++--- .../utplsql/cli/datasource/TestedDataSourceProvider.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ca6d8de..f2a4d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -56,19 +56,19 @@ 4.6.3 - com.oracle.ojdbc + com.oracle.database.jdbc ojdbc8 ${oracle.jdbc.version} compile - com.oracle.ojdbc + com.oracle.database.jdbc ucp - com.oracle.ojdbc + com.oracle.database.nls orai18n ${oracle.jdbc.version} compile diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index 14f7bf4..8f99cf3 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -54,6 +54,7 @@ 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)); From d7d106742377a906a06fe05e34294f25fa87aae9 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 9 Jun 2022 07:59:32 +0200 Subject: [PATCH 025/133] Make format not required --- src/main/java/org/utplsql/cli/RunPicocliCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java index 0bdf33c..2908cf2 100644 --- 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 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; From ec25ab59b95c8c7b4f4cf7f61d1ad887b532bbb7 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 9 Jun 2022 09:05:14 +0200 Subject: [PATCH 026/133] Test for negatedTag argument Also added a bit of logging --- src/main/java/org/utplsql/cli/Cli.java | 6 ++++++ src/test/java/org/utplsql/cli/PicocliRunCommandTest.java | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java index e330818..4f711b6 100644 --- 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/test/java/org/utplsql/cli/PicocliRunCommandTest.java b/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java index a7b4eb5..475ca82 100644 --- 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") ); + } } From cf5dd7ddc0cd274e0955fc422c14800d0118f788 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 11:28:29 +0200 Subject: [PATCH 027/133] Added assembly plugin and release.yml --- .github/workflows/release.yml | 87 ++++++++++ pom.xml | 310 ++++++++++++++++++---------------- src/main/assembly/zip.xml | 19 +++ 3 files changed, 267 insertions(+), 149 deletions(-) create mode 100644 .github/workflows/release.yml create mode 100644 src/main/assembly/zip.xml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..96e5ead --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,87 @@ +name: Release +on: + push: + branches: [ main ] + tags: + - v* + + workflow_dispatch: + + repository_dispatch: + types: [utPLSQL-build,utPLSQL-java-api-build] + +defaults: + run: + shell: bash + +jobs: + build: + name: Test on JDK ${{ matrix.jdk }} with utPLSQL ${{ matrix.utplsql_version }} + runs-on: ubuntu-latest + env: + ORACLE_VERSION: "gvenzl/oracle-xe:18.4.0-slim" + UTPLSQL_VERSION: ${{matrix.utplsql_version}} + UTPLSQL_FILE: ${{matrix.utplsql_file}} + ORACLE_PASSWORD: oracle + DB_URL: "127.0.0.1:1521:XE" + DB_USER: app + DB_PASS: app + + strategy: + fail-fast: false + matrix: + utplsql_version: ["v3.0.1","v3.0.2","v3.0.3","v3.0.4","v3.1.1","v3.1.2","v3.1.3","v3.1.6","v3.1.7","v3.1.8","v3.1.9","v3.1.10","v3.1.11","develop"] + utplsql_file: ["utPLSQL"] + jdk: ['8'] + include: + - utplsql_version: "v3.0.0" + jdk: '8' + utplsql_file: "utPLSQLv3.0.0" + services: + oracle: + image: gvenzl/oracle-xe:18.4.0-slim + env: + ORACLE_PASSWORD: oracle + ports: + - 1521:1521 + options: >- + --health-cmd healthcheck.sh + --health-interval 10s + --health-timeout 5s + --health-retries 10 + --name oracle + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: ${{matrix.jdk}} + cache: 'maven' + + - name: Install utplsql + run: .travis/install_utplsql.sh + + - name: Install demo project + run: .travis/install_demo_project.sh + + - name: Build + run: mvn package -DskipTests + - name: Test + run: mvn verify appassembler:assemble assembly:single + + slack-workflow-status: + if: always() + name: Post Workflow Status To Slack + needs: [ build ] + runs-on: ubuntu-latest + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + name: 'Github Actions[bot]' + icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' diff --git a/pom.xml b/pom.xml index f2a4d7d..3f25f3a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,14 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.utplsql - cli - 3.1.9-SNAPSHOT - jar + org.utplsql + cli + 3.1.9-SNAPSHOT + jar - cli - http://maven.apache.org + cli + http://maven.apache.org UTF-8 @@ -19,153 +19,165 @@ local - - - org.utplsql - java-api - 3.1.9-SNAPSHOT - compile - - - com.oracle.ojdbc - ucp - - - com.oracle.ojdbc - ojdbc8 - - - com.oracle.ojdbc - orai18n - - - - - javax.xml.bind - jaxb-api - 2.3.1 - - - ch.qos.logback - logback-classic - 1.2.11 - - - info.picocli - picocli - 4.6.3 - - - com.oracle.database.jdbc - ojdbc8 - ${oracle.jdbc.version} - compile - - - com.oracle.database.jdbc - ucp - - - - - com.oracle.database.nls - orai18n - ${oracle.jdbc.version} - compile - + + + org.utplsql + java-api + 3.1.9-SNAPSHOT + compile + + + com.oracle.ojdbc + ucp + + + com.oracle.ojdbc + ojdbc8 + + + com.oracle.ojdbc + orai18n + + + + + javax.xml.bind + jaxb-api + 2.3.1 + + + ch.qos.logback + logback-classic + 1.2.11 + + + info.picocli + picocli + 4.6.3 + + + com.oracle.database.jdbc + ojdbc8 + ${oracle.jdbc.version} + compile + + + com.oracle.database.jdbc + ucp + + + + + com.oracle.database.nls + orai18n + ${oracle.jdbc.version} + compile + - - - org.junit.jupiter - junit-jupiter - ${junit.jupiter.version} - test - - - org.hamcrest - hamcrest - 2.1 - test - + + + org.junit.jupiter + junit-jupiter + ${junit.jupiter.version} + test + + + org.hamcrest + hamcrest + 2.1 + test + - + - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - true - true - etc - lib - flat - - - org.utplsql.cli.Cli - utplsql - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - + + + + org.codehaus.mojo + appassembler-maven-plugin + 1.10 + + true + true + etc + lib + flat + + + org.utplsql.cli.Cli + utplsql + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + + **/*IT.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.0 + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + + utPLSQL-cli + false + + src/main/assembly/zip.xml + + + + + + + src/main/resources + true + + **/utplsql-cli.version + + + + src/main/resources + false - **/*IT.java + **/utplsql-cli.version - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.0 - - - - integration-test - verify - - - - - - - - src/main/resources - true - - **/utplsql-cli.version - - - - src/main/resources - false - - **/utplsql-cli.version - - - - + + + - - - utplsql-java-api - - https://packagecloud.io/utplsql/utplsql-java-api/maven2 - - - true - - - true - - - + + + utplsql-java-api + + https://packagecloud.io/utplsql/utplsql-java-api/maven2 + + + true + + + true + + + diff --git a/src/main/assembly/zip.xml b/src/main/assembly/zip.xml new file mode 100644 index 0000000..6d16b57 --- /dev/null +++ b/src/main/assembly/zip.xml @@ -0,0 +1,19 @@ + + + zip + + false + + + zip + + + + + ${project.build.directory}/appassembler + /utPLSQL-cli + + + From 1479bc3cfb38e1c9fc8272ef77624a8487e2abf6 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 13:12:53 +0200 Subject: [PATCH 028/133] Temporarily removed the cache because of GitHub issue 503 --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22e880f..ae630f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,6 @@ jobs: with: distribution: 'adopt' java-version: ${{matrix.jdk}} - cache: 'maven' - name: Install utplsql run: .travis/install_utplsql.sh From cbfc3ef008c334803591842c228c372dfd504c55 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 13:30:32 +0200 Subject: [PATCH 029/133] Added Gitflow plugin and cleaned up Action scripts --- .github/workflows/build.yml | 6 ++---- .github/workflows/release.yml | 2 -- pom.xml | 8 ++++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae630f2..09f98bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,10 +67,8 @@ jobs: - name: Install demo project run: .travis/install_demo_project.sh - - name: Build - run: mvn package -DskipTests - - name: Test - run: mvn package verify jar:jar appassembler:assemble + - name: Build and Test + run: mvn verify jar:jar appassembler:assemble slack-workflow-status: if: always() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96e5ead..7a46167 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,8 +67,6 @@ jobs: - name: Install demo project run: .travis/install_demo_project.sh - - name: Build - run: mvn package -DskipTests - name: Test run: mvn verify appassembler:assemble assembly:single diff --git a/pom.xml b/pom.xml index 3f25f3a..e2b4020 100644 --- a/pom.xml +++ b/pom.xml @@ -145,6 +145,14 @@ + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.18.0 + + true + + From 99b10582deeb9e9dc28f2431257cea1e4decd36b Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 13:35:09 +0200 Subject: [PATCH 030/133] Only necessary steps to release --- .github/workflows/release.yml | 51 +++-------------------------------- 1 file changed, 3 insertions(+), 48 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a46167..415548c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,49 +7,10 @@ on: workflow_dispatch: - repository_dispatch: - types: [utPLSQL-build,utPLSQL-java-api-build] - -defaults: - run: - shell: bash - jobs: build: - name: Test on JDK ${{ matrix.jdk }} with utPLSQL ${{ matrix.utplsql_version }} - runs-on: ubuntu-latest - env: - ORACLE_VERSION: "gvenzl/oracle-xe:18.4.0-slim" - UTPLSQL_VERSION: ${{matrix.utplsql_version}} - UTPLSQL_FILE: ${{matrix.utplsql_file}} - ORACLE_PASSWORD: oracle - DB_URL: "127.0.0.1:1521:XE" - DB_USER: app - DB_PASS: app - strategy: - fail-fast: false - matrix: - utplsql_version: ["v3.0.1","v3.0.2","v3.0.3","v3.0.4","v3.1.1","v3.1.2","v3.1.3","v3.1.6","v3.1.7","v3.1.8","v3.1.9","v3.1.10","v3.1.11","develop"] - utplsql_file: ["utPLSQL"] - jdk: ['8'] - include: - - utplsql_version: "v3.0.0" - jdk: '8' - utplsql_file: "utPLSQLv3.0.0" - services: - oracle: - image: gvenzl/oracle-xe:18.4.0-slim - env: - ORACLE_PASSWORD: oracle - ports: - - 1521:1521 - options: >- - --health-cmd healthcheck.sh - --health-interval 10s - --health-timeout 5s - --health-retries 10 - --name oracle + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -61,14 +22,8 @@ jobs: java-version: ${{matrix.jdk}} cache: 'maven' - - name: Install utplsql - run: .travis/install_utplsql.sh - - - name: Install demo project - run: .travis/install_demo_project.sh - - - name: Test - run: mvn verify appassembler:assemble assembly:single + - name: Build Release + run: mvn package appassembler:assemble assembly:single -DskipTests slack-workflow-status: if: always() From a0ced5b321ca73c9aef358e9c5d8fcce3d517c96 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 13:36:54 +0200 Subject: [PATCH 031/133] Updated pom.xml --- pom.xml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e2b4020..71a66c9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,10 +5,10 @@ org.utplsql cli 3.1.9-SNAPSHOT - jar - cli - http://maven.apache.org + utPLSQL CLI + CLI for running Unit Tests with utPLSQL v3+. + https://github.com/utPLSQL/utPLSQL-cli UTF-8 @@ -19,6 +19,14 @@ local + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + org.utplsql @@ -87,7 +95,6 @@ 2.1 test - From ea9cd3659954284bd4711c429daaf25a9d64f415 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 13:46:49 +0200 Subject: [PATCH 032/133] Configured release plugin --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 15 +++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09f98bb..872bb55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,11 +1,11 @@ name: Build and test on: push: - branches: [ develop, feature/github_actions ] - tags: - - v* + branches: [ * ] + pull_request: branches: [ develop ] + workflow_dispatch: repository_dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 415548c..d7d9699 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,14 +1,15 @@ name: Release + on: push: - branches: [ main ] tags: - - v* + - "v*.*.*" workflow_dispatch: jobs: - build: + + release: runs-on: ubuntu-latest @@ -23,7 +24,13 @@ jobs: cache: 'maven' - name: Build Release - run: mvn package appassembler:assemble assembly:single -DskipTests + run: mvn package appassembler:assemble assembly:single -DskipTests + + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: | + target/utPLSQL-cli.zip slack-workflow-status: if: always() From ca7feda94f3f4b5d494849a38c74af177042bce7 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 13:48:05 +0200 Subject: [PATCH 033/133] Fixed syntax error --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 872bb55..580d3e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: Build and test on: push: - branches: [ * ] + branches: [ '*' ] pull_request: branches: [ develop ] From 0d7aa96d1938c6595e278548f48646cd04cb40a3 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 13:50:05 +0200 Subject: [PATCH 034/133] Fixed syntax error --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 580d3e6..9540ee2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: Build and test + on: push: - branches: [ '*' ] pull_request: branches: [ develop ] From fe58840502e47d07cf3cbe61ca31503b4ce6e9e0 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:04:03 +0200 Subject: [PATCH 035/133] Defined main branch --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 71a66c9..75b31e6 100644 --- a/pom.xml +++ b/pom.xml @@ -158,6 +158,7 @@ 1.18.0 true + main From 0908a3eacfef1798bc1abe198a71b17a887fd89a Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:05:05 +0200 Subject: [PATCH 036/133] Defined main branch --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75b31e6..f344a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,9 @@ 1.18.0 true - main + + main + From 4ec2e6afc5634001505b7ed3f6db0ed0b0bc8755 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:06:04 +0200 Subject: [PATCH 037/133] Release instead of snapshot version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f344a4e..e3d0350 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.utplsql java-api - 3.1.9-SNAPSHOT + 3.1.9 compile From 9b786812fd1f434425b981d13b94f2c61d826ee9 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:06:22 +0200 Subject: [PATCH 038/133] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3d0350..84f406d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9-SNAPSHOT + 3.1.9 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 1877fe237219c9e8633cd3230f7a0a56adad9ac7 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:06:24 +0200 Subject: [PATCH 039/133] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84f406d..dedc398 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9 + 3.1.10-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From bba5698d847be7a1e8fe85cfcfd0f2dca9c70978 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:08:08 +0200 Subject: [PATCH 040/133] Tags are in the format *.*.* --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7d9699..78ba5b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: tags: - - "v*.*.*" + - "*.*.*" workflow_dispatch: From 5ed96ae156878153f4b2ae9df65c1465673467e0 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:08:28 +0200 Subject: [PATCH 041/133] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dedc398..84f406d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.10-SNAPSHOT + 3.1.9 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 9ee8b60b8667558a07c059ec53a25baa985ac5b4 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:10:20 +0200 Subject: [PATCH 042/133] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84f406d..dedc398 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9 + 3.1.10-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 35c5365dbcd12ac8997054844e3fcb9cf6e3f2a9 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:11:25 +0200 Subject: [PATCH 043/133] updated needs job --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 78ba5b4..2dfb1d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: slack-workflow-status: if: always() name: Post Workflow Status To Slack - needs: [ build ] + needs: [ release ] runs-on: ubuntu-latest steps: - name: Slack Workflow Notification From fab941ad10cdd274fa514d401e45d05b8886048a Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:12:20 +0200 Subject: [PATCH 044/133] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dedc398..84f406d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.10-SNAPSHOT + 3.1.9 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From cb219edece8a96e894c4bdfd876d8692f2187fc0 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:12:22 +0200 Subject: [PATCH 045/133] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84f406d..dedc398 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9 + 3.1.10-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 274aedeaca79e2adcf4f99e6388a3aa917aa169d Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:44:27 +0200 Subject: [PATCH 046/133] Set version to 8 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2dfb1d3..0a802be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: ${{matrix.jdk}} + java-version: 8 cache: 'maven' - name: Build Release From 1249de7e9e98903367eca1b7c2b85fc2c853decc Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:45:12 +0200 Subject: [PATCH 047/133] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dedc398..84f406d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.10-SNAPSHOT + 3.1.9 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From ea252d981ed4d27da13e0ffe071ae7ec6946a55f Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:45:14 +0200 Subject: [PATCH 048/133] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84f406d..dedc398 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9 + 3.1.10-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 277d391be30a3f4e7c631d1b3a81e93a23405017 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:52:04 +0200 Subject: [PATCH 049/133] Temporarily removed cache as GitHub actions still have issues. --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a802be..334e75b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,6 @@ jobs: with: distribution: 'adopt' java-version: 8 - cache: 'maven' - name: Build Release run: mvn package appassembler:assemble assembly:single -DskipTests From d2697003662f29794dc608021264204c42b90f2e Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:52:25 +0200 Subject: [PATCH 050/133] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dedc398..84f406d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.10-SNAPSHOT + 3.1.9 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 61d2ff0ae0d4bb92bf0c5f50b125655a4ad4eb24 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 14:52:27 +0200 Subject: [PATCH 051/133] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84f406d..dedc398 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9 + 3.1.10-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 34d439339d188d5250507dd5dca3f65c508dac69 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 15:08:30 +0200 Subject: [PATCH 052/133] Added checksum plugin --- pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index dedc398..b52b2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -152,6 +152,24 @@ + + net.nicoulaj.maven.plugins + checksum-maven-plugin + 1.10 + + + + ${project.build.directory} + + utPLSQL-cli.zip + + + + + MD5 + + + com.amashchenko.maven.plugin gitflow-maven-plugin From ede1339c92bcdcee38609729c9f5da6cbfffacfe Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 15:09:27 +0200 Subject: [PATCH 053/133] Added md5 file --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 334e75b..a253166 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,7 @@ jobs: with: files: | target/utPLSQL-cli.zip + target/utPLSQL-cli.zip.md5 slack-workflow-status: if: always() From 220cc7f02e5f82e999b16521af4e2265398a27ca Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 15:09:46 +0200 Subject: [PATCH 054/133] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b52b2d2..f322df9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.10-SNAPSHOT + 3.1.9 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From c80773cacebdb68e35ed4d2f08b097bf6f3ecab1 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 15:09:49 +0200 Subject: [PATCH 055/133] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f322df9..b52b2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9 + 3.1.10-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 7ba921fa6ef9093e2d3f521c85e7b32e8db10d44 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 15:17:12 +0200 Subject: [PATCH 056/133] added checksum:files goal --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a253166..bf6c098 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: java-version: 8 - name: Build Release - run: mvn package appassembler:assemble assembly:single -DskipTests + run: mvn package appassembler:assemble assembly:single checksum:files -DskipTests - name: Release uses: softprops/action-gh-release@v1 From d5063669249aacb8e0c3ac87733a60f0c7832c64 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 15:17:33 +0200 Subject: [PATCH 057/133] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b52b2d2..f322df9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.10-SNAPSHOT + 3.1.9 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 328a60705e0431ad66eb01d3da5951e6019cd1d6 Mon Sep 17 00:00:00 2001 From: Simon Martinelli Date: Mon, 13 Jun 2022 15:17:35 +0200 Subject: [PATCH 058/133] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f322df9..b52b2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.9 + 3.1.10-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 2551303b337b84afd0b92d21525be71b9b26cd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 15 Jul 2022 07:15:00 +0100 Subject: [PATCH 059/133] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ba9fe0f..fcb6dee 100644 --- a/README.md +++ b/README.md @@ -116,9 +116,11 @@ utplsql run "my/Username"/"myP@ssword"@connectstring If only schema is provided, then all suites owner by that schema are executed. If -p is omitted, the current schema is used. ---tags=tags - A comma separated list of tags to run. - Format: --tags=tag1[,tag2[,tag3]] - +--tags=tags - A comma separated list of tags to include or exclude in the run. + The excluded tags must be preceeded by a `-` (minus) sign and the entire expression must be surrounded by escaped doubleqotes in command line. + Format: --tags=tag1[,tag2,...,tagN] + or + Format: --tags=\"-tag1\"[,\"-tag2\",...,tagN] -f=format - A reporter to be used for reporting. (--format) If no -f option is provided, the default ut_documentation_reporter is used. See reporters command for possible values From c43d7897138a8bbbac54c01d735b78b4c78792b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:12:21 +0000 Subject: [PATCH 060/133] Bump ch.qos.logback:logback-classic from 1.2.11 to 1.2.13 Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.11 to 1.2.13. - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.11...v_1.2.13) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b52b2d2..3a22ed2 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ ch.qos.logback logback-classic - 1.2.11 + 1.2.13 info.picocli From 87dbd2cb2a96c94d177487a754576f0231aac159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 16:02:17 +0200 Subject: [PATCH 061/133] Update of Github action Actions versions --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9540ee2..01131b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: utplsql_file: "utPLSQLv3.0.0" services: oracle: - image: gvenzl/oracle-xe:18.4.0-slim + image: gvenzl/ooci-oracle-free:slim-faststart env: ORACLE_PASSWORD: oracle ports: @@ -53,10 +53,10 @@ jobs: --name oracle steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: ${{matrix.jdk}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf6c098..b2e8c1b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: 8 @@ -26,7 +26,7 @@ jobs: run: mvn package appassembler:assemble assembly:single checksum:files -DskipTests - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2.6 with: files: | target/utPLSQL-cli.zip From d6d337944942651be27bc89f49713380c13c205b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 16:19:36 +0200 Subject: [PATCH 062/133] Update of docker DB version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01131b1..759c094 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: utplsql_file: "utPLSQLv3.0.0" services: oracle: - image: gvenzl/ooci-oracle-free:slim-faststart + image: gvenzl/oracle-free:23-slim-faststart env: ORACLE_PASSWORD: oracle ports: From 5f8ebdb5217e7e2b6a8afd2702a3d4227fed7190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 16:35:44 +0200 Subject: [PATCH 063/133] Update of deployment scripts --- .../scripts}/create_api_user.sh | 0 .../scripts}/create_release.sh | 0 .../scripts}/install_demo_project.sh | 0 .../scripts}/install_utplsql.sh | 0 .github/workflows/build.yml | 9 +- .travis.yml | 87 ------------------- .travis/start_db.sh | 14 --- 7 files changed, 4 insertions(+), 106 deletions(-) rename {.travis => .github/scripts}/create_api_user.sh (100%) rename {.travis => .github/scripts}/create_release.sh (100%) rename {.travis => .github/scripts}/install_demo_project.sh (100%) rename {.travis => .github/scripts}/install_utplsql.sh (100%) delete mode 100644 .travis.yml delete mode 100755 .travis/start_db.sh diff --git a/.travis/create_api_user.sh b/.github/scripts/create_api_user.sh similarity index 100% rename from .travis/create_api_user.sh rename to .github/scripts/create_api_user.sh diff --git a/.travis/create_release.sh b/.github/scripts/create_release.sh similarity index 100% rename from .travis/create_release.sh rename to .github/scripts/create_release.sh diff --git a/.travis/install_demo_project.sh b/.github/scripts/install_demo_project.sh similarity index 100% rename from .travis/install_demo_project.sh rename to .github/scripts/install_demo_project.sh diff --git a/.travis/install_utplsql.sh b/.github/scripts/install_utplsql.sh similarity index 100% rename from .travis/install_utplsql.sh rename to .github/scripts/install_utplsql.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 759c094..d194de9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,11 +20,9 @@ jobs: name: Test on JDK ${{ matrix.jdk }} with utPLSQL ${{ matrix.utplsql_version }} runs-on: ubuntu-latest env: - ORACLE_VERSION: "gvenzl/oracle-xe:18.4.0-slim" UTPLSQL_VERSION: ${{matrix.utplsql_version}} UTPLSQL_FILE: ${{matrix.utplsql_file}} - ORACLE_PASSWORD: oracle - DB_URL: "127.0.0.1:1521:XE" + DB_URL: "127.0.0.1:1521:FREEPDB1" DB_USER: app DB_PASS: app @@ -43,6 +41,7 @@ jobs: image: gvenzl/oracle-free:23-slim-faststart env: ORACLE_PASSWORD: oracle + SERVICE_NAME: FREEPDB1 ports: - 1521:1521 options: >- @@ -62,10 +61,10 @@ jobs: java-version: ${{matrix.jdk}} - name: Install utplsql - run: .travis/install_utplsql.sh + run: .github/scripts/install_utplsql.sh - name: Install demo project - run: .travis/install_demo_project.sh + run: .github/scripts/install_demo_project.sh - name: Build and Test run: mvn verify jar:jar appassembler:assemble diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 76b64a0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,87 +0,0 @@ -sudo: required -language: java - -services: - - docker - -jdk: - - openjdk8 - -env: - global: - - DOCKER_CFG=$HOME/.docker - - DOCKER_REPO="utplsqlv3/oracledb" - - CACHE_DIR=$HOME/.cache - - MAVEN_HOME=/usr/local/maven - - MAVEN_CFG=$HOME/.m2 - - DB_URL="127.0.0.1:1521:XE" - - DB_USER=app - - DB_PASS=app - - ORACLE_VERSION="11g-r2-xe" - - DOCKER_OPTIONS="--shm-size=1g" - - UTPLSQL_FILE="utPLSQL" - matrix: - - UTPLSQL_VERSION="v3.0.0" - UTPLSQL_FILE="utPLSQLv3.0.0" - - UTPLSQL_VERSION="v3.0.1" - - UTPLSQL_VERSION="v3.0.2" - - UTPLSQL_VERSION="v3.0.3" - - UTPLSQL_VERSION="v3.0.4" - - UTPLSQL_VERSION="v3.1.1" - - UTPLSQL_VERSION="v3.1.2" - - UTPLSQL_VERSION="v3.1.3" - - UTPLSQL_VERSION="v3.1.6" - - UTPLSQL_VERSION="v3.1.7" - - UTPLSQL_VERSION="v3.1.8" - - UTPLSQL_VERSION="develop" - UTPLSQL_FILE="utPLSQL" - -cache: - directories: - - $DOCKER_CFG - - $CACHE_DIR - - $MAVEN_CFG - -install: - - bash .travis/start_db.sh - - bash .travis/install_utplsql.sh - - bash .travis/install_demo_project.sh - -script: - - mvn package -DskipTests - - mvn package verify jar:jar appassembler:assemble - -before_deploy: - - bash .travis/create_release.sh - - if [ ! -z "$TRAVIS_TAG" ]; then VERSION=$(tr -d "/v/" <<<$TRAVIS_TAG); mvn org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=${VERSION}; fi - -deploy: - - provider: releases - api_key: $GITHUB_API_TOKEN - file: - - utPLSQL-cli.zip - - utPLSQL-cli.zip.md5 - skip_cleanup: true - on: - repository: utPLSQL/utPLSQL-cli - tags: true - # Use only first job "#xxx.1" to publish artifacts - condition: "${TRAVIS_JOB_NUMBER} =~ \\.1$" - - provider: bintray - file: bintray.json - user: ${BINTRAY_USER} - key: ${BINTRAY_API_KEY} - dry-run: false - skip_cleanup: true - on: - repository: utPLSQL/utPLSQL-cli - branch: develop - # Use only first job "#xxx.1" to publish artifacts - condition: "${TRAVIS_JOB_NUMBER} =~ \\.1$" - -notifications: - slack: - rooms: - - secure: "jTPq4AcWQdWp1rB175c05ei/1lXZF1DBoqiKl9PPe7f8vqXS2QLPXMwGTEkZ1YnqL2MPZMB+50Gw5RhLKQ+t+9pN7ejLO0D8ULi1e96PDU5ZL5pNvRglH6U/lR5iT1CjELUuraDXDJ98Vu4gluLMiwTtFYQhNrOoA2V84L+8fF7rGjbGl4/zOXA9RQ4YAcOomJesb4vE7BCjhDjUuMW43xjNWg2s0WAiF+fC1HY/tsBMb1CGfpVULnO5ES5bKtUv/aGtySzH0vXilGDUvhZ/8mdaRn6uxpzcqrFdAyW8elSD28CypcYoxy6Myudw3SFiRPs0/Z02VXvm8DQtU/lcFEnaO7dMG+FpFhsWbrEjcRS6R7ve8uc7e/WuaQhtNVzSTOzRe+JFPGP9FOcYN+AcW2NJFILV9yT7+X/MPIB0OMxuwaPmVgtoyx0oec2nw05azmDr76P2e1XLnKtxa8ouwvPx8EMgApnXSR6VmLGu/w8nmtvIWjEAJ88cdGhwBagtyAsn2frzHq8aKpMziDRYvw4ivwGAeHJFsDtdRXzSbxhxmjl6+is3P0g0iAfojQ/Pzd4GugSYwqRQLLE7dUE0FAKXhKAAQAkjRZxik2+w6jgG8PuLuHdR4pm7C9srL+WAX8aFq/RQXE7BoIdqiZ5TMekw8d6eCRTjcRHsa3pPAd0=" - on_success: change - on_failure: always diff --git a/.travis/start_db.sh b/.travis/start_db.sh deleted file mode 100755 index 2367d64..0000000 --- a/.travis/start_db.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -ev - -# If docker credentials are not cached, do the login. -if [ ! -f $DOCKER_CFG/config.json ]; then - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" -else - echo "Using docker login from cache..." -fi - -# Pull the specified db version from docker hub. -docker pull $DOCKER_REPO:$ORACLE_VERSION -docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKER_REPO:$ORACLE_VERSION -docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered From abad5e99d42800c138defa847e83ef1e19314143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 16:37:12 +0200 Subject: [PATCH 064/133] Update of deployment scripts --- .github/scripts/create_api_user.sh | 2 +- .github/scripts/install_demo_project.sh | 6 +++--- .github/scripts/install_utplsql.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/create_api_user.sh b/.github/scripts/create_api_user.sh index c898f15..bc8edde 100755 --- a/.github/scripts/create_api_user.sh +++ b/.github/scripts/create_api_user.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ev -sqlplus -S -L sys/oracle@//127.0.0.1:1521/xe AS SYSDBA < demo_project.sh.tmp < install.sh.tmp < Date: Mon, 16 Mar 2026 16:54:27 +0200 Subject: [PATCH 065/133] Update of deployment scripts --- .github/scripts/create_api_user.sh | 2 +- .github/scripts/install_demo_project.sh | 6 +++--- .github/scripts/install_utplsql.sh | 2 +- .github/workflows/build.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/scripts/create_api_user.sh b/.github/scripts/create_api_user.sh index bc8edde..853a1a6 100755 --- a/.github/scripts/create_api_user.sh +++ b/.github/scripts/create_api_user.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ev -sqlplus -S -L sys/oracle@//127.0.0.1:1521/${SERVICE_NAME} AS SYSDBA < demo_project.sh.tmp < install.sh.tmp < Date: Mon, 16 Mar 2026 17:07:23 +0200 Subject: [PATCH 066/133] Update of deployment scripts --- .github/scripts/install_demo_project.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/scripts/install_demo_project.sh b/.github/scripts/install_demo_project.sh index 4a98b2e..0acb2f2 100755 --- a/.github/scripts/install_demo_project.sh +++ b/.github/scripts/install_demo_project.sh @@ -7,6 +7,7 @@ git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL-demo-pro cat > demo_project.sh.tmp < Date: Mon, 16 Mar 2026 17:11:51 +0200 Subject: [PATCH 067/133] Update of deployment scripts --- .github/workflows/build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4026c3e..d198cd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,19 +23,15 @@ jobs: UTPLSQL_VERSION: ${{matrix.utplsql_version}} UTPLSQL_FILE: ${{matrix.utplsql_file}} DB_URL: "localhost:1521/FREEPDB1" - DB_USER: app - DB_PASS: app + DB_USER: APP + DB_PASS: APP strategy: fail-fast: false matrix: - utplsql_version: ["v3.0.1","v3.0.2","v3.0.3","v3.0.4","v3.1.1","v3.1.2","v3.1.3","v3.1.6","v3.1.7","v3.1.8","v3.1.9","v3.1.10","v3.1.11","develop"] + utplsql_version: ["v3.1.11","v3.1.12","v3.1.13","v3.1.14","develop"] utplsql_file: ["utPLSQL"] jdk: ['8'] - include: - - utplsql_version: "v3.0.0" - jdk: '8' - utplsql_file: "utPLSQLv3.0.0" services: oracle: image: gvenzl/oracle-free:23-slim-faststart From 36dd7911c689193f1784dc8a36147a5578a835a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 16 Mar 2026 17:19:30 +0200 Subject: [PATCH 068/133] Update of deployment scripts --- .github/scripts/install_demo_project.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/scripts/install_demo_project.sh b/.github/scripts/install_demo_project.sh index 0acb2f2..9a83ed0 100755 --- a/.github/scripts/install_demo_project.sh +++ b/.github/scripts/install_demo_project.sh @@ -8,8 +8,13 @@ git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL-demo-pro cat > demo_project.sh.tmp < Date: Tue, 14 Apr 2026 11:30:02 +0300 Subject: [PATCH 069/133] Fixing build pipeline. --- .github/scripts/install_demo_project.sh | 56 ++++++++++++------------- .github/workflows/build.yml | 2 +- pom.xml | 7 ---- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/.github/scripts/install_demo_project.sh b/.github/scripts/install_demo_project.sh index 9a83ed0..e244f55 100755 --- a/.github/scripts/install_demo_project.sh +++ b/.github/scripts/install_demo_project.sh @@ -5,36 +5,36 @@ cd $(dirname $(readlink -f $0)) PROJECT_FILE="utPLSQL-demo-project" git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL-demo-project.git -cat > demo_project.sh.tmp < demo_project.sh.tmp <<- EOF + sqlplus -S -L sys/oracle@//localhost:1521/${SERVICE_NAME} AS SYSDBA <<- SQL + PROMPT Creating Database User ${DB_USER} + PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; + PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; + PROMPT grant connect to ${DB_USER}; + PROMPT grant select any dictionary to ${DB_USER}; + create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; + grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; + grant connect to ${DB_USER}; + grant select any dictionary to ${DB_USER}; + exit + SQL -cd /${PROJECT_FILE} -sqlplus -S -L ${DB_USER}/${DB_PASS}@//localhost:1521/${SERVICE_NAME} < org.apache.maven.plugins maven-failsafe-plugin - - - ${dbUrl} - ${dbUser} - ${dbPass} - - From 322c6d2bc4f89a5c0042d66f2ef44e751cf87e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 11:55:51 +0300 Subject: [PATCH 070/133] Fixing build pipeline. --- .github/scripts/create_api_user.sh | 2 +- .github/scripts/install_demo_project.sh | 6 +++--- .github/scripts/install_utplsql.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/create_api_user.sh b/.github/scripts/create_api_user.sh index 853a1a6..16328cd 100755 --- a/.github/scripts/create_api_user.sh +++ b/.github/scripts/create_api_user.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ev -sqlplus -S -L sys/oracle@//localhost:1521/${SERVICE_NAME} AS SYSDBA < demo_project.sh.tmp <<- EOF - sqlplus -S -L sys/oracle@//localhost:1521/${SERVICE_NAME} AS SYSDBA <<- SQL + sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA <<- SQL PROMPT Creating Database User ${DB_USER} PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; @@ -20,7 +20,7 @@ cat > demo_project.sh.tmp <<- EOF SQL cd /${PROJECT_FILE} - sqlplus -S -L ${DB_USER}/${DB_PASS}@//localhost:1521/${SERVICE_NAME} <<- SQL + sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL whenever sqlerror exit failure rollback whenever oserror exit failure rollback PROMPT Installing sources of demo project into schema ${DB_USER} @@ -28,7 +28,7 @@ cat > demo_project.sh.tmp <<- EOF exit SQL - sqlplus -S -L ${DB_USER}/${DB_PASS}@//localhost:1521/${SERVICE_NAME} <<- SQL + sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL whenever sqlerror exit failure rollback whenever oserror exit failure rollback PROMPT Installing tests for demo project into schema ${DB_USER} diff --git a/.github/scripts/install_utplsql.sh b/.github/scripts/install_utplsql.sh index a2943b3..8aee546 100755 --- a/.github/scripts/install_utplsql.sh +++ b/.github/scripts/install_utplsql.sh @@ -15,7 +15,7 @@ chmod -R go+w ./${UTPLSQL_FILE}/{source,examples} # Create a temporary install script. cat > install.sh.tmp < Date: Tue, 14 Apr 2026 12:03:38 +0300 Subject: [PATCH 071/133] Investigation of pipeline issue --- .github/scripts/create_api_user.sh | 9 ++------- .github/scripts/install_demo_project.sh | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/scripts/create_api_user.sh b/.github/scripts/create_api_user.sh index 16328cd..b9452e2 100755 --- a/.github/scripts/create_api_user.sh +++ b/.github/scripts/create_api_user.sh @@ -1,17 +1,12 @@ #!/bin/bash set -ev +echo Running command: sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA < demo_project.sh.tmp <<- EOF sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA <<- SQL + PROMPT Connected to ${DB_URL} PROMPT Creating Database User ${DB_USER} PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; @@ -23,6 +24,7 @@ cat > demo_project.sh.tmp <<- EOF sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL whenever sqlerror exit failure rollback whenever oserror exit failure rollback + PROMPT Connected to ${DB_URL} PROMPT Installing sources of demo project into schema ${DB_USER} @source/install.sql exit @@ -31,6 +33,7 @@ cat > demo_project.sh.tmp <<- EOF sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL whenever sqlerror exit failure rollback whenever oserror exit failure rollback + PROMPT Connected to ${DB_URL} PROMPT Installing tests for demo project into schema ${DB_USER} @test/install.sql exit From 51066dd098f0151d5efa31d93455db238f79b403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 12:09:35 +0300 Subject: [PATCH 072/133] Investigation of pipeline issue --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1827681..facbb04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,9 @@ jobs: image: gvenzl/oracle-free:23-slim-faststart env: ORACLE_PASSWORD: oracle - SERVICE_NAME: FREEPDB1 + DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: APP + DB_PASS: APP ports: - 1521:1521 options: >- From 16bc3350298fb50f68204ab7432dfecbd0a99e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 12:23:02 +0300 Subject: [PATCH 073/133] Fixing issue with install script --- .github/scripts/install_demo_project.sh | 60 ++++++++++++------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/scripts/install_demo_project.sh b/.github/scripts/install_demo_project.sh index 38754e5..360943c 100755 --- a/.github/scripts/install_demo_project.sh +++ b/.github/scripts/install_demo_project.sh @@ -6,38 +6,38 @@ PROJECT_FILE="utPLSQL-demo-project" git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL-demo-project.git cat > demo_project.sh.tmp <<- EOF - sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA <<- SQL - PROMPT Connected to ${DB_URL} - PROMPT Creating Database User ${DB_USER} - PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; - PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; - PROMPT grant connect to ${DB_USER}; - PROMPT grant select any dictionary to ${DB_USER}; - create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; - grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; - grant connect to ${DB_USER}; - grant select any dictionary to ${DB_USER}; - exit - SQL +sqlplus -S -L sys/oracle@${DB_URL} AS SYSDBA <<- SQL + PROMPT Connected to ${DB_URL} + PROMPT Creating Database User ${DB_USER} + PROMPT create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; + PROMPT grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; + PROMPT grant connect to ${DB_USER}; + PROMPT grant select any dictionary to ${DB_USER}; + create user ${DB_USER} identified by ${DB_PASS} quota unlimited on USERS default tablespace USERS; + grant create session, create procedure, create type, create table, create sequence, create view to ${DB_USER}; + grant connect to ${DB_USER}; + grant select any dictionary to ${DB_USER}; + exit +SQL - cd /${PROJECT_FILE} - sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL - whenever sqlerror exit failure rollback - whenever oserror exit failure rollback - PROMPT Connected to ${DB_URL} - PROMPT Installing sources of demo project into schema ${DB_USER} - @source/install.sql - exit - SQL +cd /${PROJECT_FILE} +sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL + whenever sqlerror exit failure rollback + whenever oserror exit failure rollback + PROMPT Connected to ${DB_URL} + PROMPT Installing sources of demo project into schema ${DB_USER} + @source/install.sql + exit +SQL - sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL - whenever sqlerror exit failure rollback - whenever oserror exit failure rollback - PROMPT Connected to ${DB_URL} - PROMPT Installing tests for demo project into schema ${DB_USER} - @test/install.sql - exit - SQL +sqlplus -S -L ${DB_USER}/${DB_PASS}@${DB_URL} <<- SQL + whenever sqlerror exit failure rollback + whenever oserror exit failure rollback + PROMPT Connected to ${DB_URL} + PROMPT Installing tests for demo project into schema ${DB_USER} + @test/install.sql +exit +SQL EOF docker cp ./${PROJECT_FILE} oracle:/${PROJECT_FILE} From 9ffe1dcd3336bca3cb78fa2efe6ef2304cbeff65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 13:00:56 +0300 Subject: [PATCH 074/133] Fixing issue with build process --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index facbb04..01ab755 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: run: .github/scripts/install_demo_project.sh - name: Build and Test - run: mvn verify jar:jar appassembler:assemble + run: mvn verify appassembler:assemble slack-workflow-status: if: always() From e2d5697098ca3f9cd4ec5f4e2c919449a42ee27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 13:53:48 +0300 Subject: [PATCH 075/133] Adding JDK 11 and 17 to build and test process --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01ab755..0a3211f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: matrix: utplsql_version: ["v3.1.11","v3.1.12","v3.1.13","v3.1.14","develop"] utplsql_file: ["utPLSQL"] - jdk: ['8'] + jdk: ['8', '11', '17'] services: oracle: image: gvenzl/oracle-free:23-slim-faststart diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2e8c1b..bd819e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: tags: - - "*.*.*" + - "v*.*.*" workflow_dispatch: From 43effbeb15f834f7f77043882089c18e5de6359f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 13:58:45 +0300 Subject: [PATCH 076/133] Update JDBC version to 19.6.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a07e501..72c2cab 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.8 1.8 5.5.2 - 19.3.0.0 + 19.6.0.0 local From 68958d50fca0031f1543f0cccc10d2ffe0bf1f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 14:01:09 +0300 Subject: [PATCH 077/133] Update JDBC version to 21.9.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 72c2cab..d637161 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.8 1.8 5.5.2 - 19.6.0.0 + 21.9.0.0 local From 2d08c432564740fcad9b75419d6d672cbd191ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 14:09:36 +0300 Subject: [PATCH 078/133] Switching to newer java versions --- .github/workflows/build.yml | 4 ++-- pom.xml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a3211f..b0af34d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,9 +29,9 @@ jobs: strategy: fail-fast: false matrix: - utplsql_version: ["v3.1.11","v3.1.12","v3.1.13","v3.1.14","develop"] + utplsql_version: ["v3.1.14","develop"] utplsql_file: ["utPLSQL"] - jdk: ['8', '11', '17'] + jdk: ['8', '11', '17','21','25'] services: oracle: image: gvenzl/oracle-free:23-slim-faststart diff --git a/pom.xml b/pom.xml index d637161..4225ade 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,7 @@ UTF-8 - 1.8 - 1.8 + 11 5.5.2 21.9.0.0 local From d37d7853625d7fb62228a5124708d7d390708295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 14:50:29 +0300 Subject: [PATCH 079/133] Attempting to fix Java11+ compatibility issue. --- .../InitializableOracleDataSource.java | 92 +++++++++++++++++-- 1 file changed, 82 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java b/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java index db32b1a..711e115 100644 --- a/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java +++ b/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java @@ -2,31 +2,103 @@ import oracle.jdbc.pool.OracleDataSource; +import javax.sql.DataSource; +import java.io.PrintWriter; import java.sql.CallableStatement; import java.sql.Connection; +import java.sql.ConnectionBuilder; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.util.logging.Logger; -public class InitializableOracleDataSource extends OracleDataSource { +public class InitializableOracleDataSource implements DataSource { + private final OracleDataSource delegate; private String initSql; public InitializableOracleDataSource() throws SQLException { + this.delegate = new OracleDataSource(); } + // --- URL / credentials passthrough (mirrors what callers used before) --- + + public void setURL(String url) throws SQLException { + delegate.setURL(url); + } + + public void setUser(String user) { + delegate.setUser(user); + } + + public void setPassword(String password) { + delegate.setPassword(password); + } + + // --- Core DataSource methods --- + @Override public Connection getConnection() throws SQLException { - Connection con = super.getConnection(); - - if ( initSql != null && !initSql.isEmpty() ) { - try (CallableStatement stmt = con.prepareCall(initSql)) { - stmt.execute(); - } - } + Connection con = delegate.getConnection(); + runInitSql(con); + return con; + } + @Override + public Connection getConnection(String username, String password) throws SQLException { + Connection con = delegate.getConnection(username, password); + runInitSql(con); return con; } - public void setConnectionInitSql( String sql ) { + public void setConnectionInitSql(String sql) { this.initSql = sql; } -} + + // --- DataSource boilerplate --- + + @Override + public PrintWriter getLogWriter() throws SQLException { + return delegate.getLogWriter(); + } + + @Override + public void setLogWriter(PrintWriter out) throws SQLException { + delegate.setLogWriter(out); + } + + @Override + public void setLoginTimeout(int seconds) throws SQLException { + delegate.setLoginTimeout(seconds); + } + + @Override + public int getLoginTimeout() throws SQLException { + return delegate.getLoginTimeout(); + } + + @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + return delegate.getParentLogger(); + } + + @Override + public T unwrap(Class iface) throws SQLException { + if (iface.isInstance(delegate)) return iface.cast(delegate); + return delegate.unwrap(iface); + } + + @Override + public boolean isWrapperFor(Class iface) throws SQLException { + return iface.isInstance(delegate) || delegate.isWrapperFor(iface); + } + + // --- Private helpers --- + + private void runInitSql(Connection con) throws SQLException { + if (initSql != null && !initSql.isEmpty()) { + try (CallableStatement stmt = con.prepareCall(initSql)) { + stmt.execute(); + } + } + } +} \ No newline at end of file From 805595ea2d8de70dd255c50ae7c35d0c2896840f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 14:57:20 +0300 Subject: [PATCH 080/133] Attempting to fix Java11+ compatibility issue. --- .../utplsql/cli/datasource/InitializableOracleDataSource.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java b/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java index 711e115..0aa44fa 100644 --- a/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java +++ b/src/main/java/org/utplsql/cli/datasource/InitializableOracleDataSource.java @@ -6,7 +6,6 @@ import java.io.PrintWriter; import java.sql.CallableStatement; import java.sql.Connection; -import java.sql.ConnectionBuilder; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; import java.util.logging.Logger; From 871c0e2cda1678b1d64aa4978c8df67ba500d7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 15:01:18 +0300 Subject: [PATCH 081/133] Attempting to fix Java11+ compatibility issue. --- .../org/utplsql/cli/datasource/TestedDataSourceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index 8f99cf3..74b2a54 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -46,7 +46,7 @@ public DataSource getDataSource() throws SQLException { return ds; } - private void setThickOrThinJdbcUrl(OracleDataSource ds) throws SQLException { + private void setThickOrThinJdbcUrl(InitializableOracleDataSource ds) throws SQLException { List errors = new ArrayList<>(); Throwable lastException = null; From 7b5f8709d69cdd93b459bee243bfd8f4ffaa9469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 14 Apr 2026 15:01:57 +0300 Subject: [PATCH 082/133] Cleanup imports --- .../org/utplsql/cli/datasource/TestedDataSourceProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index 74b2a54..34fbb4b 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -1,6 +1,5 @@ package org.utplsql.cli.datasource; -import oracle.jdbc.pool.OracleDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.utplsql.api.EnvironmentVariableUtil; From d144c850d97e5764f03e8a73743a13c7b7771277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 21:24:52 +0300 Subject: [PATCH 083/133] Update to latest utPLSQL-java-api version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c417838..37116a1 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.utplsql java-api - 3.1.9 + 3.2.2 compile From fdaeca7422f28e1cc6e4ac4d10d89c08b6e64a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 21:31:31 +0300 Subject: [PATCH 084/133] Update to latest utPLSQL-java-api version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37116a1..5d36fe0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.utplsql - java-api + utplsql-java-api 3.2.2 compile From 9b2caa0299692e79743149f5867d1f499a0617eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 21:39:32 +0300 Subject: [PATCH 085/133] Remove JDK 8 from build process. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0af34d..c654c37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: matrix: utplsql_version: ["v3.1.14","develop"] utplsql_file: ["utPLSQL"] - jdk: ['8', '11', '17','21','25'] + jdk: ['11', '17', '21', '25'] services: oracle: image: gvenzl/oracle-free:23-slim-faststart From 1104e97585b8ab20252076de5624438e70074c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 21:40:33 +0300 Subject: [PATCH 086/133] Update pom dependencies --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 5d36fe0..cd07c75 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,11 @@ UTF-8 11 - 5.5.2 - 21.9.0.0 + 5.12.2 + 21.18.0.0 + 4.7.7 + 1.2.11 + 2.2 local @@ -31,7 +34,6 @@ org.utplsql utplsql-java-api 3.2.2 - compile com.oracle.ojdbc @@ -55,18 +57,17 @@ ch.qos.logback logback-classic - 1.2.13 + ${logback.version} info.picocli picocli - 4.6.3 + ${picocli.version} com.oracle.database.jdbc - ojdbc8 + ojdbc11 ${oracle.jdbc.version} - compile com.oracle.database.jdbc @@ -78,7 +79,6 @@ com.oracle.database.nls orai18n ${oracle.jdbc.version} - compile @@ -91,7 +91,7 @@ org.hamcrest hamcrest - 2.1 + ${hamcrest.version} test @@ -101,7 +101,7 @@ org.codehaus.mojo appassembler-maven-plugin - 1.10 + 2.1.0 true true @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + 3.5.5 **/*IT.java @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + 3.5.5 @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.8.0 utPLSQL-cli false @@ -154,7 +154,7 @@ net.nicoulaj.maven.plugins checksum-maven-plugin - 1.10 + 1.11 @@ -172,7 +172,7 @@ com.amashchenko.maven.plugin gitflow-maven-plugin - 1.18.0 + 1.21.0 true From 35cb6473ff089a97ac5d50d38c984fc2c053bbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 22 Apr 2026 23:46:23 +0300 Subject: [PATCH 087/133] 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. --- .github/workflows/build.yml | 2 +- pom.xml | 77 +++++++++++-------- .../org/utplsql/cli/CliVersionInfoTest.java | 2 +- src/test/java/org/utplsql/cli/TestHelper.java | 6 +- 4 files changed, 48 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c654c37..a80e7d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: ORACLE_PASSWORD: oracle DB_URL: "//localhost:1521/FREEPDB1" DB_USER: APP - DB_PASS: APP + DB_PASS: pass ports: - 1521:1521 options: >- diff --git a/pom.xml b/pom.xml index cd07c75..1a6796a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.1.10-SNAPSHOT + 3.2.01-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. @@ -14,11 +14,13 @@ UTF-8 11 5.12.2 - 21.18.0.0 4.7.7 - 1.2.11 + 1.5.18 2.2 local + + utplsql + https://sonarcloud.io @@ -29,25 +31,44 @@ + + GitHub Issues + https://github.com/utPLSQL/utPLSQL-java-api/issues + + + + + Vinicius Avellar Moreira + utPLSQL.org + https://utplsql.org + amvinicius@gmail.com + + + Samuel Nitsche + utPLSQL.org + https://utplsql.org + derpesse@gmail.com + + + Jacek Gebal + utPLSQL.org + https://utplsql.org + jgebal@gmail.com + + + Simon Martinelli + utPLSQL.org + https://utplsql.org + simon@martineli.ch + https://martinelli.ch + + + org.utplsql utplsql-java-api 3.2.2 - - - com.oracle.ojdbc - ucp - - - com.oracle.ojdbc - ojdbc8 - - - com.oracle.ojdbc - orai18n - - javax.xml.bind @@ -64,23 +85,6 @@ picocli ${picocli.version} - - com.oracle.database.jdbc - ojdbc11 - ${oracle.jdbc.version} - - - com.oracle.database.jdbc - ucp - - - - - com.oracle.database.nls - orai18n - ${oracle.jdbc.version} - - org.junit.jupiter @@ -98,6 +102,11 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + org.codehaus.mojo appassembler-maven-plugin diff --git a/src/test/java/org/utplsql/cli/CliVersionInfoTest.java b/src/test/java/org/utplsql/cli/CliVersionInfoTest.java index 28db14c..4a89f27 100644 --- a/src/test/java/org/utplsql/cli/CliVersionInfoTest.java +++ b/src/test/java/org/utplsql/cli/CliVersionInfoTest.java @@ -8,6 +8,6 @@ class CliVersionInfoTest { @Test void getCliVersionInfo() { - assertTrue(CliVersionInfo.getVersion().startsWith("3.1")); + assertTrue(CliVersionInfo.getVersion().startsWith("3.2")); } } diff --git a/src/test/java/org/utplsql/cli/TestHelper.java b/src/test/java/org/utplsql/cli/TestHelper.java index 488654e..dddca1a 100644 --- a/src/test/java/org/utplsql/cli/TestHelper.java +++ b/src/test/java/org/utplsql/cli/TestHelper.java @@ -19,9 +19,9 @@ class TestHelper { private static String sPass; static { - sUrl = EnvironmentVariableUtil.getEnvValue("DB_URL", "192.168.99.100:1521:XE"); - sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "app"); - sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "app"); + sUrl = EnvironmentVariableUtil.getEnvValue("DB_URL", "//localhost:1521/FREEPDB1"); + sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "APP"); + sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "pass"); } static RunPicocliCommand createPicocliRunCommand(String... args ) { From 758059d3d81e10830be2bfad850211032a190ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 12:31:26 +0300 Subject: [PATCH 088/133] Add check to see if assets are bundled in API. --- .../cli/reporters/LocalAssetsCoverageHTMLReporter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/utplsql/cli/reporters/LocalAssetsCoverageHTMLReporter.java b/src/main/java/org/utplsql/cli/reporters/LocalAssetsCoverageHTMLReporter.java index 602ee7c..20483c1 100644 --- a/src/main/java/org/utplsql/cli/reporters/LocalAssetsCoverageHTMLReporter.java +++ b/src/main/java/org/utplsql/cli/reporters/LocalAssetsCoverageHTMLReporter.java @@ -29,13 +29,17 @@ public LocalAssetsCoverageHTMLReporter(String selfType, Object[] attributes) { public Reporter init(Connection con, CompatibilityProxy compatibilityProxy, ReporterFactory reporterFactory) throws SQLException { super.init(con, compatibilityProxy, reporterFactory); - if (hasOutputToFile()) { + if (hasOutputToFile() && assetsAreBundled()) { writeReportAssetsTo(getPhysicalAssetPath()); } return this; } + private static boolean assetsAreBundled() { + return CoverageHTMLReporter.class.getResource("/CoverageHTMLReporter") != null; + } + private String getNameOfOutputFile() { Path outputPath = Paths.get(options.getOutputFileName()); return outputPath.getName(outputPath.getNameCount() - 1).toString(); @@ -51,7 +55,7 @@ private Path getPhysicalAssetPath() { } private void setAssetsPathFromOptions() { - if (hasOutputToFile()) { + if (hasOutputToFile() && assetsAreBundled()) { setAssetsPath(getNameOfOutputFile() + "_assets/"); } } From 2f1528093fa668c4b050388d50c3b0846efb4b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 12:31:45 +0300 Subject: [PATCH 089/133] Update run action log info. --- src/main/java/org/utplsql/cli/RunAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java index de1be33..f79e63d 100644 --- a/src/main/java/org/utplsql/cli/RunAction.java +++ b/src/main/java/org/utplsql/cli/RunAction.java @@ -192,8 +192,8 @@ private void initDatabase(DataSource dataSource) throws SQLException { compatibilityProxy = checkFrameworkCompatibility(conn); - logger.info("Successfully connected to database. UtPLSQL core: {}", compatibilityProxy.getVersionDescription()); - logger.info("Oracle-Version: {}", new DefaultDatabaseInformation().getOracleVersion(conn)); + logger.info("Connected to Oracle database: {}", new DefaultDatabaseInformation().getOracleVersion(conn)); + logger.info("utPLSQL core: {}", compatibilityProxy.getVersionDescription()); } catch (SQLException e) { if (e.getErrorCode() == 1017 || e.getErrorCode() == 12514) { throw new DatabaseConnectionFailed(e); From 9d5e755f50628e72eacb192169bc6fef355005dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 12:32:07 +0300 Subject: [PATCH 090/133] Update snapshot version to 3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a6796a..bef25e6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.01-SNAPSHOT + 3.2.0-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 8876a0f294702d64a81b7d1a7a110358bbbb122b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 12:52:51 +0300 Subject: [PATCH 091/133] Update utplsql-java-api dependency to 3.2.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bef25e6..7794397 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ org.utplsql utplsql-java-api - 3.2.2 + 3.2.3 javax.xml.bind From bfddc6f12b404490b63c160d68d67317fcb208a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 13:23:34 +0300 Subject: [PATCH 092/133] Enable running the utPLSQL-cli build process directly from snapshot dependency. Fixed SNAPSHOTS repository. --- .github/workflows/api-snapshot-check.yml | 78 ++++++++++++++++++++++++ .github/workflows/build.yml | 1 + pom.xml | 16 ++--- 3 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/api-snapshot-check.yml diff --git a/.github/workflows/api-snapshot-check.yml b/.github/workflows/api-snapshot-check.yml new file mode 100644 index 0000000..7943180 --- /dev/null +++ b/.github/workflows/api-snapshot-check.yml @@ -0,0 +1,78 @@ +name: Test with utplsql-java-api snapshot + +on: + workflow_dispatch: + inputs: + api_version: + description: 'utplsql-java-api snapshot version (e.g. 3.2.4-SNAPSHOT)' + required: true + + repository_dispatch: + types: [utPLSQL-java-api-build] + +defaults: + run: + shell: bash + +jobs: + build: + name: Test with utplsql-java-api ${{ github.event.client_payload.api_version || inputs.api_version }} + runs-on: ubuntu-latest + env: + UTPLSQL_VERSION: develop + UTPLSQL_FILE: utPLSQL + DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: APP + DB_PASS: APP + + services: + oracle: + image: gvenzl/oracle-free:23-slim-faststart + env: + ORACLE_PASSWORD: oracle + DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: APP + DB_PASS: pass + ports: + - 1521:1521 + options: >- + --health-cmd healthcheck.sh + --health-interval 10s + --health-timeout 5s + --health-retries 10 + --name oracle + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-java@v5 + with: + distribution: 'adopt' + java-version: '17' + + - name: Install utplsql + run: .github/scripts/install_utplsql.sh + + - name: Install demo project + run: .github/scripts/install_demo_project.sh + + - name: Build and Test + run: | + API_VERSION="${{ github.event.client_payload.api_version || inputs.api_version }}" + mvn verify appassembler:assemble -Dutplsql-java-api.version="$API_VERSION" + + slack-workflow-status: + if: always() + name: Post Workflow Status To Slack + needs: [ build ] + runs-on: ubuntu-latest + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + name: 'Github Actions[bot]' + icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a80e7d7..63d3a80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,7 @@ name: Build and test on: push: + branches: [ develop ] pull_request: branches: [ develop ] diff --git a/pom.xml b/pom.xml index 7794397..6888240 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ https://github.com/utPLSQL/utPLSQL-cli + 3.2.3 UTF-8 11 5.12.2 @@ -68,7 +69,7 @@ org.utplsql utplsql-java-api - 3.2.3 + ${utplsql-java-api.version} javax.xml.bind @@ -210,16 +211,9 @@ - utplsql-java-api - - https://packagecloud.io/utplsql/utplsql-java-api/maven2 - - - true - - - true - + central-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + true From 63a2510c279b3b7e87f62669bf554b031d80c4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 13:25:12 +0300 Subject: [PATCH 093/133] Use utPLSQL v3.2.x for testing the cli. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63d3a80..62f3368 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - utplsql_version: ["v3.1.14","develop"] + utplsql_version: ["v3.2.01","develop"] utplsql_file: ["utPLSQL"] jdk: ['11', '17', '21', '25'] services: From 02b8d1ae05bf09295399b2c810d4a723eadecaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 16:19:58 +0300 Subject: [PATCH 094/133] Do not dispatch the regular build upon push of utPLSQL-java-api or utPLSQL core --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62f3368..e47669e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,8 +9,6 @@ on: workflow_dispatch: - repository_dispatch: - types: [utPLSQL-build,utPLSQL-java-api-build] defaults: run: From 35dc083bd9053e492b17510f51c5830ecad2ecb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 16:40:02 +0300 Subject: [PATCH 095/133] Update java distribution name and version to 11. --- .github/workflows/api-snapshot-check.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/api-snapshot-check.yml b/.github/workflows/api-snapshot-check.yml index 7943180..c3f30b3 100644 --- a/.github/workflows/api-snapshot-check.yml +++ b/.github/workflows/api-snapshot-check.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-java@v5 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '17' - name: Install utplsql diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e47669e..9ebcc01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v5 with: - distribution: 'adopt' + distribution: 'temurin' java-version: ${{matrix.jdk}} - name: Install utplsql diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd819e2..41ccb4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,8 +19,8 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v5 with: - distribution: 'adopt' - java-version: 8 + distribution: 'temurin' + java-version: 11 - name: Build Release run: mvn package appassembler:assemble assembly:single checksum:files -DskipTests From e13443220e2fd8eb44d2e43798b981f749eca414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 16:40:41 +0300 Subject: [PATCH 096/133] Remove publishing of build status to SLACK. --- .github/workflows/api-snapshot-check.yml | 14 -------------- .github/workflows/build.yml | 14 -------------- .github/workflows/release.yml | 14 -------------- 3 files changed, 42 deletions(-) diff --git a/.github/workflows/api-snapshot-check.yml b/.github/workflows/api-snapshot-check.yml index c3f30b3..d11eb22 100644 --- a/.github/workflows/api-snapshot-check.yml +++ b/.github/workflows/api-snapshot-check.yml @@ -62,17 +62,3 @@ jobs: run: | API_VERSION="${{ github.event.client_payload.api_version || inputs.api_version }}" mvn verify appassembler:assemble -Dutplsql-java-api.version="$API_VERSION" - - slack-workflow-status: - if: always() - name: Post Workflow Status To Slack - needs: [ build ] - runs-on: ubuntu-latest - steps: - - name: Slack Workflow Notification - uses: Gamesight/slack-workflow-status@master - with: - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - name: 'Github Actions[bot]' - icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ebcc01..d12fb48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,17 +65,3 @@ jobs: - name: Build and Test run: mvn verify appassembler:assemble - - slack-workflow-status: - if: always() - name: Post Workflow Status To Slack - needs: [ build ] - runs-on: ubuntu-latest - steps: - - name: Slack Workflow Notification - uses: Gamesight/slack-workflow-status@master - with: - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - name: 'Github Actions[bot]' - icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41ccb4c..2c00f18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,17 +31,3 @@ jobs: files: | target/utPLSQL-cli.zip target/utPLSQL-cli.zip.md5 - - slack-workflow-status: - if: always() - name: Post Workflow Status To Slack - needs: [ release ] - runs-on: ubuntu-latest - steps: - - name: Slack Workflow Notification - uses: Gamesight/slack-workflow-status@master - with: - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - name: 'Github Actions[bot]' - icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' From 15332eddad6d01993059e9e895e6fde37283b7a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 Apr 2026 17:09:18 +0300 Subject: [PATCH 097/133] Update compiler release to Java 17. Update readme. --- .github/workflows/api-snapshot-check.yml | 5 +++-- .github/workflows/build.yml | 6 ++++-- .github/workflows/release.yml | 6 ++++-- README.md | 6 +++--- pom.xml | 6 ++++-- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/api-snapshot-check.yml b/.github/workflows/api-snapshot-check.yml index d11eb22..a5507e2 100644 --- a/.github/workflows/api-snapshot-check.yml +++ b/.github/workflows/api-snapshot-check.yml @@ -47,10 +47,11 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-java@v5 + - name: Set up JDK + uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Install utplsql run: .github/scripts/install_utplsql.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d12fb48..51ecdb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: matrix: utplsql_version: ["v3.2.01","develop"] utplsql_file: ["utPLSQL"] - jdk: ['11', '17', '21', '25'] + jdk: ['17', '21', '25'] services: oracle: image: gvenzl/oracle-free:23-slim-faststart @@ -52,7 +52,9 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v5 + + - name: Set up JDK + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{matrix.jdk}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c00f18..ade3efe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,10 +17,12 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v5 + + - name: Set up JDK + uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: 11 + java-version: '21' - name: Build Release run: mvn package appassembler:assemble assembly:single checksum:files -DskipTests diff --git a/README.md b/README.md index fcb6dee..982ef35 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,12 @@ You can also download all development versions from [Bintray](https://bintray.co ## Requirements -* [Java SE Runtime Environment 8](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) or newer +* [Java SE Runtime Environment 17](https://www.oracle.com/java/technologies/downloads/) or newer * When using reporters for Sonar or Coveralls client needs to be invoked from project's root directory. ## Compatibility -The latest CLI is always compatible with all database frameworks of the same major version. -For example CLI-3.1.0 is compatible with database framework 3.0.0-3.1.* but not with database framework 2.x. +The latest CLI is compatible with database frameworks of the same **minor** version. +For example CLI-3.2.0 is compatible with database framework 3.2.* but not necessarily with framework 3.1.* or 3.3.* ## Localization and NLS settings utPLSQL-cli will use the environment variables "LC_ALL" or "LANG" to change the locale and therefore the client NLS settings. diff --git a/pom.xml b/pom.xml index 6888240..ad2b522 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,11 @@ https://github.com/utPLSQL/utPLSQL-cli - 3.2.3 UTF-8 - 11 + 17 + + 3.2.3 + 5.12.2 4.7.7 1.5.18 From d018419685b1cfabb2a96a0f01740385ff677daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 25 Apr 2026 21:05:37 +0300 Subject: [PATCH 098/133] Cleanup of build process --- .github/workflows/api-snapshot-check.yml | 2 -- .github/workflows/build.yml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/api-snapshot-check.yml b/.github/workflows/api-snapshot-check.yml index a5507e2..183ddde 100644 --- a/.github/workflows/api-snapshot-check.yml +++ b/.github/workflows/api-snapshot-check.yml @@ -22,8 +22,6 @@ jobs: UTPLSQL_VERSION: develop UTPLSQL_FILE: utPLSQL DB_URL: "//localhost:1521/FREEPDB1" - DB_USER: APP - DB_PASS: APP services: oracle: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51ecdb1..f5c64e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: UTPLSQL_FILE: ${{matrix.utplsql_file}} DB_URL: "//localhost:1521/FREEPDB1" DB_USER: APP - DB_PASS: APP + DB_PASS: pass strategy: fail-fast: false @@ -37,8 +37,6 @@ jobs: env: ORACLE_PASSWORD: oracle DB_URL: "//localhost:1521/FREEPDB1" - DB_USER: APP - DB_PASS: pass ports: - 1521:1521 options: >- From 96c044d7d79e2bff4823cc9f9015c95866bb56d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 27 Apr 2026 13:54:04 +0300 Subject: [PATCH 099/133] Update java-version to 3.2.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad2b522..37eef44 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ UTF-8 17 - 3.2.3 + 3.2.4 5.12.2 4.7.7 From 6a8ca42abec9a031d5f0a643340bfe182328d593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 27 Apr 2026 13:55:36 +0300 Subject: [PATCH 100/133] Fixing build process --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5c64e2..60b6aa5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,6 +37,8 @@ jobs: env: ORACLE_PASSWORD: oracle DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: APP + DB_PASS: pass ports: - 1521:1521 options: >- From 038d2b77bff347b5946e110ae085551897821bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 27 Apr 2026 14:18:40 +0300 Subject: [PATCH 101/133] Fixing build process --- .github/workflows/api-snapshot-check.yml | 4 ++-- .github/workflows/build.yml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/api-snapshot-check.yml b/.github/workflows/api-snapshot-check.yml index 183ddde..3b82e86 100644 --- a/.github/workflows/api-snapshot-check.yml +++ b/.github/workflows/api-snapshot-check.yml @@ -22,6 +22,8 @@ jobs: UTPLSQL_VERSION: develop UTPLSQL_FILE: utPLSQL DB_URL: "//localhost:1521/FREEPDB1" + DB_USER: APP + DB_PASS: pass services: oracle: @@ -29,8 +31,6 @@ jobs: env: ORACLE_PASSWORD: oracle DB_URL: "//localhost:1521/FREEPDB1" - DB_USER: APP - DB_PASS: pass ports: - 1521:1521 options: >- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60b6aa5..f5c64e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,8 +37,6 @@ jobs: env: ORACLE_PASSWORD: oracle DB_URL: "//localhost:1521/FREEPDB1" - DB_USER: APP - DB_PASS: pass ports: - 1521:1521 options: >- From fecefd65014387881a45429028af1d292c9fd548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 27 Apr 2026 19:43:48 +0300 Subject: [PATCH 102/133] Update badges in README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 982ef35..f5d5a25 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL-cli.svg)](https://github.com/utPLSQL/utPLSQL-cli/releases) [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL-cli.svg)](https://www.apache.org/licenses/LICENSE-2.0) -[![Build status](https://github.com/utPLSQL/utPLSQL-cli/actions/workflows/build.yml/badge.svg)](https://github.com/utPLSQL/utPLSQL-cli/actions/workflows/build.yml) +[![Build and test](https://github.com/utPLSQL/utPLSQL-cli/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/utPLSQL/utPLSQL-cli/actions/workflows/build.yml) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL_utPLSQL-cli&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=utPLSQL_utPLSQL-cli) ---------- # utPLSQL-cli From 8ddc4fc656addbd82c1ab4dd8569347ec0adef3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 27 Apr 2026 20:08:00 +0300 Subject: [PATCH 103/133] Update of release process. --- .github/workflows/release.yml | 73 +++++++++++++++++++++++++++++------ pom.xml | 13 +------ 2 files changed, 63 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ade3efe..5808265 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,16 +1,22 @@ -name: Release +name: Prepare Release on: - push: - tags: - - "v*.*.*" - workflow_dispatch: + inputs: + releaseVersion: + description: 'Release version (e.g. 3.2.0)' + required: true + nextDevVersion: + description: 'Next development version (default: auto-increment patch, e.g. 3.2.1-SNAPSHOT)' + required: false -jobs: - - release: +permissions: + contents: write + id-token: write + attestations: write +jobs: + prepare-and-release: runs-on: ubuntu-latest steps: @@ -23,13 +29,58 @@ jobs: with: distribution: 'temurin' java-version: '21' + cache: 'maven' + + - name: Configure Git + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + + - name: Set release version + run: mvn -B versions:set -DnewVersion=${{ inputs.releaseVersion }} -DgenerateBackupPoms=false + + - name: Commit and tag release + run: | + git add pom.xml + git commit -m "Release v${{ inputs.releaseVersion }}" + git tag "v${{ inputs.releaseVersion }}" + + - name: Calculate and set next development version + run: | + if [[ -n "${{ inputs.nextDevVersion }}" ]]; then + NEXT="${{ inputs.nextDevVersion }}" + else + IFS='.' read -r major minor patch <<< "${{ inputs.releaseVersion }}" + NEXT="${major}.${minor}.$((patch + 1))-SNAPSHOT" + fi + mvn -B versions:set -DnewVersion="$NEXT" -DgenerateBackupPoms=false + git add pom.xml + git commit -m "Prepare next development version $NEXT" + + - name: Push branch and tag + run: | + git push origin HEAD:${{ github.ref_name }} + git push origin "v${{ inputs.releaseVersion }}" + + - name: Checkout release tag for build + run: git checkout "v${{ inputs.releaseVersion }}" - name: Build Release run: mvn package appassembler:assemble assembly:single checksum:files -DskipTests - - name: Release - uses: softprops/action-gh-release@v2.6 + - name: Attest build provenance + uses: actions/attest-build-provenance@v2 + with: + subject-path: | + target/utPLSQL-cli.zip + target/utPLSQL-cli.zip.sha256 + + - name: Create GitHub Release + uses: softprops/action-gh-release@v2 with: + tag_name: v${{ inputs.releaseVersion }} + generate_release_notes: true + fail_on_unmatched_files: true files: | target/utPLSQL-cli.zip - target/utPLSQL-cli.zip.md5 + target/utPLSQL-cli.zip.sha256 diff --git a/pom.xml b/pom.xml index 37eef44..47f522b 100644 --- a/pom.xml +++ b/pom.xml @@ -177,21 +177,10 @@ - MD5 + SHA-256 - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.21.0 - - true - - main - - - From 9b10e75e2febd55262b5eeaaa83606ae485122eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 27 Apr 2026 20:16:43 +0300 Subject: [PATCH 104/133] Update logback version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47f522b..a749eca 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 5.12.2 4.7.7 - 1.5.18 + 1.5.32 2.2 local From a3f0593cbde25e541e0a14f3c312c2a7f82433b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 27 Apr 2026 20:31:35 +0300 Subject: [PATCH 105/133] Update release process --- .github/workflows/release.yml | 64 ++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5808265..05c2988 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,13 @@ -name: Prepare Release +name: Release on: workflow_dispatch: inputs: - releaseVersion: - description: 'Release version (e.g. 3.2.0)' + release_version: + description: 'Release version (e.g. 3.2.3)' required: true - nextDevVersion: - description: 'Next development version (default: auto-increment patch, e.g. 3.2.1-SNAPSHOT)' + next_snapshot: + description: 'Next development version (default: auto-increment patch, e.g. 3.2.4) without the "-SNAPSHOT" word' required: false permissions: @@ -15,8 +15,12 @@ permissions: id-token: write attestations: write +defaults: + run: + shell: bash + jobs: - prepare-and-release: + release: runs-on: ubuntu-latest steps: @@ -34,51 +38,49 @@ jobs: - name: Configure Git run: | git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config user.email "github-actions[bot]@users.noreply.github.com" - name: Set release version - run: mvn -B versions:set -DnewVersion=${{ inputs.releaseVersion }} -DgenerateBackupPoms=false + run: mvn versions:set -DnewVersion=${{ inputs.release_version }} -DgenerateBackupPoms=false + + - name: Build Release + run: mvn package appassembler:assemble assembly:single checksum:files -DskipTests + + - name: Attest build provenance + uses: actions/attest-build-provenance@v2 + with: + subject-path: | + target/utPLSQL-cli.zip + target/utPLSQL-cli.zip.sha256 - - name: Commit and tag release + - name: Commit and tag release version run: | git add pom.xml - git commit -m "Release v${{ inputs.releaseVersion }}" - git tag "v${{ inputs.releaseVersion }}" + git commit -m "Release v${{ inputs.release_version }}" + git tag -a "v${{ inputs.release_version }}" -m "Release ${{ inputs.release_version }}" - name: Calculate and set next development version run: | - if [[ -n "${{ inputs.nextDevVersion }}" ]]; then - NEXT="${{ inputs.nextDevVersion }}" + if [[ -n "${{ inputs.next_snapshot }}" ]]; then + NEXT="${{ inputs.next_snapshot }}-SNAPSHOT" else - IFS='.' read -r major minor patch <<< "${{ inputs.releaseVersion }}" + IFS='.' read -r major minor patch <<< "${{ inputs.release_version }}" NEXT="${major}.${minor}.$((patch + 1))-SNAPSHOT" fi mvn -B versions:set -DnewVersion="$NEXT" -DgenerateBackupPoms=false git add pom.xml - git commit -m "Prepare next development version $NEXT" + git commit -m "Prepare next development version $NEXT [skip ci]" - - name: Push branch and tag + - name: Push commits and tag run: | git push origin HEAD:${{ github.ref_name }} - git push origin "v${{ inputs.releaseVersion }}" - - - name: Checkout release tag for build - run: git checkout "v${{ inputs.releaseVersion }}" - - - name: Build Release - run: mvn package appassembler:assemble assembly:single checksum:files -DskipTests - - - name: Attest build provenance - uses: actions/attest-build-provenance@v2 - with: - subject-path: | - target/utPLSQL-cli.zip - target/utPLSQL-cli.zip.sha256 + git push origin "v${{ inputs.release_version }}" - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: - tag_name: v${{ inputs.releaseVersion }} + tag_name: v${{ inputs.release_version }} + name: "utPLSQL-cli v${{ inputs.release_version }}" generate_release_notes: true fail_on_unmatched_files: true files: | From 66d79572963366412ad6bacb0bec0a7778c1d3c0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 28 Apr 2026 17:05:36 +0000 Subject: [PATCH 106/133] Release v3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a749eca..55f3b0b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.0-SNAPSHOT + 3.2.0 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 70c7aa341f47d4da3894aeb85fdda42825269e66 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 28 Apr 2026 17:05:38 +0000 Subject: [PATCH 107/133] Prepare next development version 3.2.1-SNAPSHOT [skip ci] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55f3b0b..8e6966b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.0 + 3.2.1-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 03b2d720d4f8867c5a6631aa54616f24bf38af49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 7 Jun 2026 23:32:13 +0300 Subject: [PATCH 108/133] Removing references to coveralls reporter from README.md --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f5d5a25..58c4c4f 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ You can also download all development versions from [Bintray](https://bintray.co ## Requirements * [Java SE Runtime Environment 17](https://www.oracle.com/java/technologies/downloads/) or newer -* When using reporters for Sonar or Coveralls client needs to be invoked from project's root directory. +* When using reporters for Sonar, client needs to be invoked from project's root directory. ## Compatibility The latest CLI is compatible with database frameworks of the same **minor** version. @@ -191,7 +191,7 @@ utplsql run "my/Username"/"myP@ssword"@connectstring Parameters -f, -o, -s are correlated. That is parameters -o and -s are controlling outputs for reporter specified by the preceding -f parameter. -Sonar and Coveralls reporter will only provide valid reports, when source_path and/or test_path are provided, and ut_run is executed from your project's root path. +Sonar reporter will only provide valid reports, when source_path and/or test_path are provided, and ut_run is executed from your project's root path. #### Examples @@ -254,11 +254,6 @@ UT_COVERAGE_SONAR_REPORTER: Designed for [SonarQube](https://about.sonarqube.com/) to report coverage. JSON format returned conforms with the Sonar specification: https://docs.sonarqube.org/display/SONAR/Generic+Test+Data -UT_COVERALLS_REPORTER: - Generates a JSON coverage report providing information on code coverage with line numbers. - Designed for [Coveralls](https://coveralls.io/). - JSON format conforms with specification: https://docs.coveralls.io/api-introduction - UT_DEBUG_REPORTER: No description available From 8d470943400f42756370438477e2570db8be6337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 10 Jul 2026 10:49:59 +0300 Subject: [PATCH 109/133] Investigating issue with failing test automation on pipeline calls. --- .../org/utplsql/cli/VersionInfoCommandIT.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/utplsql/cli/VersionInfoCommandIT.java b/src/test/java/org/utplsql/cli/VersionInfoCommandIT.java index 073d50a..0838511 100644 --- a/src/test/java/org/utplsql/cli/VersionInfoCommandIT.java +++ b/src/test/java/org/utplsql/cli/VersionInfoCommandIT.java @@ -18,15 +18,23 @@ void setupCaptureSystemOut() { capturer = new SystemCapturer.SystemOutCapturer(); } - private int getNonEmptyLines(String content) { - return (int) Arrays.stream(content.split("[\n|\r]")) + private String[] getNonEmptyLineArray(String content) { + return Arrays.stream(content.split("[\r\n]+")) .filter(line -> !line.isEmpty()) - .count(); + .toArray(String[]::new); } private void assertNumberOfLines( int expected, String content ) { - int numOfLines = getNonEmptyLines(content); - assertEquals(expected, numOfLines, String.format("Expected output to have %n lines, but got %n", expected, numOfLines)); + String[] lines = getNonEmptyLineArray(content); + assertEquals(expected, lines.length, () -> { + StringBuilder sb = new StringBuilder(); + sb.append(String.format("Expected output to have %d lines, but got %d.%n", expected, lines.length)); + sb.append("Actual lines were:").append(System.lineSeparator()); + for (int i = 0; i < lines.length; i++) { + sb.append(String.format(" [%d] %s%n", i, lines[i])); + } + return sb.toString(); + }); } @Test void infoCommandRunsWithoutConnection() { From 7f2af39343e2d2d6e373b5ed570f10196bacaf35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 10 Jul 2026 13:05:29 +0300 Subject: [PATCH 110/133] Fixing issue with logger inheriting DEBUG mode after previous test run. --- src/main/java/org/utplsql/cli/Cli.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java index 4f711b6..1991ea6 100644 --- a/src/main/java/org/utplsql/cli/Cli.java +++ b/src/main/java/org/utplsql/cli/Cli.java @@ -21,6 +21,8 @@ public static void main(String[] args) { static int runPicocliWithExitCode(String[] args) { + LoggerConfiguration.configure(LoggerConfiguration.ConfigLevel.NONE); + logger.debug("Args: "+String.join(", ", args)); CommandLine commandLine = new CommandLine(UtplsqlPicocliCommand.class); From 73ee0a8a20adeacf431fad6e3787f5ee68f25823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 10 Jul 2026 13:48:02 +0300 Subject: [PATCH 111/133] Fixing issue with logger inheriting DEBUG mode after previous test run. Alternative implementation. --- src/main/java/org/utplsql/cli/Cli.java | 1 - src/main/resources/logback.xml | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/logback.xml diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java index 1991ea6..3b14512 100644 --- a/src/main/java/org/utplsql/cli/Cli.java +++ b/src/main/java/org/utplsql/cli/Cli.java @@ -21,7 +21,6 @@ public static void main(String[] args) { static int runPicocliWithExitCode(String[] args) { - LoggerConfiguration.configure(LoggerConfiguration.ConfigLevel.NONE); logger.debug("Args: "+String.join(", ", args)); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..488718d --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,17 @@ + + + + + %msg%n + + + + + + + + + From 7c35ebc5a0c3fe93a9a7e8d21220c5da228f0c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 3 Aug 2026 18:35:45 +0800 Subject: [PATCH 112/133] Update readme with correct information about develop builds. --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 58c4c4f..4c193e7 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,12 @@ Provides an easy way of invoking utPLSQL from command-line. Main features: Published releases are available for download on the [utPLSQL-cli GitHub Releases Page.](https://github.com/utPLSQL/utPLSQL-cli/releases) -You can also download all development versions from [Bintray](https://bintray.com/utplsql/utPLSQL-cli/utPLSQL-cli-develop#files). +Development (`develop` branch) builds are not published as downloadable artifacts. To use the latest development version, build it from source: +``` +git clone https://github.com/utPLSQL/utPLSQL-cli.git +cd utPLSQL-cli +mvn package appassembler:assemble +``` ## Requirements @@ -84,7 +89,7 @@ Example: utplsql run -h ``` -#### \ +#### ConnectionURL This is used in all commands as first parameter (though it's optional for `info`). From 7bd004c3c3ea817f23cbc9636ac7435005991814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 3 Aug 2026 18:43:09 +0800 Subject: [PATCH 113/133] Removed non-existing `-fcode` parameter from readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c193e7..69444c2 100644 --- a/README.md +++ b/README.md @@ -155,8 +155,7 @@ utplsql run "my/Username"/"myP@ssword"@connectstring -c - If specified, enables printing of test results in colors as defined by ANSICONSOLE standards. (--color) Works only on reporeters that support colors (ut_documentation_reporter). --fcode=code - Override the exit code on failure, defaults to 1. You can set it to 0 to always exit with a success status. -(--failure-exit-code) +--failure-exit-code=code - Override the exit code on failure, defaults to 1. You can set it to 0 to always exit with a success status. -scc - If specified, skips the compatibility-check with the version of the database framework. (--skip- If you skip compatibility-check, CLI will expect the most actual framework version From 5e82756fd83eaede9f36c798e712703721582681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 14:09:59 +0300 Subject: [PATCH 114/133] Adding support for database connections via Oracle Wallet. --- README.md | 30 +++++- pom.xml | 8 ++ .../org/utplsql/cli/ConnectionConfig.java | 23 +++- .../org/utplsql/cli/DataSourceProvider.java | 13 ++- .../datasource/TestedDataSourceProvider.java | 15 ++- .../org/utplsql/cli/ConnectionConfigTest.java | 52 +++++++++ .../org/utplsql/cli/WalletConnectionIT.java | 101 ++++++++++++++++++ 7 files changed, 229 insertions(+), 13 deletions(-) create mode 100644 src/test/java/org/utplsql/cli/WalletConnectionIT.java diff --git a/README.md b/README.md index 69444c2..3a66290 100644 --- a/README.md +++ b/README.md @@ -98,9 +98,10 @@ Accepted formats: - `/@//[:]/` - `/@::` - `/@` +- `/@` - credentials are taken from an Oracle Wallet (Secure External Password Store), see [Oracle Wallet](#oracle-wallet-secure-external-password-store) -To connect using TNS, you need to have the ORACLE_HOME environment variable set. -The file tnsnames.ora must exist in path %ORACLE_HOME%/network/admin +To connect using TNS, you need to have either the TNS_ADMIN or the ORACLE_HOME environment variable set. +The file tnsnames.ora must exist in the TNS_ADMIN directory or in %ORACLE_HOME%/network/admin The file tnsnames.ora must contain valid TNS entries. In case you use a username containing `/` or a password containing `@` you should encapsulate it with double quotes `"`: @@ -108,6 +109,31 @@ In case you use a username containing `/` or a password containing `@` you shoul utplsql run "my/Username"/"myP@ssword"@connectstring ``` +#### Oracle Wallet (Secure External Password Store) + +To avoid passing the password on the command line, store the credentials in an Oracle Wallet and connect with `/@`: +``` +utplsql run /@MYDATABASE +``` + +Setup example: +``` +# create an auto-login wallet with credentials for TNS alias MYDATABASE +orapki wallet create -wallet $HOME/oracle/wallet -auto_login_local +mkstore -wrl $HOME/oracle/wallet -createCredential MYDATABASE someusername + +# point the JDBC driver to the wallet +echo "oracle.net.wallet_location=(SOURCE=(METHOD=FILE)(METHOD_DATA=(DIRECTORY=$HOME/oracle/wallet)))" \ + > $HOME/oracle/network/admin/ojdbc.properties + +# tnsnames.ora with the MYDATABASE entry must be in the same directory +export TNS_ADMIN=$HOME/oracle/network/admin +``` + +Instead of setting `TNS_ADMIN` you can also pass it as part of the connect string: `/@MYDATABASE?TNS_ADMIN=/path/to/network/admin`. + +The TNS alias used in the connect string must match the alias of the credential stored in the wallet. + ### run `utplsql run []` diff --git a/pom.xml b/pom.xml index 8e6966b..f182eb1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,8 @@ 17 3.2.4 + + 23.7.0.25.01 5.12.2 4.7.7 @@ -73,6 +75,12 @@ utplsql-java-api ${utplsql-java-api.version} + + + com.oracle.database.security + oraclepki + ${oraclepki.version} + javax.xml.bind jaxb-api diff --git a/src/main/java/org/utplsql/cli/ConnectionConfig.java b/src/main/java/org/utplsql/cli/ConnectionConfig.java index 05e2de7..d0ce618 100644 --- a/src/main/java/org/utplsql/cli/ConnectionConfig.java +++ b/src/main/java/org/utplsql/cli/ConnectionConfig.java @@ -5,15 +5,21 @@ public class ConnectionConfig { + /** + * Either {@code /@} or {@code /@}. + */ + private static final Pattern CONNECT_STRING_PATTERN = + Pattern.compile("^(?:(\".+\"|[^/]+)/(\".+\"|[^@]+)|/)@(.*)$"); + private final String user; private final String password; private final String connect; public ConnectionConfig(String connectString) { - Matcher m = Pattern.compile("^(\".+\"|[^/]+)/(\".+\"|[^@]+)@(.*)$").matcher(connectString); + Matcher m = CONNECT_STRING_PATTERN.matcher(connectString); if (m.find()) { - user = stripEnclosingQuotes(m.group(1)); - password = stripEnclosingQuotes(m.group(2)); + user = m.group(1) == null ? null : stripEnclosingQuotes(m.group(1)); + password = m.group(2) == null ? null : stripEnclosingQuotes(m.group(2)); connect = m.group(3); } else { throw new IllegalArgumentException("Not a valid connectString: '" + connectString + "'"); @@ -42,7 +48,18 @@ public String getPassword() { return password; } + /** + * @return true when no user/password was given (connect string {@code /@}), + * meaning credentials are provided externally, e.g. by an Oracle Wallet + */ + public boolean isExternalAuthentication() { + return user == null; + } + public String getConnectString() { + if (isExternalAuthentication()) { + return "/@" + connect; + } return user + "/" + password + "@" + connect; } diff --git a/src/main/java/org/utplsql/cli/DataSourceProvider.java b/src/main/java/org/utplsql/cli/DataSourceProvider.java index 4eee258..c903a10 100644 --- a/src/main/java/org/utplsql/cli/DataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/DataSourceProvider.java @@ -14,10 +14,15 @@ public class DataSourceProvider { static { - String oracleHome = System.getenv("ORACLE_HOME"); - if (oracleHome != null && System.getProperty("oracle.net.tns_admin") == null) { - System.setProperty("oracle.net.tns_admin", - String.join(File.separator, oracleHome, "NETWORK", "ADMIN")); + if (System.getProperty("oracle.net.tns_admin") == null) { + String tnsAdmin = System.getenv("TNS_ADMIN"); + String oracleHome = System.getenv("ORACLE_HOME"); + if (tnsAdmin != null && !tnsAdmin.isEmpty()) { + System.setProperty("oracle.net.tns_admin", tnsAdmin); + } else if (oracleHome != null) { + System.setProperty("oracle.net.tns_admin", + String.join(File.separator, oracleHome, "NETWORK", "ADMIN")); + } } } diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index 34fbb4b..69db592 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -49,8 +49,11 @@ private void setThickOrThinJdbcUrl(InitializableOracleDataSource ds) throws SQLE List errors = new ArrayList<>(); Throwable lastException = null; - ds.setUser(config.getUser()); - ds.setPassword(config.getPassword()); + // With external authentication (Oracle Wallet) the driver looks up the credentials itself + if (!config.isExternalAuthentication()) { + ds.setUser(config.getUser()); + ds.setPassword(config.getPassword()); + } for (ConnectStringPossibility possibility : possibilities) { logger.debug("Try connecting {}", possibility.getMaskedConnectString(config)); @@ -107,7 +110,7 @@ public String getConnectString(ConnectionConfig config) { @Override public String getMaskedConnectString(ConnectionConfig config) { - return "jdbc:oracle:oci8:****/****@" + config.getConnect(); + return "jdbc:oracle:oci8:" + maskedCredentials(config) + "@" + config.getConnect(); } } @@ -119,7 +122,11 @@ public String getConnectString(ConnectionConfig config) { @Override public String getMaskedConnectString(ConnectionConfig config) { - return "jdbc:oracle:thin:****/****@" + config.getConnect(); + return "jdbc:oracle:thin:" + maskedCredentials(config) + "@" + config.getConnect(); } } + + private static String maskedCredentials(ConnectionConfig config) { + return config.isExternalAuthentication() ? "/" : "****/****"; + } } diff --git a/src/test/java/org/utplsql/cli/ConnectionConfigTest.java b/src/test/java/org/utplsql/cli/ConnectionConfigTest.java index ee1e0b9..f32ad4d 100644 --- a/src/test/java/org/utplsql/cli/ConnectionConfigTest.java +++ b/src/test/java/org/utplsql/cli/ConnectionConfigTest.java @@ -1,6 +1,8 @@ package org.utplsql.cli; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import static org.junit.jupiter.api.Assertions.*; @@ -54,4 +56,54 @@ void parseSpecialCharsUser() { assertEquals("my.local.host/service", info.getConnect()); assertFalse(info.isSysDba()); } + + @Test + void parseCredentialsIsNotExternalAuthentication() { + ConnectionConfig info = new ConnectionConfig("test/pw@MY_TNS_ALIAS"); + + assertFalse(info.isExternalAuthentication()); + assertEquals("test/pw@MY_TNS_ALIAS", info.getConnectString()); + } + + @Test + void parseExternalAuthentication() { + ConnectionConfig info = new ConnectionConfig("/@MY_TNS_ALIAS"); + + assertNull(info.getUser()); + assertNull(info.getPassword()); + assertEquals("MY_TNS_ALIAS", info.getConnect()); + assertTrue(info.isExternalAuthentication()); + assertFalse(info.isSysDba()); + assertEquals("/@MY_TNS_ALIAS", info.getConnectString()); + } + + @Test + void parseExternalAuthenticationWithTnsAdminInUrl() { + ConnectionConfig info = new ConnectionConfig("/@MY_TNS_ALIAS?TNS_ADMIN=/home/me/oracle/network/admin"); + + assertNull(info.getUser()); + assertNull(info.getPassword()); + assertEquals("MY_TNS_ALIAS?TNS_ADMIN=/home/me/oracle/network/admin", info.getConnect()); + assertTrue(info.isExternalAuthentication()); + } + + @Test + void parseExternalAuthenticationWithEzConnect() { + ConnectionConfig info = new ConnectionConfig("/@//my.local.host:1521/service"); + + assertEquals("//my.local.host:1521/service", info.getConnect()); + assertTrue(info.isExternalAuthentication()); + } + + @ParameterizedTest + @ValueSource(strings = { + "/pw@MY_TNS_ALIAS", // password without user + "test/@MY_TNS_ALIAS", // user without password + "@MY_TNS_ALIAS", + "test@MY_TNS_ALIAS", + "MY_TNS_ALIAS" + }) + void rejectInvalidConnectString(String connectString) { + assertThrows(IllegalArgumentException.class, () -> new ConnectionConfig(connectString)); + } } diff --git a/src/test/java/org/utplsql/cli/WalletConnectionIT.java b/src/test/java/org/utplsql/cli/WalletConnectionIT.java new file mode 100644 index 0000000..857de8e --- /dev/null +++ b/src/test/java/org/utplsql/cli/WalletConnectionIT.java @@ -0,0 +1,101 @@ +package org.utplsql.cli; + +import oracle.security.pki.OracleSecretStore; +import oracle.security.pki.OracleWallet; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.utplsql.cli.datasource.TestedDataSourceProvider; + +import javax.sql.DataSource; +import java.nio.file.Files; +import java.nio.file.Path; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + +/** + * Connecting with {@code /@} using credentials stored in an Oracle Wallet + * (Secure External Password Store), see issue #225. + *

+ * The wallet, tnsnames.ora and ojdbc.properties are created on the fly from DB_URL / DB_USER / DB_PASS, + * so no Oracle client tooling (mkstore/orapki) is needed. + */ +class WalletConnectionIT { + + private static final String TNS_ALIAS = "UTPLSQL_CLI_WALLET"; + private static final Pattern EZ_CONNECT = Pattern.compile("^//([^:/]+)(?::(\\d+))?/(.+)$"); + + @TempDir + static Path tnsAdmin; + + private static String walletConnectString; + + @BeforeAll + static void createWallet() throws Exception { + Matcher m = EZ_CONNECT.matcher(TestHelper.getUrl()); + assumeTrue(m.matches(), "DB_URL must be in //host[:port]/service format to generate tnsnames.ora"); + String host = m.group(1); + String port = m.group(2) == null ? "1521" : m.group(2); + String service = m.group(3); + + Path walletDir = Files.createDirectories(tnsAdmin.resolve("wallet")); + char[] walletPassword = "Wallet_Pwd_123".toCharArray(); + + OracleWallet wallet = new OracleWallet(); + wallet.create(walletPassword); + OracleSecretStore secretStore = wallet.getSecretStore(); + secretStore.createCredential(TNS_ALIAS.toCharArray(), + TestHelper.getUser().toCharArray(), + TestHelper.getPass().toCharArray()); + wallet.setSecretStore(secretStore); + wallet.saveAs(walletDir.toString()); + wallet.createSSO(); + wallet.saveSSO(); + + assertTrue(Files.exists(walletDir.resolve("cwallet.sso")), "auto-login wallet was not created"); + + Files.writeString(tnsAdmin.resolve("tnsnames.ora"), + TNS_ALIAS + " = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = " + host + ")(PORT = " + port + "))" + + "(CONNECT_DATA = (SERVICE_NAME = " + service + ")))\n"); + Files.writeString(tnsAdmin.resolve("ojdbc.properties"), + "oracle.net.wallet_location=(SOURCE=(METHOD=FILE)(METHOD_DATA=(DIRECTORY=" + + forwardSlashes(walletDir) + ")))\n"); + + walletConnectString = "/@" + TNS_ALIAS + "?TNS_ADMIN=" + forwardSlashes(tnsAdmin); + } + + private static String forwardSlashes(Path path) { + return path.toAbsolutePath().toString().replace('\\', '/'); + } + + @Test + void connectsAsWalletUser() throws Exception { + ConnectionConfig config = new ConnectionConfig(walletConnectString); + DataSource dataSource = new TestedDataSourceProvider(config, 1).getDataSource(); + + try (Connection con = dataSource.getConnection(); + Statement stmt = con.createStatement(); + ResultSet rs = stmt.executeQuery("select user from dual")) { + assertTrue(rs.next()); + assertEquals(TestHelper.getUser().toUpperCase(), rs.getString(1)); + } + } + + @Test + void runCommandWithWallet() { + int result = TestHelper.runApp("run", + walletConnectString, + "-f=ut_documentation_reporter", + "-s", + "--failure-exit-code=0"); + + assertEquals(0, result); + } +} From b9abd0b73752318a3d5b593d46bd6b1111772c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 14:15:25 +0300 Subject: [PATCH 115/133] Fixing minor warnings from code analysis. --- .../org/utplsql/cli/datasource/TestedDataSourceProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index 69db592..f871c03 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -87,7 +87,7 @@ private void setInitSqlFrom_NLS_LANG(InitializableOracleDataSource ds) { sqlCommands.add(String.format("ALTER SESSION SET NLS_TERRITORY='%s'", matcher.group(2))); } - if (sqlCommands.size() > 0) { + if (!sqlCommands.isEmpty()) { StringBuilder sb = new StringBuilder(); sb.append("BEGIN\n"); for (String command : sqlCommands) { @@ -95,7 +95,7 @@ private void setInitSqlFrom_NLS_LANG(InitializableOracleDataSource ds) { } sb.append("END;"); - logger.debug("NLS settings: {}", sb.toString()); + logger.debug("NLS settings: {}", sb); ds.setConnectionInitSql(sb.toString()); } } From e94f1a21fa67f99a247f30132d9938d0dc553654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 15:20:02 +0300 Subject: [PATCH 116/133] Changes in the way TNS_ASMIN logic is handled as TNS_ADMIN is resolved automatically by jdbc driver. So `cli` will only use the ORACLE_HOME resolution when TNS_ADMIN is not defined. Removed `oraclepki` as pom dependency. It is now delivered together with jdbc as part of java-api 3.2.5. --- pom.xml | 10 +----- .../org/utplsql/cli/DataSourceProvider.java | 33 ++++++++++++----- .../utplsql/cli/DataSourceProviderTest.java | 36 +++++++++++++++++++ 3 files changed, 61 insertions(+), 18 deletions(-) create mode 100644 src/test/java/org/utplsql/cli/DataSourceProviderTest.java diff --git a/pom.xml b/pom.xml index f182eb1..5d2501b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,7 @@ UTF-8 17 - 3.2.4 - - 23.7.0.25.01 + 3.2.5-SNAPSHOT 5.12.2 4.7.7 @@ -75,12 +73,6 @@ utplsql-java-api ${utplsql-java-api.version} - - - com.oracle.database.security - oraclepki - ${oraclepki.version} - javax.xml.bind jaxb-api diff --git a/src/main/java/org/utplsql/cli/DataSourceProvider.java b/src/main/java/org/utplsql/cli/DataSourceProvider.java index c903a10..7d35bf3 100644 --- a/src/main/java/org/utplsql/cli/DataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/DataSourceProvider.java @@ -13,17 +13,32 @@ */ public class DataSourceProvider { + private static final String TNS_ADMIN_PROPERTY = "oracle.net.tns_admin"; + static { - if (System.getProperty("oracle.net.tns_admin") == null) { - String tnsAdmin = System.getenv("TNS_ADMIN"); - String oracleHome = System.getenv("ORACLE_HOME"); - if (tnsAdmin != null && !tnsAdmin.isEmpty()) { - System.setProperty("oracle.net.tns_admin", tnsAdmin); - } else if (oracleHome != null) { - System.setProperty("oracle.net.tns_admin", - String.join(File.separator, oracleHome, "NETWORK", "ADMIN")); - } + String tnsAdminFallback = getTnsAdminFallback( + System.getProperty(TNS_ADMIN_PROPERTY), System.getenv("TNS_ADMIN"), System.getenv("ORACLE_HOME")); + if (tnsAdminFallback != null) { + System.setProperty(TNS_ADMIN_PROPERTY, tnsAdminFallback); + } + } + + /** + * The JDBC driver resolves tnsnames.ora / ojdbc.properties from the {@value TNS_ADMIN_PROPERTY} property + * or the TNS_ADMIN environment variable on its own, but it doesn't look into ORACLE_HOME. + * The property takes precedence over the environment variable, so it must not be set when TNS_ADMIN is. + * + * @return ORACLE_HOME/NETWORK/ADMIN when neither {@value TNS_ADMIN_PROPERTY} nor TNS_ADMIN is set, otherwise null + */ + static String getTnsAdminFallback(String tnsAdminProperty, String tnsAdminEnv, String oracleHome) { + if (isEmpty(tnsAdminProperty) && isEmpty(tnsAdminEnv) && !isEmpty(oracleHome)) { + return String.join(File.separator, oracleHome, "NETWORK", "ADMIN"); } + return null; + } + + private static boolean isEmpty(String value) { + return value == null || value.isEmpty(); } public static DataSource getDataSource(String connectString, int maxConnections) throws SQLException { diff --git a/src/test/java/org/utplsql/cli/DataSourceProviderTest.java b/src/test/java/org/utplsql/cli/DataSourceProviderTest.java new file mode 100644 index 0000000..cfe918e --- /dev/null +++ b/src/test/java/org/utplsql/cli/DataSourceProviderTest.java @@ -0,0 +1,36 @@ +package org.utplsql.cli; + +import org.junit.jupiter.api.Test; + +import java.io.File; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +class DataSourceProviderTest { + + private static final String ORACLE_HOME = "/opt/oracle"; + + @Test + void tnsAdminFallsBackToOracleHome() { + assertEquals(String.join(File.separator, ORACLE_HOME, "NETWORK", "ADMIN"), + DataSourceProvider.getTnsAdminFallback(null, null, ORACLE_HOME)); + } + + @Test + void tnsAdminEnvVariableIsLeftToJdbcDriver() { + // Setting the property would override the TNS_ADMIN environment variable in the JDBC driver + assertNull(DataSourceProvider.getTnsAdminFallback(null, "/my/tns_admin", ORACLE_HOME)); + } + + @Test + void tnsAdminPropertyIsNotOverridden() { + assertNull(DataSourceProvider.getTnsAdminFallback("/my/tns_admin", null, ORACLE_HOME)); + } + + @Test + void noFallbackWithoutOracleHome() { + assertNull(DataSourceProvider.getTnsAdminFallback(null, null, null)); + assertNull(DataSourceProvider.getTnsAdminFallback("", "", "")); + } +} From 11f2ae88f3fd141b3b1e041c76cb4342753922ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 15:38:07 +0300 Subject: [PATCH 117/133] Fixing paths as they should be lowercase. --- src/main/java/org/utplsql/cli/DataSourceProvider.java | 4 ++-- src/test/java/org/utplsql/cli/DataSourceProviderTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/utplsql/cli/DataSourceProvider.java b/src/main/java/org/utplsql/cli/DataSourceProvider.java index 7d35bf3..d3dbfcc 100644 --- a/src/main/java/org/utplsql/cli/DataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/DataSourceProvider.java @@ -28,11 +28,11 @@ public class DataSourceProvider { * or the TNS_ADMIN environment variable on its own, but it doesn't look into ORACLE_HOME. * The property takes precedence over the environment variable, so it must not be set when TNS_ADMIN is. * - * @return ORACLE_HOME/NETWORK/ADMIN when neither {@value TNS_ADMIN_PROPERTY} nor TNS_ADMIN is set, otherwise null + * @return ORACLE_HOME/network/admin (lowercase, as in Oracle installations; paths are case-sensitive on Linux) when neither {@value TNS_ADMIN_PROPERTY} nor TNS_ADMIN is set, otherwise null */ static String getTnsAdminFallback(String tnsAdminProperty, String tnsAdminEnv, String oracleHome) { if (isEmpty(tnsAdminProperty) && isEmpty(tnsAdminEnv) && !isEmpty(oracleHome)) { - return String.join(File.separator, oracleHome, "NETWORK", "ADMIN"); + return String.join(File.separator, oracleHome, "network", "admin"); } return null; } diff --git a/src/test/java/org/utplsql/cli/DataSourceProviderTest.java b/src/test/java/org/utplsql/cli/DataSourceProviderTest.java index cfe918e..8e274f6 100644 --- a/src/test/java/org/utplsql/cli/DataSourceProviderTest.java +++ b/src/test/java/org/utplsql/cli/DataSourceProviderTest.java @@ -13,7 +13,7 @@ class DataSourceProviderTest { @Test void tnsAdminFallsBackToOracleHome() { - assertEquals(String.join(File.separator, ORACLE_HOME, "NETWORK", "ADMIN"), + assertEquals(String.join(File.separator, ORACLE_HOME, "network", "admin"), DataSourceProvider.getTnsAdminFallback(null, null, ORACLE_HOME)); } From 5561a05528470b847f937a76bc15dae563dadd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 15:42:02 +0300 Subject: [PATCH 118/133] Additional tests to verify different ways to resolve TNS name. --- .../org/utplsql/cli/WalletConnectionIT.java | 87 +++++++++++++++++-- 1 file changed, 79 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/utplsql/cli/WalletConnectionIT.java b/src/test/java/org/utplsql/cli/WalletConnectionIT.java index 857de8e..4b1d5eb 100644 --- a/src/test/java/org/utplsql/cli/WalletConnectionIT.java +++ b/src/test/java/org/utplsql/cli/WalletConnectionIT.java @@ -8,16 +8,21 @@ import org.utplsql.cli.datasource.TestedDataSourceProvider; import javax.sql.DataSource; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; +import java.util.Map; +import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assumptions.assumeTrue; /** @@ -26,15 +31,22 @@ *

* The wallet, tnsnames.ora and ojdbc.properties are created on the fly from DB_URL / DB_USER / DB_PASS, * so no Oracle client tooling (mkstore/orapki) is needed. + *

+ * TNS_ADMIN and ORACLE_HOME are read once per JVM and environment variables can't be changed at runtime, + * so the scenarios depending on them run the CLI in a separate JVM with a controlled environment. */ class WalletConnectionIT { private static final String TNS_ALIAS = "UTPLSQL_CLI_WALLET"; private static final Pattern EZ_CONNECT = Pattern.compile("^//([^:/]+)(?::(\\d+))?/(.+)$"); + private static final long SUBPROCESS_TIMEOUT_MINUTES = 3; @TempDir - static Path tnsAdmin; + static Path tempDir; + private static Path tnsAdmin; + private static Path oracleHome; + private static Path emptyOracleHome; private static String walletConnectString; @BeforeAll @@ -45,7 +57,7 @@ static void createWallet() throws Exception { String port = m.group(2) == null ? "1521" : m.group(2); String service = m.group(3); - Path walletDir = Files.createDirectories(tnsAdmin.resolve("wallet")); + Path walletDir = Files.createDirectories(tempDir.resolve("wallet")); char[] walletPassword = "Wallet_Pwd_123".toCharArray(); OracleWallet wallet = new OracleWallet(); @@ -61,16 +73,26 @@ static void createWallet() throws Exception { assertTrue(Files.exists(walletDir.resolve("cwallet.sso")), "auto-login wallet was not created"); - Files.writeString(tnsAdmin.resolve("tnsnames.ora"), - TNS_ALIAS + " = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = " + host + ")(PORT = " + port + "))" - + "(CONNECT_DATA = (SERVICE_NAME = " + service + ")))\n"); - Files.writeString(tnsAdmin.resolve("ojdbc.properties"), - "oracle.net.wallet_location=(SOURCE=(METHOD=FILE)(METHOD_DATA=(DIRECTORY=" - + forwardSlashes(walletDir) + ")))\n"); + String tnsnamesOra = TNS_ALIAS + " = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = " + host + ")(PORT = " + port + "))" + + "(CONNECT_DATA = (SERVICE_NAME = " + service + ")))\n"; + String ojdbcProperties = "oracle.net.wallet_location=(SOURCE=(METHOD=FILE)(METHOD_DATA=(DIRECTORY=" + + forwardSlashes(walletDir) + ")))\n"; + + tnsAdmin = writeNetworkConfig(tempDir.resolve("tns_admin"), tnsnamesOra, ojdbcProperties); + oracleHome = tempDir.resolve("oracle_home"); + writeNetworkConfig(oracleHome.resolve("network").resolve("admin"), tnsnamesOra, ojdbcProperties); + emptyOracleHome = Files.createDirectories(tempDir.resolve("empty_oracle_home")); walletConnectString = "/@" + TNS_ALIAS + "?TNS_ADMIN=" + forwardSlashes(tnsAdmin); } + private static Path writeNetworkConfig(Path dir, String tnsnamesOra, String ojdbcProperties) throws IOException { + Files.createDirectories(dir); + Files.writeString(dir.resolve("tnsnames.ora"), tnsnamesOra); + Files.writeString(dir.resolve("ojdbc.properties"), ojdbcProperties); + return dir; + } + private static String forwardSlashes(Path path) { return path.toAbsolutePath().toString().replace('\\', '/'); } @@ -98,4 +120,53 @@ void runCommandWithWallet() { assertEquals(0, result); } + + @Test + void runCommandWithTnsAdminEnvironmentVariable() throws Exception { + assertCliConnectsWithWallet(Map.of("TNS_ADMIN", tnsAdmin.toString())); + } + + @Test + void runCommandWithOracleHomeFallback() throws Exception { + assertCliConnectsWithWallet(Map.of("ORACLE_HOME", oracleHome.toString())); + } + + @Test + void tnsAdminEnvironmentVariableTakesPrecedenceOverOracleHome() throws Exception { + // Fails if ORACLE_HOME/network/admin (without tnsnames.ora) is used instead of TNS_ADMIN + assertCliConnectsWithWallet(Map.of( + "TNS_ADMIN", tnsAdmin.toString(), + "ORACLE_HOME", emptyOracleHome.toString())); + } + + /** + * Runs {@code utplsql run /@} in a separate JVM with TNS_ADMIN and ORACLE_HOME + * replaced by the given environment + */ + private void assertCliConnectsWithWallet(Map environment) throws Exception { + Path java = Paths.get(System.getProperty("java.home"), "bin", "java"); + ProcessBuilder processBuilder = new ProcessBuilder( + java.toString(), "-cp", System.getProperty("java.class.path"), + Cli.class.getName(), "run", "/@" + TNS_ALIAS, + "-f=ut_documentation_reporter", "-s", "--failure-exit-code=0"); + + processBuilder.environment().remove("TNS_ADMIN"); + processBuilder.environment().remove("ORACLE_HOME"); + processBuilder.environment().putAll(environment); + + Path output = Files.createTempFile(tempDir, "cli-output", ".log"); + processBuilder.redirectErrorStream(true); + processBuilder.redirectOutput(output.toFile()); + + Process process = processBuilder.start(); + if (!process.waitFor(SUBPROCESS_TIMEOUT_MINUTES, TimeUnit.MINUTES)) { + process.destroyForcibly(); + fail("CLI did not finish within " + SUBPROCESS_TIMEOUT_MINUTES + " minutes. Output:\n" + Files.readString(output)); + } + + String cliOutput = Files.readString(output); + assertEquals(0, process.exitValue(), () -> "CLI failed with environment " + environment + ". Output:\n" + cliOutput); + assertTrue(cliOutput.contains("Use connection string jdbc:oracle:thin:/@" + TNS_ALIAS), + () -> "Expected wallet connection with environment " + environment + ". Output:\n" + cliOutput); + } } From 96f9f9f221cca3ffb0db45cbd95e9b89f4ded41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 15:44:35 +0300 Subject: [PATCH 119/133] Update of readme.md --- README.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3a66290..f3a2895 100644 --- a/README.md +++ b/README.md @@ -100,9 +100,15 @@ Accepted formats: - `/@` - `/@` - credentials are taken from an Oracle Wallet (Secure External Password Store), see [Oracle Wallet](#oracle-wallet-secure-external-password-store) -To connect using TNS, you need to have either the TNS_ADMIN or the ORACLE_HOME environment variable set. -The file tnsnames.ora must exist in the TNS_ADMIN directory or in %ORACLE_HOME%/network/admin -The file tnsnames.ora must contain valid TNS entries. +To connect using a TNS name, the file `tnsnames.ora` with a valid entry for that name must be found. +The directory holding `tnsnames.ora` (and `ojdbc.properties`, if used) is taken from the first of these that is set: + +1. `TNS_ADMIN` parameter in the connect string, e.g. `app/pass@MYDATABASE?TNS_ADMIN=/path/to/network/admin` +2. Java system property `oracle.net.tns_admin`, e.g. `export JAVA_OPTS="-Doracle.net.tns_admin=/path/to/network/admin"` +3. `TNS_ADMIN` environment variable +4. `$ORACLE_HOME/network/admin`, when the `ORACLE_HOME` environment variable is set + +Options 1-3 are handled by the Oracle JDBC driver. Option 4 is a fallback provided by utPLSQL-cli, used only when none of the others is set. In case you use a username containing `/` or a password containing `@` you should encapsulate it with double quotes `"`: ``` @@ -126,11 +132,11 @@ mkstore -wrl $HOME/oracle/wallet -createCredential MYDATABASE someusername echo "oracle.net.wallet_location=(SOURCE=(METHOD=FILE)(METHOD_DATA=(DIRECTORY=$HOME/oracle/wallet)))" \ > $HOME/oracle/network/admin/ojdbc.properties -# tnsnames.ora with the MYDATABASE entry must be in the same directory +# tnsnames.ora with the MYDATABASE entry must be in the same directory as ojdbc.properties export TNS_ADMIN=$HOME/oracle/network/admin ``` -Instead of setting `TNS_ADMIN` you can also pass it as part of the connect string: `/@MYDATABASE?TNS_ADMIN=/path/to/network/admin`. +`ojdbc.properties` is read from the same directory as `tnsnames.ora`, so any of the options listed under [ConnectionURL](#connectionurl) can be used instead of `TNS_ADMIN`, for example `utplsql run "/@MYDATABASE?TNS_ADMIN=/path/to/network/admin"`. The TNS alias used in the connect string must match the alias of the credential stored in the wallet. From 68cbcc441aeaa5602439738238583bdd96a0f517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 16:53:09 +0300 Subject: [PATCH 120/133] Update of java-api-version dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d2501b..1fed7be 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ UTF-8 17 - 3.2.5-SNAPSHOT + 3.2.5 5.12.2 4.7.7 From 0e9158e7ba6690f86f73b4685a3b732828c46a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 21:58:07 +0300 Subject: [PATCH 121/133] Resolved issue with credentials leaking into debug log. Added tests to confirm the solution. Changed how credentials are parsed to avoid leaking passwords on unquoted passwords with multiple @ signs. Cleanup, unification and refactoring of credentials masking. Update of readme to include information about new behavior. --- README.md | 3 +- src/main/java/org/utplsql/cli/Cli.java | 13 +++- .../org/utplsql/cli/ConnectionConfig.java | 27 ++++++++- .../datasource/TestedDataSourceProvider.java | 54 ++++------------- .../org/utplsql/cli/CliArgsLoggingTest.java | 60 +++++++++++++++++++ .../org/utplsql/cli/ConnectionConfigTest.java | 42 +++++++++++++ 6 files changed, 153 insertions(+), 46 deletions(-) create mode 100644 src/test/java/org/utplsql/cli/CliArgsLoggingTest.java diff --git a/README.md b/README.md index f3a2895..8f22984 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,8 @@ The directory holding `tnsnames.ora` (and `ojdbc.properties`, if used) is taken Options 1-3 are handled by the Oracle JDBC driver. Option 4 is a fallback provided by utPLSQL-cli, used only when none of the others is set. -In case you use a username containing `/` or a password containing `@` you should encapsulate it with double quotes `"`: +A password may contain `@`: everything up to the last `@` is taken as the password, e.g. `utplsql run myUser/myP@ssword@connectstring`. +A username containing `/` must be enclosed in double quotes `"`, and so may the password: ``` utplsql run "my/Username"/"myP@ssword"@connectstring ``` diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java index 3b14512..4a980a4 100644 --- a/src/main/java/org/utplsql/cli/Cli.java +++ b/src/main/java/org/utplsql/cli/Cli.java @@ -4,7 +4,9 @@ import org.slf4j.LoggerFactory; import picocli.CommandLine; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public class Cli { @@ -19,10 +21,19 @@ public static void main(String[] args) { System.exit(exitCode); } + /** + * @return the arguments separated by ", ", with the credentials of the connect string masked + */ + static String maskedArgs(String... args) { + return Arrays.stream(args) + .map(ConnectionConfig::maskCredentials) + .collect(Collectors.joining(", ")); + } + static int runPicocliWithExitCode(String[] args) { - logger.debug("Args: "+String.join(", ", args)); + logger.debug("Args: {}", maskedArgs(args)); CommandLine commandLine = new CommandLine(UtplsqlPicocliCommand.class); commandLine.setTrimQuotes(true); diff --git a/src/main/java/org/utplsql/cli/ConnectionConfig.java b/src/main/java/org/utplsql/cli/ConnectionConfig.java index d0ce618..180a268 100644 --- a/src/main/java/org/utplsql/cli/ConnectionConfig.java +++ b/src/main/java/org/utplsql/cli/ConnectionConfig.java @@ -7,9 +7,10 @@ public class ConnectionConfig { /** * Either {@code /@} or {@code /@}. + * An unquoted password extends to the last {@code @}, so it may contain {@code @} itself. */ private static final Pattern CONNECT_STRING_PATTERN = - Pattern.compile("^(?:(\".+\"|[^/]+)/(\".+\"|[^@]+)|/)@(.*)$"); + Pattern.compile("^(?:(\".+\"|[^/]+)/(\".+\"|.+)|/)@(.*)$"); private final String user; private final String password; @@ -26,6 +27,19 @@ public ConnectionConfig(String connectString) { } } + /** + * Masks the credentials of a connect string, e.g. for logging. + * + * @param value any string, e.g. a command line argument + * @return the value as returned by {@link #getMaskedConnectString()} for a connect string, otherwise the unchanged value + */ + public static String maskCredentials(String value) { + if (value == null || !CONNECT_STRING_PATTERN.matcher(value).matches()) { + return value; + } + return new ConnectionConfig(value).getMaskedConnectString(); + } + private String stripEnclosingQuotes(String value) { if (value.length() > 1 && value.startsWith("\"") @@ -63,6 +77,17 @@ public String getConnectString() { return user + "/" + password + "@" + connect; } + /** + * @return the connect string with user and password replaced by asterisks, + * or {@code /@} for external authentication + */ + public String getMaskedConnectString() { + if (isExternalAuthentication()) { + return "/@" + connect; + } + return "****/****@" + connect; + } + public boolean isSysDba() { return user != null && (user.toLowerCase().endsWith(" as sysdba") diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index f871c03..7034144 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -16,23 +16,18 @@ public class TestedDataSourceProvider { - interface ConnectStringPossibility { - String getConnectString(ConnectionConfig config); - - String getMaskedConnectString(ConnectionConfig config); - } - private static final Logger logger = LoggerFactory.getLogger(TestedDataSourceProvider.class); + /** + * JDBC URL prefixes tried in this order: thick (OCI) driver first, then thin driver + */ + private static final List JDBC_URL_PREFIXES = List.of("jdbc:oracle:oci8:", "jdbc:oracle:thin:"); + private final ConnectionConfig config; - private final List possibilities = new ArrayList<>(); private final int maxConnections; public TestedDataSourceProvider(ConnectionConfig config, int maxConnections) { this.config = config; this.maxConnections = maxConnections; - - possibilities.add(new ThickConnectStringPossibility()); - possibilities.add(new ThinConnectStringPossibility()); } public DataSource getDataSource() throws SQLException { @@ -55,14 +50,15 @@ private void setThickOrThinJdbcUrl(InitializableOracleDataSource ds) throws SQLE ds.setPassword(config.getPassword()); } - for (ConnectStringPossibility possibility : possibilities) { - logger.debug("Try connecting {}", possibility.getMaskedConnectString(config)); - ds.setURL(possibility.getConnectString(config)); + for (String jdbcUrlPrefix : JDBC_URL_PREFIXES) { + String maskedUrl = jdbcUrlPrefix + config.getMaskedConnectString(); + logger.debug("Try connecting {}", maskedUrl); + ds.setURL(jdbcUrlPrefix + "@" + config.getConnect()); try (Connection ignored = ds.getConnection()) { - logger.info("Use connection string {}", possibility.getMaskedConnectString(config)); + logger.info("Use connection string {}", maskedUrl); return; } catch (Error | Exception e) { - errors.add(possibility.getMaskedConnectString(config) + ": " + e.getMessage()); + errors.add(maskedUrl + ": " + e.getMessage()); lastException = e; } } @@ -101,32 +97,4 @@ private void setInitSqlFrom_NLS_LANG(InitializableOracleDataSource ds) { } } } - - private static class ThickConnectStringPossibility implements ConnectStringPossibility { - @Override - public String getConnectString(ConnectionConfig config) { - return "jdbc:oracle:oci8:@" + config.getConnect(); - } - - @Override - public String getMaskedConnectString(ConnectionConfig config) { - return "jdbc:oracle:oci8:" + maskedCredentials(config) + "@" + config.getConnect(); - } - } - - private static class ThinConnectStringPossibility implements ConnectStringPossibility { - @Override - public String getConnectString(ConnectionConfig config) { - return "jdbc:oracle:thin:@" + config.getConnect(); - } - - @Override - public String getMaskedConnectString(ConnectionConfig config) { - return "jdbc:oracle:thin:" + maskedCredentials(config) + "@" + config.getConnect(); - } - } - - private static String maskedCredentials(ConnectionConfig config) { - return config.isExternalAuthentication() ? "/" : "****/****"; - } } diff --git a/src/test/java/org/utplsql/cli/CliArgsLoggingTest.java b/src/test/java/org/utplsql/cli/CliArgsLoggingTest.java new file mode 100644 index 0000000..8ccab49 --- /dev/null +++ b/src/test/java/org/utplsql/cli/CliArgsLoggingTest.java @@ -0,0 +1,60 @@ +package org.utplsql.cli; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.read.ListAppender; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.stream.Collectors; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * The command line arguments are logged at debug level; the credentials of the connect string must not be (issue #172). + */ +class CliArgsLoggingTest { + + private final Logger cliLogger = (Logger) LoggerFactory.getLogger(Cli.class); + private final ListAppender appender = new ListAppender<>(); + private Level originalLevel; + + @BeforeEach + void captureCliLog() { + originalLevel = cliLogger.getLevel(); + cliLogger.setLevel(Level.DEBUG); + appender.start(); + cliLogger.addAppender(appender); + } + + @AfterEach + void restoreCliLog() { + cliLogger.detachAppender(appender); + cliLogger.setLevel(originalLevel); + } + + @Test + void maskedArgs() { + assertEquals("run, ****/****@//localhost:1521/FREEPDB1, --debug", + Cli.maskedArgs("run", "app/Sup3rSecretPw@//localhost:1521/FREEPDB1", "--debug")); + } + + @Test + void passwordIsNotLogged() { + // "run -h" only prints the usage, so no database is needed + Cli.runPicocliWithExitCode(new String[]{"run", "app/Sup3rSecretPw@//localhost:1521/FREEPDB1", "-h"}); + + List messages = appender.list.stream() + .map(ILoggingEvent::getFormattedMessage) + .toList(); + + assertTrue(messages.contains("Args: run, ****/****@//localhost:1521/FREEPDB1, -h"), () -> "Logged: " + messages); + assertFalse(messages.stream().anyMatch(message -> message.contains("Sup3rSecretPw")), () -> "Logged: " + messages); + } +} diff --git a/src/test/java/org/utplsql/cli/ConnectionConfigTest.java b/src/test/java/org/utplsql/cli/ConnectionConfigTest.java index f32ad4d..79c3553 100644 --- a/src/test/java/org/utplsql/cli/ConnectionConfigTest.java +++ b/src/test/java/org/utplsql/cli/ConnectionConfigTest.java @@ -2,6 +2,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; import static org.junit.jupiter.api.Assertions.*; @@ -106,4 +107,45 @@ void parseExternalAuthenticationWithEzConnect() { void rejectInvalidConnectString(String connectString) { assertThrows(IllegalArgumentException.class, () -> new ConnectionConfig(connectString)); } + + @Test + void parseUnquotedPasswordWithAt() { + ConnectionConfig info = new ConnectionConfig("test/p@ss@w0rd@MY_TNS_ALIAS"); + + assertEquals("test", info.getUser()); + assertEquals("p@ss@w0rd", info.getPassword()); + assertEquals("MY_TNS_ALIAS", info.getConnect()); + } + + @ParameterizedTest + @CsvSource(delimiter = '|', value = { + "test/pw@my.local.host/service | ****/****@my.local.host/service", + "test/pw@//my.local.host:1521/service | ****/****@//my.local.host:1521/service", + "sys as sysdba/pw@MY_TNS_ALIAS | ****/****@MY_TNS_ALIAS", + "test/\"p@ssw0rd=\"@MY_TNS_ALIAS | ****/****@MY_TNS_ALIAS", + "\"User/Mine@=\"/pw@MY_TNS_ALIAS | ****/****@MY_TNS_ALIAS", + "test/p@ss@MY_TNS_ALIAS | ****/****@MY_TNS_ALIAS", + "/@MY_TNS_ALIAS | /@MY_TNS_ALIAS" + }) + void maskCredentials(String connectString, String expected) { + assertEquals(expected, ConnectionConfig.maskCredentials(connectString)); + assertEquals(expected, new ConnectionConfig(connectString).getMaskedConnectString()); + } + + @ParameterizedTest + @ValueSource(strings = { + "run", + "--debug", + "-p=app.test_pkg", + "-f=ut_documentation_reporter", + "MY_TNS_ALIAS" + }) + void maskCredentialsLeavesOtherValuesUnchanged(String value) { + assertEquals(value, ConnectionConfig.maskCredentials(value)); + } + + @Test + void maskCredentialsOfNull() { + assertNull(ConnectionConfig.maskCredentials(null)); + } } From 630456473d583740a91f0e92232956685f888e43 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 27 Sep 2026 19:48:16 +0000 Subject: [PATCH 122/133] Release v3.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fed7be..1f61613 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.1-SNAPSHOT + 3.2.1 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 9f085f22609bd5e7cf0501c60f44c6cc1856ffaf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 27 Sep 2026 19:48:18 +0000 Subject: [PATCH 123/133] Prepare next development version 3.2.2-SNAPSHOT [skip ci] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f61613..111df1d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.1 + 3.2.2-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 8f83f25559948fbf0c605cb2ede3bcc09119b12b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 27 Sep 2026 22:57:15 +0300 Subject: [PATCH 124/133] Readme fixes. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8f22984..f536690 100644 --- a/README.md +++ b/README.md @@ -167,7 +167,7 @@ The TNS alias used in the connect string must match the alias of the credential If defined, the output is not displayed on screen by default. This can be changed with the -s parameter. If not defined, then output will be displayed on screen, even if the parameter -s is not specified. If more than one -o parameter is specified for one -f parameter, the last one is taken into consideration. - -s - Forces putting output to to screen for a given -f parameter. + -s - Forces putting output to screen for a given -f parameter. -source_path=source - path to project source files, use the following options to enable custom type mappings: -owner="app" @@ -186,7 +186,7 @@ The TNS alias used in the connect string must match the alias of the credential -name_subexpression=subexpression_number -c - If specified, enables printing of test results in colors as defined by ANSICONSOLE standards. -(--color) Works only on reporeters that support colors (ut_documentation_reporter). +(--color) Works only on reporters that support colors (ut_documentation_reporter). --failure-exit-code=code - Override the exit code on failure, defaults to 1. You can set it to 0 to always exit with a success status. @@ -217,7 +217,7 @@ The TNS alias used in the connect string must match the alias of the credential -r - Enables random order of test executions (--random-test-order) Default: false --seed - Sets the seed to use for random test execution order. If set, it sets -random to true +-seed=seed - Sets the seed to use for random test execution order. If set, it sets -r (--random-test-order) to true (--random-test-order-seed) --coverage-schemes - A comma separated list of schemas on which coverage should be gathered From 8c1516cc41778b2ddf50647c5ded5eb1f01b9b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 17 Oct 2026 23:25:18 +0300 Subject: [PATCH 125/133] Add coverage filter options by regular expression Expose the utPLSQL coverage filters as `run` command options: -include-schema-expr, -exclude-schema-expr, -include-object-expr and -exclude-object-expr. Documented the options and their semantics in the README. --- README.md | 17 +++++++ src/main/java/org/utplsql/cli/RunAction.java | 4 ++ .../org/utplsql/cli/RunPicocliCommand.java | 32 +++++++++++++ .../utplsql/cli/config/RunCommandConfig.java | 46 +++++++++++++++++-- .../utplsql/cli/PicocliRunCommandTest.java | 10 +++- .../utplsql/cli/RunCommandArgumentsTest.java | 17 +++++++ ...ConfigParamsArePassedToTestRunnerTest.java | 15 ++++++ 7 files changed, 137 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f536690..48d3d79 100644 --- a/README.md +++ b/README.md @@ -201,6 +201,17 @@ The TNS alias used in the connect string must match the alias of the credential -exclude=pckg_list - Comma-separated object list to exclude from the coverage report. Format: [schema.]package[,[schema.]package ...]. See coverage reporting options in framework documentation. + +-include-schema-expr=regex - Regular expression matching the names of schemas to include in the coverage report. +-exclude-schema-expr=regex - Regular expression matching the names of schemas to exclude from the coverage report. +-include-object-expr=regex - Regular expression matching the names of objects to include in the coverage report. +-exclude-object-expr=regex - Regular expression matching the names of objects to exclude from the coverage report. + Case-insensitive. Object expressions are matched against the object name without the schema. + Anchor them with `^` and `$`, otherwise any partial match counts. + If an include expression is given, `-include` and `--coverage-schemes` are ignored. + All exclude options are always applied and can be combined. + Ignored when `-source_path` is used (file mapping defines the coverage scope). + See https://www.utplsql.org/utPLSQL/latest/userguide/coverage.html#filtering-objects-in-coverage-reports -q - Does not output the informational messages normally printed to console. (--quiet) Default: false @@ -247,6 +258,12 @@ Invokes all Unit tests from schema/package "hr_test" with two reporters: Invokes all unit test suites from schema "hr". Results are displayed to screen using default ut_documentation_reporter. +``` +> utplsql run hr/hr@xe -p=hr_test -f=ut_coverage_html_reporter -o=coverage.html -include-schema-expr=^HR$ -exclude-object-expr=_TMP$ +``` + +Runs the tests from "hr_test" and writes an HTML coverage report that covers all objects in schema "HR" except those whose name ends with "_TMP". + ### info `utplsql info []` diff --git a/src/main/java/org/utplsql/cli/RunAction.java b/src/main/java/org/utplsql/cli/RunAction.java index f79e63d..7433d9e 100644 --- a/src/main/java/org/utplsql/cli/RunAction.java +++ b/src/main/java/org/utplsql/cli/RunAction.java @@ -167,6 +167,10 @@ TestRunner newTestRunner(List reporterList) { .randomTestOrderSeed(config.getRandomTestOrderSeed()) .addTags(Arrays.asList(config.getTags())) .addCoverageSchemes(Arrays.asList(config.getCoverageSchemes())) + .includeSchemaExpr(config.getIncludeSchemaExpr()) + .excludeSchemaExpr(config.getExcludeSchemaExpr()) + .includeObjectExpr(config.getIncludeObjectExpr()) + .excludeObjectExpr(config.getExcludeObjectExpr()) .oraStuckTimeout(config.getOraStuckTimeout()); } diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java index 2908cf2..4285549 100644 --- a/src/main/java/org/utplsql/cli/RunPicocliCommand.java +++ b/src/main/java/org/utplsql/cli/RunPicocliCommand.java @@ -81,6 +81,34 @@ public class RunPicocliCommand implements IRunCommand { private String excludeObjects = null; + @Option( + names = {"-include-schema-expr"}, + description = "Regular expression to include in the coverage report schemas whose name matches the expression. " + + "See coverage reporting options in framework documentation" + ) + private String includeSchemaExpr; + + @Option( + names = {"-exclude-schema-expr"}, + description = "Regular expression to exclude from the coverage report schemas whose name matches the expression. " + + "See coverage reporting options in framework documentation" + ) + private String excludeSchemaExpr; + + @Option( + names = {"-include-object-expr"}, + description = "Regular expression to include in the coverage report objects whose name matches the expression. " + + "See coverage reporting options in framework documentation" + ) + private String includeObjectExpr; + + @Option( + names = {"-exclude-object-expr"}, + description = "Regular expression to exclude from the coverage report objects whose name matches the expression. " + + "See coverage reporting options in framework documentation" + ) + private String excludeObjectExpr; + @Option( names = {"-D", "--dbms_output"}, description = "Enables DBMS_OUTPUT for the TestRunner (default: DISABLED)" @@ -249,6 +277,10 @@ public RunCommandConfig getRunCommandConfig() { .tags(tags.toArray(new String[0])) .coverageSchemes(coverageSchemes.toArray(new String[0])) .oraStuckTimeout(oraStuckTimeout) + .includeSchemaExpr(includeSchemaExpr) + .excludeSchemaExpr(excludeSchemaExpr) + .includeObjectExpr(includeObjectExpr) + .excludeObjectExpr(excludeObjectExpr) .create(); } diff --git a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java index 218466b..1bc1632 100644 --- a/src/main/java/org/utplsql/cli/config/RunCommandConfig.java +++ b/src/main/java/org/utplsql/cli/config/RunCommandConfig.java @@ -24,9 +24,13 @@ public class RunCommandConfig extends ConnectionConfig { private final String[] tags; private final String[] coverageSchemes; private final Integer oraStuckTimeout; + private final String includeSchemaExpr; + private final String excludeSchemaExpr; + private final String includeObjectExpr; + private final String excludeObjectExpr; - @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags", "coverageSchemes", "oraStuckTimeout"}) - public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags, String[] coverageSchemes, Integer oraStuckTimeout) { + @ConstructorProperties({"connectString", "suitePaths", "reporters", "outputAnsiColor", "failureExitCode", "skipCompatibilityCheck", "includePackages", "excludePackages", "sourceMapping", "testMapping", "logConfigLevel", "timeoutInMinutes", "dbmsOutput", "randomTestOrder", "randomTestOrderSeed", "tags", "coverageSchemes", "oraStuckTimeout", "includeSchemaExpr", "excludeSchemaExpr", "includeObjectExpr", "excludeObjectExpr"}) + public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfig[] reporters, boolean outputAnsiColor, Integer failureExitCode, boolean skipCompatibilityCheck, String[] includePackages, String[] excludePackages, FileMapperConfig sourceMapping, FileMapperConfig testMapping, ConfigLevel logConfigLevel, Integer timeoutInMinutes, boolean dbmsOutput, boolean randomTestOrder, Integer randomTestOrderSeed, String[] tags, String[] coverageSchemes, Integer oraStuckTimeout, String includeSchemaExpr, String excludeSchemaExpr, String includeObjectExpr, String excludeObjectExpr) { super(connectString); this.suitePaths = suitePaths; this.reporters = reporters; @@ -45,6 +49,10 @@ public RunCommandConfig(String connectString, String[] suitePaths, ReporterConfi this.tags = tags; this.coverageSchemes = coverageSchemes; this.oraStuckTimeout = oraStuckTimeout; + this.includeSchemaExpr = includeSchemaExpr; + this.excludeSchemaExpr = excludeSchemaExpr; + this.includeObjectExpr = includeObjectExpr; + this.excludeObjectExpr = excludeObjectExpr; } public String[] getSuitePaths() { @@ -113,6 +121,14 @@ public String[] getCoverageSchemes() { public Integer getOraStuckTimeout() { return oraStuckTimeout; } + public String getIncludeSchemaExpr() { return includeSchemaExpr; } + + public String getExcludeSchemaExpr() { return excludeSchemaExpr; } + + public String getIncludeObjectExpr() { return includeObjectExpr; } + + public String getExcludeObjectExpr() { return excludeObjectExpr; } + public static class Builder { private String connectString; @@ -133,6 +149,10 @@ public static class Builder { private String[] tags = new String[0]; private String[] coverageSchemes = new String[0]; private Integer oraStuckTimeout; + private String includeSchemaExpr; + private String excludeSchemaExpr; + private String includeObjectExpr; + private String excludeObjectExpr; public Builder connectString(String connectString) { this.connectString = connectString; @@ -224,8 +244,28 @@ public Builder oraStuckTimeout(Integer oraStuckTimeout) { return this; } + public Builder includeSchemaExpr(String includeSchemaExpr) { + this.includeSchemaExpr = includeSchemaExpr; + return this; + } + + public Builder excludeSchemaExpr(String excludeSchemaExpr) { + this.excludeSchemaExpr = excludeSchemaExpr; + return this; + } + + public Builder includeObjectExpr(String includeObjectExpr) { + this.includeObjectExpr = includeObjectExpr; + return this; + } + + public Builder excludeObjectExpr(String excludeObjectExpr) { + this.excludeObjectExpr = excludeObjectExpr; + return this; + } + public RunCommandConfig create() { - return new RunCommandConfig(connectString, suitePaths, reporters, outputAnsiColor, failureExitCode, skipCompatibilityCheck, includePackages, excludePackages, sourceMapping, testMapping, logConfigLevel, timeoutInMinutes, dbmsOutput, randomTestOrder, randomTestOrderSeed, tags, coverageSchemes, oraStuckTimeout); + return new RunCommandConfig(connectString, suitePaths, reporters, outputAnsiColor, failureExitCode, skipCompatibilityCheck, includePackages, excludePackages, sourceMapping, testMapping, logConfigLevel, timeoutInMinutes, dbmsOutput, randomTestOrder, randomTestOrderSeed, tags, coverageSchemes, oraStuckTimeout, includeSchemaExpr, excludeSchemaExpr, includeObjectExpr, excludeObjectExpr); } } } diff --git a/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java b/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java index 475ca82..b81e46e 100644 --- a/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java +++ b/src/test/java/org/utplsql/cli/PicocliRunCommandTest.java @@ -49,11 +49,19 @@ void runCommandAllArguments() throws Exception { "-owner_subexpression=1", "-type_subexpression=2", "-name_subexpression=3", - "--coverage-schemes=schema1,other_schema"); + "--coverage-schemes=schema1,other_schema", + "-include-schema-expr=^APP$", + "-exclude-schema-expr=^APP_TEST$", + "-include-object-expr=^PKG_", + "-exclude-object-expr=_TMP$"); assertNotNull(config.getConnectString()); assertThat( config.getSuitePaths(), is(new String[]{"app.betwnstr", "app.basic"})); assertThat( config.getTags(), is(new String[]{"tag1", "tag.2"})); + assertEquals( "^APP$", config.getIncludeSchemaExpr() ); + assertEquals( "^APP_TEST$", config.getExcludeSchemaExpr() ); + assertEquals( "^PKG_", config.getIncludeObjectExpr() ); + assertEquals( "_TMP$", config.getExcludeObjectExpr() ); assertTrue( config.isOutputAnsiColor() ); assertEquals( LoggerConfiguration.ConfigLevel.NONE, config.getLogConfigLevel()); assertEquals( 10, config.getFailureExitCode()); diff --git a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java index 63be6e2..77c455c 100644 --- a/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandArgumentsTest.java @@ -8,6 +8,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.equalTo; public class RunCommandArgumentsTest { @@ -69,6 +70,22 @@ void provideTags() { assertThat( testRunner.getOptions().tags, contains("tag1", "tag.2") ); } + @Test + void provideExpressionFilters() { + IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), + "-include-schema-expr=^APP$", + "-exclude-schema-expr=^APP_TEST$", + "-include-object-expr=^PKG_", + "-exclude-object-expr=_TMP$" + ); + + TestRunner testRunner = runCmd.newTestRunner(new ArrayList<>()); + assertThat( testRunner.getOptions().includeSchemaExpr, equalTo("^APP$") ); + assertThat( testRunner.getOptions().excludeSchemaExpr, equalTo("^APP_TEST$") ); + assertThat( testRunner.getOptions().includeObjectExpr, equalTo("^PKG_") ); + assertThat( testRunner.getOptions().excludeObjectExpr, equalTo("_TMP$") ); + } + @Test void provideCoverageSchemes() { IRunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), diff --git a/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java b/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java index 95d146a..d3b5194 100644 --- a/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandConfigParamsArePassedToTestRunnerTest.java @@ -39,4 +39,19 @@ void oraStuckTimeout() { TestRunner testRunner = new RunAction(config).newTestRunner(new ArrayList<>()); assertThat( testRunner.getOptions().oraStuckTimeout, equalTo(2) ); } + + @Test + void expressionFilters() { + RunCommandConfig config = new RunCommandConfig.Builder() + .includeSchemaExpr("^APP$") + .excludeSchemaExpr("^APP_TEST$") + .includeObjectExpr("^PKG_") + .excludeObjectExpr("_TMP$") + .create(); + TestRunner testRunner = new RunAction(config).newTestRunner(new ArrayList<>()); + assertThat( testRunner.getOptions().includeSchemaExpr, equalTo("^APP$") ); + assertThat( testRunner.getOptions().excludeSchemaExpr, equalTo("^APP_TEST$") ); + assertThat( testRunner.getOptions().includeObjectExpr, equalTo("^PKG_") ); + assertThat( testRunner.getOptions().excludeObjectExpr, equalTo("_TMP$") ); + } } From 921a5397d1b50d1ddba5dc0c04ba17c06a748f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 18 Oct 2026 00:41:22 +0300 Subject: [PATCH 126/133] Announce releases with the shared announce-release action Use utPLSQL/.github/actions/announce-release@v1 to post the release announcement to the org discussions and to utplsql.github.io. --- .github/workflows/release.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 05c2988..145b920 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,3 +86,12 @@ jobs: files: | target/utPLSQL-cli.zip target/utPLSQL-cli.zip.sha256 + + - name: Announce release in org discussions and on utplsql.github.io + uses: utPLSQL/.github/actions/announce-release@v1 + with: + project-name: utPLSQL-cli + tag: v${{ inputs.release_version }} + discussion-token: ${{ secrets.API_TOKEN_GITHUB }} + site-token: ${{ secrets.API_TOKEN_GITHUB }} + site-category: utplsql-cli From 29464dfa7d8eac6abd776b62b2b2c1ab383276e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Oct 2026 21:57:49 +0000 Subject: [PATCH 127/133] Release v3.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 111df1d..6a6f3d9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.2-SNAPSHOT + 3.2.2 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From dcb4b3904ebea8d5edd1fc9ca26c53498f2bbc6b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Oct 2026 21:57:53 +0000 Subject: [PATCH 128/133] Prepare next development version 3.2.3-SNAPSHOT [skip ci] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a6f3d9..3d6a68b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.2 + 3.2.3-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From b9a06c154ce6e230f6e3c5cfaa12b2a8a23bd2cc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Oct 2026 22:09:03 +0000 Subject: [PATCH 129/133] Release v3.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d6a68b..6a6f3d9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.3-SNAPSHOT + 3.2.2 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From cb858d2845cab3849b4032c8be871bbcf777a9a2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Oct 2026 22:09:06 +0000 Subject: [PATCH 130/133] Prepare next development version 3.2.3-SNAPSHOT [skip ci] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a6f3d9..3d6a68b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.2 + 3.2.3-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From 96a6d5d9f4cff33effd6d8d20f5e0851688d9eaa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Oct 2026 22:16:29 +0000 Subject: [PATCH 131/133] Release v3.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d6a68b..6a6f3d9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.3-SNAPSHOT + 3.2.2 utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From a29a30c0bb1658896e152fc002f25a86befcb464 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 17 Oct 2026 22:16:32 +0000 Subject: [PATCH 132/133] Prepare next development version 3.2.3-SNAPSHOT [skip ci] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a6f3d9..3d6a68b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql cli - 3.2.2 + 3.2.3-SNAPSHOT utPLSQL CLI CLI for running Unit Tests with utPLSQL v3+. From ba6ca3ec79ff90c4cb9039031cd7a9e196eda4da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 19 Oct 2026 22:54:49 +0300 Subject: [PATCH 133/133] Correct description of coverage filter expressions An include expression makes the -include list and --coverage-schemes irrelevant, and an exclude expression makes the -exclude list irrelevant. Verified against utPLSQL 3.2.3 (ut_coverage.pkb) and on a real database. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 48d3d79..89b9719 100644 --- a/README.md +++ b/README.md @@ -209,7 +209,8 @@ The TNS alias used in the connect string must match the alias of the credential Case-insensitive. Object expressions are matched against the object name without the schema. Anchor them with `^` and `$`, otherwise any partial match counts. If an include expression is given, `-include` and `--coverage-schemes` are ignored. - All exclude options are always applied and can be combined. + Schema and object exclude expressions are both applied. + If any exclude expression is given, the `-exclude` list is ignored. Ignored when `-source_path` is used (file mapping defines the coverage scope). See https://www.utplsql.org/utPLSQL/latest/userguide/coverage.html#filtering-objects-in-coverage-reports