From c3a0a433b3933e79cd906be585e2c0042cb6067d Mon Sep 17 00:00:00 2001 From: GIlca Date: Thu, 16 Mar 2023 11:54:17 +0200 Subject: [PATCH 1/2] upgrade snakeyaml (cherry picked from commit cef18af3fe265afe2fe50f1cc914493e093dcdb8) --- .../compiler/configuration/SlangCompilerSpringConfig.java | 4 +++- .../systemproperties/SensitiveSystemPropertiesTest.java | 3 +-- pom.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/configuration/SlangCompilerSpringConfig.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/configuration/SlangCompilerSpringConfig.java index c51311a143..9223d69510 100644 --- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/configuration/SlangCompilerSpringConfig.java +++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/configuration/SlangCompilerSpringConfig.java @@ -80,8 +80,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Scope; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; +import org.yaml.snakeyaml.inspector.TrustedTagInspector; import org.yaml.snakeyaml.introspector.BeanAccess; import org.yaml.snakeyaml.introspector.Property; import org.yaml.snakeyaml.introspector.PropertyUtils; @@ -458,7 +460,7 @@ public List transformers() { } private Constructor getConstructor() { - Constructor constructor = new Constructor(ParsedSlang.class); + Constructor constructor = new Constructor(ParsedSlang.class, new LoaderOptions()); constructor.setPropertyUtils(new PropertyUtils() { @Override public Property getProperty(Class type, String name) { diff --git a/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/systemproperties/SensitiveSystemPropertiesTest.java b/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/systemproperties/SensitiveSystemPropertiesTest.java index 094f36e944..da9533d881 100644 --- a/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/systemproperties/SensitiveSystemPropertiesTest.java +++ b/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/systemproperties/SensitiveSystemPropertiesTest.java @@ -113,8 +113,7 @@ public void testKeyNotStringd() throws Exception { RuntimeException exception = assertThrows(RuntimeException.class, () -> slang.loadSystemProperties(SlangSource.fromFile(propertiesFileUri))); - assertTrue(exception.getMessage().contains("Artifact {flow.var3_sensitive} has invalid value")); - assertTrue(exception.getMessage().contains("Value cannot be cast to Serializable")); + assertTrue(exception.getMessage().contains("Global tag is not allowed")); } private void testExecutable( diff --git a/pom.xml b/pom.xml index b24a938750..45db0d4999 100644 --- a/pom.xml +++ b/pom.xml @@ -269,7 +269,7 @@ org.yaml snakeyaml - 1.32 + 2.0 From 6b04b5676a4e1647042dd0b181144c598cdb3214 Mon Sep 17 00:00:00 2001 From: Dan Albu Date: Tue, 28 Mar 2023 10:33:41 +0300 Subject: [PATCH 2/2] Small refactor to support internal release only --- cloudslang-all/pom.xml | 2 +- cloudslang-api-commons/pom.xml | 2 +- cloudslang-cli/pom.xml | 2 +- cloudslang-commons/pom.xml | 2 +- cloudslang-compiler/pom.xml | 2 +- cloudslang-content-maven-compiler/pom.xml | 2 +- cloudslang-content-verifier/pom.xml | 2 +- cloudslang-enforcer/pom.xml | 2 +- cloudslang-entities/pom.xml | 2 +- cloudslang-runtime/pom.xml | 2 +- cloudslang-spi/pom.xml | 2 +- cloudslang-tests/pom.xml | 2 +- pom.xml | 40 +++++------------------ 13 files changed, 20 insertions(+), 44 deletions(-) diff --git a/cloudslang-all/pom.xml b/cloudslang-all/pom.xml index 9f38999e2c..433d89377a 100644 --- a/cloudslang-all/pom.xml +++ b/cloudslang-all/pom.xml @@ -11,7 +11,7 @@ http://www.apache.org/licenses/LICENSE-2.0 cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/cloudslang-api-commons/pom.xml b/cloudslang-api-commons/pom.xml index 2a4c3a0098..fb9d9a59be 100644 --- a/cloudslang-api-commons/pom.xml +++ b/cloudslang-api-commons/pom.xml @@ -3,7 +3,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/cloudslang-cli/pom.xml b/cloudslang-cli/pom.xml index f41f51a8f7..ccd6be46a0 100644 --- a/cloudslang-cli/pom.xml +++ b/cloudslang-cli/pom.xml @@ -7,7 +7,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT cloudslang-cli diff --git a/cloudslang-commons/pom.xml b/cloudslang-commons/pom.xml index 8047cfbaa1..0ef6cb46b2 100644 --- a/cloudslang-commons/pom.xml +++ b/cloudslang-commons/pom.xml @@ -3,7 +3,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/cloudslang-compiler/pom.xml b/cloudslang-compiler/pom.xml index 68b63bc890..e894564d6e 100644 --- a/cloudslang-compiler/pom.xml +++ b/cloudslang-compiler/pom.xml @@ -11,7 +11,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/cloudslang-content-maven-compiler/pom.xml b/cloudslang-content-maven-compiler/pom.xml index ee78424b8b..8d3cdd9097 100644 --- a/cloudslang-content-maven-compiler/pom.xml +++ b/cloudslang-content-maven-compiler/pom.xml @@ -11,7 +11,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/cloudslang-content-verifier/pom.xml b/cloudslang-content-verifier/pom.xml index 0e903da6e4..bc633dea94 100644 --- a/cloudslang-content-verifier/pom.xml +++ b/cloudslang-content-verifier/pom.xml @@ -6,7 +6,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT cloudslang-content-verifier diff --git a/cloudslang-enforcer/pom.xml b/cloudslang-enforcer/pom.xml index d94c82fb25..bcfc175233 100644 --- a/cloudslang-enforcer/pom.xml +++ b/cloudslang-enforcer/pom.xml @@ -3,7 +3,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/cloudslang-entities/pom.xml b/cloudslang-entities/pom.xml index 9d95c35194..dddcc882e0 100644 --- a/cloudslang-entities/pom.xml +++ b/cloudslang-entities/pom.xml @@ -14,7 +14,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT diff --git a/cloudslang-runtime/pom.xml b/cloudslang-runtime/pom.xml index 70c660fffa..52085f8b30 100644 --- a/cloudslang-runtime/pom.xml +++ b/cloudslang-runtime/pom.xml @@ -11,7 +11,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/cloudslang-spi/pom.xml b/cloudslang-spi/pom.xml index cb89a60a6e..824c5568eb 100644 --- a/cloudslang-spi/pom.xml +++ b/cloudslang-spi/pom.xml @@ -11,7 +11,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/cloudslang-tests/pom.xml b/cloudslang-tests/pom.xml index 617ce0addd..fc4cc02ce3 100644 --- a/cloudslang-tests/pom.xml +++ b/cloudslang-tests/pom.xml @@ -13,7 +13,7 @@ cloudslang io.cloudslang.lang - 2.0.44 + 2.0.44.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 45db0d4999..308d2499a4 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ --> io.cloudslang.lang cloudslang - 2.0.44 + 2.0.44.0-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -28,7 +28,7 @@ scm:git:https://github.com/CloudSlang/cloud-slang.git scm:git:git@github.com:CloudSlang/cloud-slang.git https://github.com/CloudSlang/cloud-slang.git - cloudslang-2.0.44 + master @@ -67,14 +67,14 @@ - ossrh - Maven Central staging repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + nexus-repository + nexus repository + ${nexus.url}/releases/ - ossrh - Maven Central snapshots repository - https://oss.sonatype.org/content/repositories/snapshots/ + nexus-snapshot-repository + nexus snapshots repository + ${nexus.url}/snapshots/ @@ -793,30 +793,6 @@ - - deploy-internal - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - custom-deployment-to-nexus - - deploy - - deploy - - ${custom.nexus} - - - - - - - cloudslang-spi