Skip to content

Commit ede3d42

Browse files
authored
Merge branch 'main' into 1209_ghcompare_supports_per_page_and_page+params
2 parents 1c1799e + e317813 commit ede3d42

2 files changed

Lines changed: 12 additions & 34 deletions

File tree

.github/workflows/maven-build.yml

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,7 @@ jobs:
3131
- name: Maven Install (skipTests)
3232
env:
3333
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
34-
run: mvn -B install -DskipTests --file pom.xml
35-
site:
36-
name: site (Java ${{ matrix.java }})
37-
runs-on: ubuntu-latest
38-
strategy:
39-
fail-fast: false
40-
matrix:
41-
java: [ 8, 11 ]
42-
steps:
43-
- uses: actions/checkout@v2
44-
- name: Set up JDK
45-
uses: actions/setup-java@v2
46-
with:
47-
java-version: ${{ matrix.java }}
48-
distribution: 'adopt'
49-
- uses: actions/cache@v2.1.6
50-
with:
51-
path: ~/.m2/repository
52-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
53-
restore-keys: |
54-
${{ runner.os }}-maven-
55-
- name: Maven Site
56-
run: mvn -B site -D enable-ci --file pom.xml
34+
run: mvn -B clean install -DskipTests --file pom.xml
5735
test:
5836
name: test (${{ matrix.os }}, Java ${{ matrix.java }})
5937
runs-on: ${{ matrix.os }}-latest
@@ -78,21 +56,21 @@ jobs:
7856
# JDK 8
7957
- name: Maven Install without Code Coverage
8058
if: matrix.os == 'windows' && matrix.java == '8'
81-
run: mvn -B install --file pom.xml
59+
run: mvn -B clean install --file pom.xml
8260
- name: Maven Install with Code Coverage
8361
if: matrix.os != 'windows' && matrix.java == '8'
84-
run: mvn -B install -D enable-ci --file pom.xml
62+
run: mvn -B clean install -D enable-ci --file pom.xml
8563
- name: Codecov Report
8664
if: matrix.os != 'windows' && matrix.java == '8'
87-
uses: codecov/codecov-action@v2.0.2
65+
uses: codecov/codecov-action@v2.0.3
8866
# JDK 11+
8967
- name: Maven Install without Code Coverage
9068
if: matrix.os == 'windows' && matrix.java != '8'
9169
env:
9270
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
93-
run: mvn -B install --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
71+
run: mvn -B clean install --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
9472
- name: Maven Install with Code Coverage
9573
if: matrix.os != 'windows' && matrix.java != '8'
9674
env:
9775
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
98-
run: mvn -B install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
76+
run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
<extension>
5656
<groupId>org.apache.maven.scm</groupId>
5757
<artifactId>maven-scm-provider-gitexe</artifactId>
58-
<version>1.11.2</version>
58+
<version>1.11.3</version>
5959
</extension>
6060
<extension>
6161
<groupId>org.apache.maven.scm</groupId>
6262
<artifactId>maven-scm-manager-plexus</artifactId>
63-
<version>1.11.2</version>
63+
<version>1.11.3</version>
6464
</extension>
6565
<!-- Doing site publishing manually for now -->
6666
<!--
@@ -323,7 +323,7 @@
323323
<plugin>
324324
<groupId>com.diffplug.spotless</groupId>
325325
<artifactId>spotless-maven-plugin</artifactId>
326-
<version>2.12.2</version>
326+
<version>2.12.3</version>
327327
<executions>
328328
<execution>
329329
<id>spotless-check</id>
@@ -389,7 +389,7 @@
389389
<dependency>
390390
<groupId>com.tngtech.archunit</groupId>
391391
<artifactId>archunit</artifactId>
392-
<version>0.20.1</version>
392+
<version>0.21.0</version>
393393
<scope>test</scope>
394394
</dependency>
395395
<dependency>
@@ -525,7 +525,7 @@
525525
<dependency>
526526
<groupId>org.mockito</groupId>
527527
<artifactId>mockito-core</artifactId>
528-
<version>3.11.2</version>
528+
<version>3.12.4</version>
529529
<scope>test</scope>
530530
</dependency>
531531
<dependency>
@@ -543,7 +543,7 @@
543543
<dependency>
544544
<groupId>com.google.code.gson</groupId>
545545
<artifactId>gson</artifactId>
546-
<version>2.8.7</version>
546+
<version>2.8.8</version>
547547
<scope>test</scope>
548548
</dependency>
549549
<dependency>

0 commit comments

Comments
 (0)