Merge remote-tracking branch 'origin/develop' into develop

.github/workflows/ci.yml

@@ -46,61 +46,10 @@ concurrency:
   group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-jobs:
-  windows:
-    if: (github.event_name == 'schedule' && github.repository == 'mabaiwan/hippo4j')
-    runs-on: windows-latest
-    timeout-minutes: 60
-    steps:
-      - name: Cache Maven Repos
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Support longpaths
-        run: git config --system core.longpaths true
-      - uses: actions/checkout@v2
-      - name: Dump concurrency group
 env:
-          CON_GROUP: ${{ github.workflow }}-${{ github.ref }}
+  MAVEN_OPTS: -Dspotless.apply.skip=true
-        run: echo "$CON_GROUP"
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: 8
-      - name: Build with Maven
-        shell: cmd
-        run: |
-          .\mvnw -B --no-transfer-progress clean -D"spotless.apply.skip"=true install < nul
-          echo "mvnw exited"
-
-  ubuntu:
-    if: (github.event_name == 'schedule' && github.repository == 'mabaiwan/hippo4j')
-    name: JDK 8 - on ubuntu-latest
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v2
-      - name: Maven resolve ranges
-        run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
-      - name: Cache Maven Repos
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: 8
-      - name: Build with Maven
-        run: echo y | ./mvnw -B --no-transfer-progress clean install -Dcheckstyle.skip=true -Dspotless.apply.skip=true
 
+jobs:
   unix:
     if: (github.event_name == 'schedule' && github.repository == 'mabaiwan/hippo4j') || (github.event_name != 'schedule')
     name: JDK ${{ matrix.java.version }} - on ${{ matrix.os }}
@@ -108,62 +57,15 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ macos-latest ]
         java:
           - {
-            version: 11,
+            version: 11
-            maven_args: "-Dspotless.apply.skip=true"
-          }
-          - {
-            version: 17,
-            maven_args: "-Dspotless.apply.skip=true"
           }
-    steps:
-      - uses: actions/checkout@v2
-      - name: Maven resolve ranges
-        run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
-      - name: Cache Maven Repos
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Set up JDK ${{ matrix.java.version }}
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java.version }}
-      - name: Build with Maven
-        run: echo y | ./mvnw -B --no-transfer-progress clean install ${{ matrix.java.maven_args }}
-  
-  macos:
-    if: (github.event_name == 'schedule' && github.repository == 'mabaiwan/hippo4j')
-    name: macos
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        os: [ macos-latest ]
-        java:
           - {
-            version: 8,
+            version: 17
-            maven_args: "-Dspotless.apply.skip=true"
           }
     steps:
-      - name: Cache Maven Repos
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
       - uses: actions/checkout@v2
-      - name: Set up JDK ${{ matrix.java.version }}
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java.version }}
       - name: Build with Maven
         run: echo y | ./mvnw -B --no-transfer-progress clean install ${{ matrix.java.maven_args }}
-