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

[MJAR-278] Update plugin (requires Maven 3.2.5+) #19

Merged
merged 7 commits into from
Jul 2, 2022
Merged

[MJAR-278] Update plugin (requires Maven 3.2.5+) #19

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21716f5
Update plugin
cstamas Oct 11, 2021
e984eb7
Merge remote-tracking branch 'origin/master' into update-plugin
cstamas Apr 14, 2022
f8ed4a5
Update parent
cstamas Apr 14, 2022
19998f4
Merge remote-tracking branch 'origin/master' into update-plugin
cstamas Jun 27, 2022
2665f79
Update bits to not require m-shared-util
cstamas Jun 27, 2022
19e651f
Set released version
cstamas Jul 2, 2022
9d1833a
Drop p-u
cstamas Jul 2, 2022
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
38 changes: 8 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,8 @@
</distributionManagement>

<properties>
<mavenFileManagementVersion>3.0.0</mavenFileManagementVersion>
<mavenArchiverVersion>3.5.2</mavenArchiverVersion>
<mavenVersion>3.1.0</mavenVersion>
<!-- TODO remove with Maven APi upgrade -->
<!-- the same version as in Maven 3.1.0 -->
<sisuVersion>0.0.0.M2a</sisuVersion>
<javaVersion>8</javaVersion>
<mavenVersion>3.2.5</mavenVersion>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment as on war. Is the projct ready to drop 3.1.1 support?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is requirement dictated by maven-plugin-testing-harness v 3.3.0

<project.build.outputTimestamp>2022-01-08T21:19:21Z</project.build.outputTimestamp>
</properties>

Expand Down Expand Up @@ -113,43 +108,26 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>file-management</artifactId>
<version>${mavenFileManagementVersion}</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>${mavenArchiverVersion}</version>
<version>3.6.0</version>
</dependency>
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
<!--
! other dependencies contain references to older versions
! so we define it here explicit to make sure we get the
! correct version for plexus-utils.
-->
<!--
! maven-shared-utils is pulled by file-management
! Need to use a more recent version otherwise
! the build will fail. This needed to be kept
! here until a new version of file-management
! has been made.
-->
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>3.3.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
<scope>runtime</scope>
<artifactId>plexus-archiver</artifactId>
<version>4.3.0</version>
</dependency>

<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -159,7 +137,7 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>3.1.0</version>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down