Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven_build_itself.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
cache: 'maven'

- name: Build with Maven
run: mvn verify -e -B -V -DdistributionFileName=apache-maven
run: mvn install -e -B -V -DdistributionFileName=apache-maven

- name: Extract tarball
shell: bash
Expand Down
9 changes: 5 additions & 4 deletions api/modello-plugin-velocity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
</description>

<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
Expand Down Expand Up @@ -84,10 +89,6 @@
<artifactId>modello-plugin-xml</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>

</project>
2 changes: 1 addition & 1 deletion maven-artifact/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ under the License.

<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-compat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ under the License.
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ under the License.
</dependency>
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions maven-core/src/main/resources/META-INF/maven/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ under the License.

<!-- plexus-utils (for DOM-type fields in maven-model) -->
<exportedPackage>org.codehaus.plexus.util.xml.Xpp3Dom</exportedPackage>
<exportedPackage>org.codehaus.plexus.util.xml.Xpp3DomBuilder</exportedPackage>
<exportedPackage>org.codehaus.plexus.util.xml.pull.XmlPullParser</exportedPackage>
<exportedPackage>org.codehaus.plexus.util.xml.pull.XmlPullParserException</exportedPackage>
<exportedPackage>org.codehaus.plexus.util.xml.pull.XmlSerializer</exportedPackage>
Expand Down
2 changes: 1 addition & 1 deletion maven-embedder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ under the License.
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-model-builder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
<version>4.0.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-model-transform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.

<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ under the License.
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-repository-metadata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.

<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-resolver-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ under the License.
<artifactId>maven-resolver-impl</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-settings-builder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ under the License.
<artifactId>plexus-interpolation</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-settings/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ under the License.
<version>4.0.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-toolchain-builder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ under the License.
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion maven-toolchain-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ under the License.
<version>4.0.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion plexus-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.0-alpha-2-SNAPSHOT</version>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ under the License.
<!--bootstrap-end-comment-->
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<groupId>org.apache.maven</groupId>
<artifactId>plexus-utils</artifactId>
<version>${plexusUtilsVersion}</version>
</dependency>
Expand Down