Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to the Maven 4 API #70

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Switch to the Maven 4 API #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95cf9b1
Switch to Maven 4.0.0-alpha-9
gnodet Dec 15, 2023
c22d55f
Switch to alpha 11
gnodet Dec 20, 2023
2870974
Update to alpha-12
gnodet Jan 12, 2024
db4861e
Upgrade to alpha-13 (wip)
gnodet Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
82 changes: 32 additions & 50 deletions pom.xml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
</parent>

<artifactId>maven-jar-plugin</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Apache Maven JAR Plugin</name>
Expand Down Expand Up @@ -74,33 +74,29 @@

<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.2.5</mavenVersion>
<mavenArchiverVersion>3.6.1</mavenArchiverVersion>
<junitVersion>5.10.1</junitVersion>
<mavenVersion>4.0.0-alpha-13-SNAPSHOT</mavenVersion>
<mavenPluginPluginVersion>3.11.1-SNAPSHOT</mavenPluginPluginVersion>
<mavenArchiverVersion>4.0.0-SNAPSHOT</mavenArchiverVersion>
<project.build.outputTimestamp>2022-09-12T15:53:21Z</project.build.outputTimestamp>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junitVersion}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<artifactId>maven-api-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
Expand All @@ -114,55 +110,41 @@
<artifactId>maven-archiver</artifactId>
<version>${mavenArchiverVersion}</version>
</dependency>
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>

<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.3.0</version>
<version>4.0.0-alpha-3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
<version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
<version>3.0.0</version>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<filtering>true</filtering>
<directory>src/main/filtered-resources</directory>
</resource>
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${mavenPluginPluginVersion}</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions src/it/MJAR-228/verify.bsh
View file
Open in desktop
Expand Up @@ -51,8 +51,9 @@ try
}
if ( !"lib/junit-4.13.2.jar lib/hamcrest-core-1.3.jar".equals( manifest.get( Attributes.Name.CLASS_PATH ) ) )
{
System.err.println( Attributes.Name.CLASS_PATH.toString() +
" not equals lib/junit-4.13.2.jar lib/hamcrest-core-1.3.jar" );
System.err.println( Attributes.Name.CLASS_PATH.toString() +
" equals '" + manifest.get( Attributes.Name.CLASS_PATH ) + "' " +
" but should be 'lib/junit-4.13.2.jar lib/hamcrest-core-1.3.jar'" );
return false;
}

Expand Down
101 changes: 0 additions & 101 deletions src/main/filtered-resources/META-INF/plexus/components.xml
View file
Open in desktop

This file was deleted.