odpi/egeria#6907 fix broken builds (before rename)

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
planetf1 · Oct 20, 2022 · bbc2366 · bbc2366
1 parent bc3c12c
commit bbc2366
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -62,7 +62,7 @@ jobs:
       #    and modify them (or add more) to build your code if your project
       #    uses a compiled language
       - run: |
-          mvn clean package -f pom.xml -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Denforcer.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true
+          mvn -DargLine="-Xmx4096m" clean package -f pom.xml -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Denforcer.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/maven-java11-verify.yml b/.github/workflows/maven-java11-verify.yml
@@ -11,23 +11,23 @@ jobs:
     runs-on: ubuntu-latest
     name: "Maven Java 11"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         name: Checkout
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '11'
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-maven-java11-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-java11
       - name: Build with Maven
-        run: mvn -DargLine="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:GCTimeRatio=99" -B clean verify --file pom.xml
+        run: mvn -DargLine="-XmX4096m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:GCTimeRatio=99" -B clean verify --file pom.xml
       - name: Upload assemblies
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Assemblies
           path: |

diff --git a/.github/workflows/maven-java16-verify.yml b/.github/workflows/maven-java16-verify.yml
@@ -9,27 +9,27 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: "Maven Java 16"
+    name: "Maven Java 17"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         name: Checkout
-      - name: Set up JDK 16
-        uses: actions/setup-java@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: '16'
+          distribution: 'temurin'
+          java-version: '17'
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-maven-java16-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-java17-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-java16
       - name: Build with Maven
-        run: mvn -DargLine="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:GCTimeRatio=99" -B clean verify --file pom.xml
+        run: mvn -DargLine="-Xmx4096m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:GCTimeRatio=99" -B clean verify --file pom.xml
         env:
           MAVEN_OPTS: --add-opens=java.base/sun.security.x509=ALL-UNNAMED
       - name: Upload assemblies
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Assemblies
           path: |

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
     name: "Merge"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         name: Checkout source
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           # Java 11 is used for merge builds (PRs do check Java latest)
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           # Publishing attributes for maven central (this step adds to setting.xml)
           server-id: ossrh
           server-username: MAVEN_USERNAME
@@ -34,7 +34,7 @@ jobs:
       - name: Build with Maven (Publish snapshots to maven central)
         if: ${{ github.repository == 'odpi/egeria-connector-ibm-information-server' && github.ref == 'refs/heads/main'}}
         # See https://github.com/actions/toolkit/issues/231 requires parms using . to be quoted
-        run: 'mvn -B -DuseMavenCentral clean deploy'
+        run: mvn -DargLine="-Xmx4096m" -B -DuseMavenCentral clean deploy
         # Needed for publishing -- note we push to a staging area, login to oss.sonatype.org to
         # verify (close) the repository & release
         env:
@@ -44,10 +44,10 @@ jobs:
           # Build and publish - but only for main
       - name: Build with Maven (no snapshots published)
         if: ${{ github.repository != 'odpi/egeria-connector-ibm-information-server' || github.ref != 'refs/heads/main'}}
-        run: mvn -B clean verify
+        run: mvn -DargLine="-Xmx4096m" -B clean verify
       # Mostly for verification - not published to the release itself for now
       - name: Upload assemblies
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Assemblies
           path: |

diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml
@@ -10,8 +10,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.x
       - run: pip install mkdocs-material

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     name: "Release"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         name: Checkout source
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           # Java 11 is used for final released build
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           # Publishing attributes for maven central (this step adds to setting.xml)
           server-id: ossrh
           server-username: MAVEN_USERNAME
@@ -29,7 +29,7 @@ jobs:
       # Normal build (in future may also run reports (site))
       - name: Build with Maven
         # See https://github.com/actions/toolkit/issues/231 requires parms using . to be quoted
-        run: 'mvn -B -DuseMavenCentral clean deploy'
+        run: mvn -DargLine="-Xmx4096m" -B -DuseMavenCentral clean deploy
         # Needed for publishing -- note we push to a staging area, login to oss.sonatype.org to
         # verify (close) the repository & release
         env:
@@ -38,7 +38,7 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
       # Mostly for verification - not published to the release itself for now
       - name: Upload assemblies
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Assemblies
           path: |