devonfw#1360 Fixed dependencies order, which caused a problem in the …

…version of jackson-databind for openapiplugin Enabled crossOs in p2 plugin for github-actions Eclipse tests
mdukhan · Jan 19, 2023 · c563612 · c563612
1 parent 9942a9b
commit c563612
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/maven-build-test.yml b/.github/workflows/maven-build-test.yml
@@ -158,6 +158,7 @@ jobs:
         with:
           path: ./**/target/repository/
           key: p2-plugins-${{ github.sha }} # key hit will not update cache
+          enableCrossOsArchive: true
 
       - name: Run tests (Linux)
         if: ${{ matrix.os == 'ubuntu-latest' }}

diff --git a/...c/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml b/...c/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml
@@ -34,11 +34,6 @@
           </templates>
         </configuration>
         <dependencies>
-        <dependency>
-            <groupId>com.devonfw.cobigen</groupId>
-            <artifactId>templates-devon4j</artifactId>
-            <version>20.08.002</version>
-        </dependency>
           <dependency>
             <groupId>com.devonfw.cobigen</groupId>
             <artifactId>tempeng-freemarker</artifactId>
@@ -49,6 +44,11 @@
             <artifactId>openapiplugin</artifactId>
             <version>${pluginVersion}</version>
           </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>templates-devon4j</artifactId>
+            <version>20.08.002</version>
+          </dependency>
           <dependency>
             <groupId>com.devonfw.cobigen</groupId>
             <artifactId>javaplugin</artifactId>