JNG-5995 Update eclipse (#187)

[2024-11-26 22:59:33 +0100] JNG-5995 [Release] Updating versions [2024-11-26 02:46:11 +0100] JNG-5995 [Release] Updating versions [2024-11-25 04:25:52 +0100] Fixing validator [2024-11-11 02:01:29 +0100] Fixes [2024-11-08 02:46:30 +0100] Fix cache / parallel [skip ci] [2024-11-05 18:38:59 +0100] Use cache [2024-11-04 01:04:59 +0100] Fixing dependencies [2024-11-02 11:35:39 +0100] Versions updated [2024-11-02 04:09:14 +0100] JNG-5995 Initial feature commit
BlackBeltTechnology · Nov 27, 2024 · 9f3b6cb · 9f3b6cb
1 parent 116febb
commit 9f3b6cb
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 15 deletions.
diff --git a/generator-engine/pom.xml b/generator-engine/pom.xml
@@ -154,12 +154,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.10.3</version>
+            <version>${jackson-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.3</version>
+            <version>${jackson-version}</version>
         </dependency>
 
         <dependency>

diff --git a/...c/main/java/hu/blackbelt/judo/meta/psm/generator/maven/plugin/PsmProjectGenerateMojo.java b/...c/main/java/hu/blackbelt/judo/meta/psm/generator/maven/plugin/PsmProjectGenerateMojo.java
@@ -132,6 +132,9 @@ public void performExecutionOnPsmParameters(PsmGeneratorParameter.PsmGeneratorPa
         }
 
         Map<String, Object> extras = new LinkedHashMap<>();
+        if (variablePrecedence == null) {
+            variablePrecedence = Arrays.stream("projectProperties,templateVariables,propertiesFiles,environmentVariables,systemProperties".split(",")).toList();
+        }
 
         for (String precedence : variablePrecedence) {
 

diff --git a/model/src/main/java/hu/blackbelt/judo/meta/psm/PsmEpsilonValidator.java b/model/src/main/java/hu/blackbelt/judo/meta/psm/PsmEpsilonValidator.java
@@ -50,6 +50,15 @@ public static void validatePsm(Logger log,
                                    URI scriptRoot,
                                    Collection<String> expectedErrors,
                                    Collection<String> expectedWarnings) throws ScriptExecutionException, URISyntaxException {
+        validatePsm(log, psmModel, scriptRoot, expectedErrors, expectedWarnings, false, true);
+    }
+
+        public static void validatePsm(Logger log,
+                                   PsmModel psmModel,
+                                   URI scriptRoot,
+                                   Collection<String> expectedErrors,
+                                   Collection<String> expectedWarnings,
+                                   Boolean useCache, Boolean parallel) throws ScriptExecutionException, URISyntaxException {
 
         ExecutionContext executionContext = executionContextBuilder()
                 .log(log)
@@ -60,7 +69,9 @@ public static void validatePsm(Logger log,
                                 .log(log)
                                 .name("PSM")
                                 .validateModel(false)
+                                .useCache(useCache)
                                 .resource(psmModel.getResource())
+                                .parallel(parallel)
                                 .build()))
                 .injectContexts(singletonMap("psmUtils", new PsmUtils()))
                 .build();
@@ -75,6 +86,7 @@ public static void validatePsm(Logger log,
                             .source(UriUtil.resolve("psm.evl", scriptRoot))
                             .expectedErrors(expectedErrors)
                             .expectedWarnings(expectedWarnings)
+                            .parallel(true)
                             .build());
 
         } finally {

diff --git a/osgi-itest/pom.xml b/osgi-itest/pom.xml
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.13.4</version>
+            <version>${jackson-version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -75,34 +75,37 @@
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
 
-        <epsilon-runtime-version>1.5.1.20240414_020123_4ed0f7e3_develop</epsilon-runtime-version>
-        <epsilon-runtime-eclipse-version>1.5.4.20240414_042100_3279622b_develop</epsilon-runtime-eclipse-version>
+        <epsilon-runtime-version>1.5.1.20241126_215218_2124427f_feature_JNG_5995_UpdateEclipse</epsilon-runtime-version>
+        <epsilon-runtime-eclipse-version>1.5.4.20241126_215432_dce4b39a_feature_JNG_5995_UpdateEclipse</epsilon-runtime-eclipse-version>
 
         <src.dir>src/main</src.dir>
 
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <tycho-version>4.0.7</tycho-version>
+        <tycho-version>4.0.9</tycho-version>
+        <jackson-version>2.17.2</jackson-version>
 
         <emf-genmodel-generator-version>1.1.1.20240410_065331_3400dfa6_develop</emf-genmodel-generator-version>
         <judo-genmodel-generator-version>1.1.2.20240410_075618_a6090f79_develop</judo-genmodel-generator-version>
-        <judo-epp-common-version>4.29.0.20240410_065423_a90724bb_develop</judo-epp-common-version>
+        <judo-epp-common-version>4.33.0.20241102_103326_c584a408_feature_JNG_5995_UpdateEclipse</judo-epp-common-version>
         <judo-generator-commons-version>1.0.0.20240923_095240_119ac3cd_develop</judo-generator-commons-version>
 
         <xtext-version>2.29.0</xtext-version>
         <emf-mwe2-launch-version>2.13.0</emf-mwe2-launch-version>
-        <slf4j-version>2.0.7</slf4j-version>
-        <surefire-version>3.0.0-M7</surefire-version>
+        <slf4j-version>2.0.16</slf4j-version>
+        <surefire-version>3.5.1</surefire-version>
         <!--suppress UnresolvedMavenProperty -->
         <logback-test-config>${maven.multiModuleProjectDirectory}/logback-test.xml</logback-test-config>
+        <logback-version>1.5.12</logback-version>
+        <lombok-version>1.18.34</lombok-version>
 
         <!-- Pax exam dependencies -->
         <karaf-version>4.4.5</karaf-version>
         <cxf-version>3.4.4</cxf-version>
 
-        <osgi-utils-version>1.1.1.20240410_085121_bdac833a_develop</osgi-utils-version>
-        <karaf-features-version>2.0.2.20240410_083849_8b6fbfb2_develop</karaf-features-version>
-        <pax-exam-version>4.13.4</pax-exam-version>
+        <osgi-utils-version>1.1.1.20241126_214402_3d785a59_feature_JNG_5995_UpdateEclipse</osgi-utils-version>
+        <karaf-features-version>2.0.2.20241126_153048_85d3e09c_feature_JNG_5995_UpdateEclipse</karaf-features-version>
+        <pax-exam-version>4.13.5</pax-exam-version>
 
         <!-- Define overridable properties for tycho-surefire-plugin -->
         <platformSystemProperties />
@@ -116,7 +119,7 @@
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.language>java</sonar.language>
         <sonar.java.source>${java.version}</sonar.java.source>
-        <jacoco.version>0.8.8</jacoco.version>
+        <jacoco.version>0.8.12</jacoco.version>
     </properties>
 
     <repositories>
@@ -822,7 +825,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.4.11</version>
+                <version>${logback-version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -862,7 +865,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
+            <version>${lombok-version}</version>
         </dependency>
 
         <dependency>