Skip to content

Commit

Permalink
Fixing dependencies conflicts for Maven 3.6.3 (JDK 1.8).
Browse files Browse the repository at this point in the history
  • Loading branch information
antonio-petricca committed Aug 12, 2024
1 parent d2783fd commit 12d917a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 31 deletions.
31 changes: 5 additions & 26 deletions plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
https://maven.apache.org/guides/plugin/guide-java-plugin-development.html
https://central.sonatype.org/publish/#individual-projects-open-source-software-repository-hosting-ossrh
https://central.sonatype.org/publish/publish-maven/#deployment
https://central.sonatype.org/publish/requirements/#sufficient-metadata
https://central.sonatype.org/publish/requirements/gpg/#listing-keys
https://issues.sonatype.org/browse/OSSRH-96209?page=com.atlassian.jira.plugin.system.issuetabpanels%3Aall-tabpanel
https://www.baeldung.com/maven-plugin
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
Expand Down Expand Up @@ -45,7 +47,7 @@

<groupId>io.github.antonio-petricca</groupId>
<artifactId>filemerger-maven-plugin</artifactId>
<version>1.5.1</version>
<version>1.5.3</version>

<packaging>maven-plugin</packaging>

Expand All @@ -56,46 +58,23 @@
</properties>

<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.15.0</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.9.8</version>
<version>3.6.3</version> <!-- Pinned -->
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
<version>3.3.2</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.9.8</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.12.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.2.1</version>
<scope>provided</scope>
<version>3.13.1</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package io.github.antoniopetricca.maven.plugins.filemerger;

// https://www.baeldung.com/maven-plugin

import io.github.antoniopetricca.maven.plugins.filemerger.configuration.*;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -515,7 +513,10 @@ public void execute()

mergeTargetFile(targetFile, properties, sourceFiles, projectBaseDir);
} catch(IOException | MavenFilteringException exception) {
throw new MojoExecutionException(exception);
throw new MojoExecutionException(
exception.getMessage(),
exception
);
}
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>io.github.antonio-petricca</groupId>
<artifactId>filemerger-maven-plugin-pom</artifactId>
<version>1.5.1</version>
<version>1.5.3</version>

<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion tester/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>io.github.antonio-petricca</groupId>
<artifactId>filemerger-maven-plugin-tester</artifactId>
<version>1.5.1</version>
<version>1.5.3</version>

<packaging>jar</packaging>

Expand Down

0 comments on commit 12d917a

Please sign in to comment.