diff --git a/cloudslang-cli/pom.xml b/cloudslang-cli/pom.xml index 5c24e31a9f..acc00da8bd 100644 --- a/cloudslang-cli/pom.xml +++ b/cloudslang-cli/pom.xml @@ -80,6 +80,7 @@ org.powermock powermock-core + test @@ -100,6 +101,7 @@ org.hamcrest hamcrest-all + test @@ -140,6 +142,7 @@ commons-collections commons-collections + test @@ -153,6 +156,11 @@ liquibase-slf4j + + jakarta.annotation + jakarta.annotation-api + + org.apache.logging.log4j log4j-slf4j-impl diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java index 04786f8143..22c4bd304e 100644 --- a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java +++ b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java @@ -35,7 +35,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.File; import java.io.Serializable; import java.util.ArrayList; diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java index e2a02703b7..5ec0ed0ccc 100644 --- a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java +++ b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; diff --git a/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/SlangBootstrapTest.java b/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/SlangBootstrapTest.java index bc806b048e..328834fd92 100644 --- a/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/SlangBootstrapTest.java +++ b/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/SlangBootstrapTest.java @@ -13,6 +13,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.shell.Bootstrap; @@ -21,6 +22,7 @@ import static org.powermock.api.mockito.PowerMockito.mockStatic; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("jdk.internal.reflect.*") @PrepareForTest({SlangBootstrap.class, Bootstrap.class}) public class SlangBootstrapTest { diff --git a/cloudslang-commons/pom.xml b/cloudslang-commons/pom.xml index 3798ad12e7..ded414dc39 100644 --- a/cloudslang-commons/pom.xml +++ b/cloudslang-commons/pom.xml @@ -11,6 +11,11 @@ + + jakarta.annotation + jakarta.annotation-api + + org.apache.commons commons-lang3 diff --git a/cloudslang-commons/src/main/java/io/cloudslang/lang/logging/LoggingServiceImpl.java b/cloudslang-commons/src/main/java/io/cloudslang/lang/logging/LoggingServiceImpl.java index 4e62729790..b3b9808c5b 100644 --- a/cloudslang-commons/src/main/java/io/cloudslang/lang/logging/LoggingServiceImpl.java +++ b/cloudslang-commons/src/main/java/io/cloudslang/lang/logging/LoggingServiceImpl.java @@ -18,7 +18,7 @@ import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.DisposableBean; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; diff --git a/cloudslang-compiler/pom.xml b/cloudslang-compiler/pom.xml index 6c83ddab2e..8a59667b7c 100644 --- a/cloudslang-compiler/pom.xml +++ b/cloudslang-compiler/pom.xml @@ -25,6 +25,11 @@ ${project.version} + + jakarta.annotation + jakarta.annotation-api + + ${score.group} score-api @@ -96,6 +101,7 @@ org.springframework spring-beans + test diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/caching/CachedPrecompileServiceImpl.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/caching/CachedPrecompileServiceImpl.java index 1330c6fb08..8c4804a147 100644 --- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/caching/CachedPrecompileServiceImpl.java +++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/caching/CachedPrecompileServiceImpl.java @@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.codec.digest.DigestUtils; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class CachedPrecompileServiceImpl implements CachedPrecompileService { diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ScoreCompilerImpl.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ScoreCompilerImpl.java index 0047acc22b..21dc47bec7 100644 --- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ScoreCompilerImpl.java +++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ScoreCompilerImpl.java @@ -166,7 +166,7 @@ public List validateSlangModelWithDirectDependencies(Executabl * * @param executable the executable to create an {@link io.cloudslang.score.api.ExecutionPlan} for * @return {@link io.cloudslang.score.api.ExecutionPlan} of the given - * {@link io.cloudslang.lang.compiler.modeller.model.Executable} + *{@link io.cloudslang.lang.compiler.modeller.model.Executable} */ private ExecutionPlan compileToExecutionPlan(Executable executable) { diff --git a/cloudslang-content-maven-compiler/pom.xml b/cloudslang-content-maven-compiler/pom.xml index 8d0698f0b5..f0ca18d39c 100644 --- a/cloudslang-content-maven-compiler/pom.xml +++ b/cloudslang-content-maven-compiler/pom.xml @@ -78,6 +78,7 @@ org.codehaus.plexus plexus-component-metadata + 2.2.0 diff --git a/cloudslang-content-verifier/pom.xml b/cloudslang-content-verifier/pom.xml index 38fa5f7668..041d93fe6c 100644 --- a/cloudslang-content-verifier/pom.xml +++ b/cloudslang-content-verifier/pom.xml @@ -59,6 +59,11 @@ score-all + + jakarta.annotation + jakarta.annotation-api + + com.h2database h2 @@ -162,11 +167,13 @@ org.python jython-standalone + test commons-collections commons-collections + test diff --git a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/SlangTestRunner.java b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/SlangTestRunner.java index 57c8bd4f5d..e75b1cd5d4 100644 --- a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/SlangTestRunner.java +++ b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/SlangTestRunner.java @@ -316,7 +316,7 @@ private void processActiveTest(final BulkRunMode bulkRunMode, final Map parser.parseTestCases(SlangSource.fromFile(fileUri))); Assert.assertEquals("There was a problem parsing the YAML source: properties.prop.sl.\n" + - "java.lang.String cannot be cast to java.util.Map", exception.getMessage()); + "class java.lang.String cannot be cast to class java.util.Map " + + "(java.lang.String and java.util.Map are in module java.base of loader 'bootstrap')", + exception.getMessage()); } @Test diff --git a/cloudslang-runtime/pom.xml b/cloudslang-runtime/pom.xml index f4a9f82b3c..56ff549ce2 100644 --- a/cloudslang-runtime/pom.xml +++ b/cloudslang-runtime/pom.xml @@ -35,6 +35,7 @@ ${project.groupId} cloudslang-spi ${project.version} + test @@ -62,6 +63,11 @@ guava + + jakarta.annotation + jakarta.annotation-api + + org.python jython-standalone @@ -85,11 +91,13 @@ ${score.group} dependency-management-api + test ${score.group} dependency-management-impl + test diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluator.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluator.java index bd907933f1..6fff52ecf5 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluator.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluator.java @@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutor.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutor.java index 51ccfd2f36..6e4934037e 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutor.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutor.java @@ -17,7 +17,7 @@ import org.python.core.PyObject; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/services/ScriptsService.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/services/ScriptsService.java index 95d7acca6b..f6c11f7436 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/services/ScriptsService.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/services/ScriptsService.java @@ -16,7 +16,7 @@ import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java index c061207d73..7fc6c3c4e8 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java @@ -47,7 +47,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.Serializable; import java.util.Collections; import java.util.HashMap; diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java index 03fb69cfa5..9f50022e0e 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java @@ -48,7 +48,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.Serializable; import java.util.Arrays; import java.util.HashMap; diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/env/RunEnvironmentSensitiveTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/env/RunEnvironmentSensitiveTest.java index beea44219a..0e8e8a5332 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/env/RunEnvironmentSensitiveTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/env/RunEnvironmentSensitiveTest.java @@ -39,10 +39,10 @@ */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {RunEnvironmentSensitiveTest.RunEnvironmentSensitiveValueTestConfig.class, - SlangEntitiesSpringConfig.class}) + SlangEntitiesSpringConfig.class}) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class RunEnvironmentSensitiveTest { - private static final String ENCYPTED = "{Encrypted}"; + private static final String ENCRYPTED = "{Encrypted}"; private static final String OBFUSCATED = "{Obfuscated}"; @Test @@ -233,7 +233,7 @@ public Encryption getTestEncryption() { @Override public String encrypt(char[] clearText) { - return ENCYPTED + new String(clearText); + return ENCRYPTED + new String(clearText); } @Override @@ -248,12 +248,12 @@ public char[] deobfuscate(String cypherText) { @Override public char[] decrypt(String cypherText) { - return cypherText.substring(ENCYPTED.length()).toCharArray(); + return cypherText.substring(ENCRYPTED.length()).toCharArray(); } @Override public boolean isTextEncrypted(String text) { - return text.startsWith(ENCYPTED); + return text.startsWith(ENCRYPTED); } }; } diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java index fe311c1260..9759033301 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java @@ -86,6 +86,10 @@ public class ParallelLoopStepsTest { private static final String BRANCH_EXCEPTION_MESSAGE = "Exception details placeholder"; private static final String SUCCESS_RESULT = "SUCCESS"; + static { + System.setProperty("python.expressionsEval", "jython"); + } + @Autowired private ParallelLoopExecutionData parallelLoopSteps; diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java index 29b9a184fd..0b05c843fd 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/StepExecutionDataTest.java @@ -96,6 +96,10 @@ @ContextConfiguration(classes = StepExecutionDataTest.Config.class) public class StepExecutionDataTest { + static { + System.setProperty("python.expressionsEval", "jython"); + } + @Autowired private StepExecutionData stepExecutionData; diff --git a/pom.xml b/pom.xml index e0b4fbb283..2c6944dc72 100644 --- a/pom.xml +++ b/pom.xml @@ -45,14 +45,14 @@ 3.0.0-M5 3.8.1 3.2.0 - 3.1.2 + 3.6.0 3.0.0-M1 3.6.0 3.3.0 3.0.0-M3 1.12.0 - 5.3.32 + 6.0.3 1.3 0.4.0 2.1.214 @@ -60,8 +60,8 @@ UTF-8 UTF-8 io.cloudslang - 1.8 - 1.8 + 17 + 17 overwritten_by_ci @@ -316,6 +316,12 @@ 2.6 + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + + org.springframework @@ -486,7 +492,7 @@ org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.12 prepare-agent @@ -599,7 +605,7 @@ com.h2database:h2:jar:${h2.version} - org.python:jython-standalone:jar:2.7.2 + org.python:jython-standalone:jar:* org.liquibase:liquibase-core:jar:4.9.0 @@ -703,6 +709,12 @@ org.apache.maven.plugins maven-compiler-plugin ${maven-compiler-plugin.version} + + + + -parameters + + org.apache.maven.plugins @@ -715,7 +727,12 @@ ${maven-surefire-plugin.version} alphabetical - -Xmx512m -XX:MaxPermSize=1024m + + -Xmx512m + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.io=ALL-UNNAMED + --add-opens java.base/java.net=ALL-UNNAMED +