Skip to content

Commit ef22a77

Browse files
committed
Maven 3.x support
1 parent 47fde33 commit ef22a77

File tree

19 files changed

+91
-1590
lines changed

19 files changed

+91
-1590
lines changed

.github/dependabot.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
version: 2
19+
updates:
20+
- package-ecosystem: "maven"
21+
directory: "/"
22+
schedule:
23+
interval: "daily"
24+
ignore:
25+
# ignore Maven Core updates
26+
- dependency-name: "org.apache.maven:*"
27+
- package-ecosystem: "github-actions"
28+
directory: "/"
29+
schedule:
30+
interval: "daily"

.github/workflows/maven-verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ on:
2424
jobs:
2525
build:
2626
name: Verify
27-
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
27+
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4

maven-plugin-testing-harness/pom.xml

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,23 @@ under the License.
2323
<parent>
2424
<groupId>org.apache.maven.plugin-testing</groupId>
2525
<artifactId>maven-plugin-testing</artifactId>
26-
<version>4.0.0-alpha-3-SNAPSHOT</version>
26+
<version>3.4.0-SNAPSHOT</version>
2727
</parent>
2828

2929
<artifactId>maven-plugin-testing-harness</artifactId>
3030
<name>Maven Plugin Testing Mechanism</name>
3131
<description>The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.</description>
3232

33+
<properties>
34+
<wagonVersion>3.5.3</wagonVersion>
35+
</properties>
36+
3337
<dependencyManagement>
3438
<dependencies>
3539
<dependency>
3640
<groupId>org.junit</groupId>
3741
<artifactId>junit-bom</artifactId>
38-
<version>5.10.0</version>
42+
<version>5.10.2</version>
3943
<type>pom</type>
4044
<scope>import</scope>
4145
</dependency>
@@ -46,7 +50,7 @@ under the License.
4650
<!-- maven -->
4751
<dependency>
4852
<groupId>org.apache.maven</groupId>
49-
<artifactId>maven-api-core</artifactId>
53+
<artifactId>maven-artifact</artifactId>
5054
<version>${mavenVersion}</version>
5155
<scope>provided</scope>
5256
</dependency>
@@ -74,30 +78,69 @@ under the License.
7478
<version>${mavenVersion}</version>
7579
<scope>provided</scope>
7680
</dependency>
81+
<dependency>
82+
<groupId>org.apache.maven.wagon</groupId>
83+
<artifactId>wagon-provider-api</artifactId>
84+
<version>${wagonVersion}</version>
85+
<scope>provided</scope>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.apache.maven.wagon</groupId>
89+
<artifactId>wagon-file</artifactId>
90+
<version>${wagonVersion}</version>
91+
<scope>provided</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.maven.wagon</groupId>
95+
<artifactId>wagon-http</artifactId>
96+
<version>${wagonVersion}</version>
97+
<scope>provided</scope>
98+
</dependency>
99+
<!--
100+
Keep this one as isolated as possible.
101+
But has to be present, as Maven 3 object graph is incomplete without it
102+
-->
103+
<dependency>
104+
<groupId>org.apache.maven</groupId>
105+
<artifactId>maven-compat</artifactId>
106+
<version>${mavenVersion}</version>
107+
<scope>runtime</scope>
108+
<exclusions>
109+
<exclusion>
110+
<groupId>*</groupId>
111+
<artifactId>*</artifactId>
112+
</exclusion>
113+
</exclusions>
114+
</dependency>
77115

78116
<!-- plexus -->
79117
<dependency>
80118
<groupId>org.codehaus.plexus</groupId>
81119
<artifactId>plexus-utils</artifactId>
82-
<version>4.0.0</version>
120+
<version>4.0.1</version>
83121
</dependency>
84122
<dependency>
85123
<!-- correct version must be provided by project depends on Maven version -->
86124
<groupId>org.codehaus.plexus</groupId>
87125
<artifactId>plexus-xml</artifactId>
88-
<version>4.0.0</version>
126+
<version>4.0.3</version>
89127
<optional>true</optional>
90128
</dependency>
91129
<dependency>
92130
<groupId>org.codehaus.plexus</groupId>
93131
<artifactId>plexus-archiver</artifactId>
94-
<version>4.8.0</version>
132+
<version>4.9.2</version>
133+
</dependency>
134+
<dependency>
135+
<groupId>org.apache.commons</groupId>
136+
<artifactId>commons-compress</artifactId>
137+
<version>1.26.1</version>
95138
</dependency>
96139

97140
<dependency>
98141
<groupId>org.codehaus.plexus</groupId>
99142
<artifactId>plexus-testing</artifactId>
100-
<version>1.1.0</version>
143+
<version>1.3.0</version>
101144
<exclusions>
102145
<exclusion>
103146
<!-- we need as optional dependencies -->
@@ -110,7 +153,7 @@ under the License.
110153
<!-- newer version is required by plexus-testing -->
111154
<groupId>com.google.guava</groupId>
112155
<artifactId>guava</artifactId>
113-
<version>32.0.1-jre</version>
156+
<version>33.2.0-jre</version>
114157
</dependency>
115158
<dependency>
116159
<groupId>junit</groupId>

maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/ConfigurationException.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/InjectMojo.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)