Skip to content

Commit 7f24ea2

Browse files
authored
Merge pull request #609 from hazendaz/spotbugs
Drop maven 4 to alpha 4 / Exclude plexus container default
2 parents baaa1c4 + d78ff3f commit 7f24ea2

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Java Integration Tests Maven 4.0.0-alpha-5
1+
name: Java Integration Tests Maven 4.0.0-alpha-4
22

33
on: [push, pull_request]
44

55
jobs:
66
test:
77
runs-on: ubuntu-latest
8-
name: Integration Tests Maven 4.0.0-alpha-5
8+
name: Integration Tests Maven 4.0.0-alpha-4
99

1010
steps:
1111
- uses: actions/checkout@v3
@@ -14,9 +14,9 @@ jobs:
1414
with:
1515
java-version: 17
1616
distribution: zulu
17-
- name: Load Maven 4.0.0-alpha-5
18-
run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-5 --no-transfer-progress
17+
- name: Load Maven 4.0.0-alpha-4
18+
run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-4 --no-transfer-progress
1919
- name: Build Setup
20-
run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-5 --no-transfer-progress
20+
run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-4 --no-transfer-progress
2121
- name: Integration Test with Maven
22-
run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-5 --no-transfer-progress
22+
run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-4 --no-transfer-progress

pom.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,10 @@
490490
<groupId>commons-logging</groupId>
491491
<artifactId>commons-logging</artifactId>
492492
</exclusion>
493+
<exclusion>
494+
<groupId>org.codehaus.plexus</groupId>
495+
<artifactId>plexus-container-default</artifactId>
496+
</exclusion>
493497
</exclusions>
494498
</dependency>
495499
<dependency>
@@ -525,6 +529,12 @@
525529
<groupId>org.apache.maven.doxia</groupId>
526530
<artifactId>doxia-integration-tools</artifactId>
527531
<version>${doxiaSiteToolsVersion}</version>
532+
<exclusions>
533+
<exclusion>
534+
<groupId>org.codehaus.plexus</groupId>
535+
<artifactId>plexus-container-default</artifactId>
536+
</exclusion>
537+
</exclusions>
528538
</dependency>
529539

530540
<!-- Commons -->
@@ -582,17 +592,6 @@
582592
</dependency>
583593

584594
<!-- plexus -->
585-
<dependency>
586-
<groupId>org.codehaus.plexus</groupId>
587-
<artifactId>plexus-container-default</artifactId>
588-
<version>${plexusContainerVersion}</version>
589-
<exclusions>
590-
<exclusion>
591-
<groupId>junit</groupId>
592-
<artifactId>junit</artifactId>
593-
</exclusion>
594-
</exclusions>
595-
</dependency>
596595
<dependency>
597596
<groupId>org.codehaus.plexus</groupId>
598597
<artifactId>plexus-resources</artifactId>

0 commit comments

Comments
 (0)