Merge pull request #521 from awisniew90/gradle-multi-disable

Avoid adding Maven parms in Gradle case
OpenLiberty · Sep 17, 2024 · c2d46ce · c2d46ce
2 parents b11d1d0 + 12b9e08
commit c2d46ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/run-regression-tests.yml b/.github/workflows/run-regression-tests.yml
@@ -45,7 +45,7 @@ jobs:
 
       # save logs
       - name: Upload Logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-app-logs

diff --git a/...openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/WorkspaceProjectsModel.java b/...openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/WorkspaceProjectsModel.java
@@ -239,7 +239,7 @@ public String getDefaultStartParameters(IProject iProject) {
         String retVal = null;
 
         Project proj = projectsByName.get(iProject.getName());
-        if (proj.isAggregated()) {
+        if (proj.getBuildType() == Project.BuildType.MAVEN && proj.isAggregated()) {
             retVal = "-f ../pom.xml -am -pl " + getModuleNameSegment(iProject);
         } else {
             retVal = "";