From c05b43d15f040f12a6b7ff4f274e74ffca9777cb Mon Sep 17 00:00:00 2001 From: Nicolas De Amicis Date: Thu, 31 Mar 2022 14:19:34 +0200 Subject: [PATCH] Bump version to 3.3.0 --- .gitignore | 1 + maven-shade-plugin.spec | 20 +++++++++++++------- sources | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0121b37..833da95 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /maven-shade-plugin-3.2.1-source-release.zip /maven-shade-plugin-3.2.3-source-release.zip /maven-shade-plugin-3.2.4-source-release.zip +/maven-shade-plugin-3.3.0-source-release.zip diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec index cc98ae7..6966918 100644 --- a/maven-shade-plugin.spec +++ b/maven-shade-plugin.spec @@ -1,6 +1,6 @@ Name: maven-shade-plugin -Version: 3.2.4 -Release: 7%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: Maven plugin for packaging artifacts in an uber-jar License: ASL 2.0 @@ -10,7 +10,6 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/ BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-lang3) @@ -32,13 +31,15 @@ BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.vafer:jdependency) BuildRequires: mvn(xmlunit:xmlunit) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(org.apache.commons:commons-collections4) %description This plugin provides the capability to package the artifact in an uber-jar, including its dependencies and to shade - i.e. rename - the packages of some of the dependencies. - %package javadoc Summary: API documentation for %{name} @@ -51,11 +52,13 @@ Summary: API documentation for %{name} rm src/test/jars/plexus-utils-1.4.1.jar ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar -%pom_remove_dep 'com.google.guava:guava:' -%pom_add_dep 'com.google.guava:guava' +%pom_remove_dep 'org.eclipse.sisu:org.eclipse.sisu.inject:' +%pom_remove_dep 'org.eclipse.sisu:org.eclipse.sisu.plexus:' +%pom_remove_dep 'org.sonatype.sisu:sisu-guice:' +%pom_remove_plugin 'org.eclipse.sisu:sisu-maven-plugin' %build -%mvn_build +%mvn_build -f %install %mvn_install @@ -67,6 +70,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar %license LICENSE NOTICE %changelog +* Thu Mar 31 2022 Nicolas De Amicis - 3.3.0-1 +- Bump version to 3.3.0 + * Sat Feb 05 2022 Jiri Vanek - 3.2.4-7 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index c4e487f..9aaf87c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-shade-plugin-3.2.4-source-release.zip) = 9c0b09724c9cc0e27251ca7949203d14b83a6cb898daeab64291d39123964b9f5243e9529694622a53499c96db223307be04a89fbe45371fd61535e3b0a5fc5f +SHA512 (maven-shade-plugin-3.3.0-source-release.zip) = f88196508ca14442c7b6e6cf8e09b9e6d5ad7139e5c95d27b4f0ae390c4339277248ded7ddef5fd43151b9bc6abaaab6157d478fe4a73f941004cb8429bbfefd