From 8a82b77e5b03970d66284ae80fb03bb32f00d51c Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 15 2020 17:50:57 +0000 Subject: Orphaned for 6+ weeks --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 49ce2ef..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -maven-release-2.0.tar.xz -/maven-release-2.0.tar.xz -/maven-release-2.2.tar.xz -maven-release-2.2.1-source-release.zip diff --git a/002-mavenrelease-fixbuild.patch b/002-mavenrelease-fixbuild.patch deleted file mode 100644 index 5011340..0000000 --- a/002-mavenrelease-fixbuild.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- maven-release-2.2/maven-release-manager/pom.xml 2011-06-27 10:45:56.000000000 +0200 -+++ maven-release-2.2-patched/maven-release-manager/pom.xml 2011-07-26 16:06:54.854973698 +0200 -@@ -80,6 +80,12 @@ - - - org.apache.maven -+ maven-compat -+ ${mavenVersion} -+ -+ -+ -+ org.apache.maven - maven-model - ${mavenVersion} - -@@ -254,13 +243,13 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -+ plexus-component-metadata - - - create-component-descriptor - generate-resources - -- descriptor -+ generate-metadata - - - -@@ -274,7 +263,7 @@ - - process-resources - -- merge-descriptors -+ merge-metadata - - - ---- maven-release-2.2/maven-release-plugin/pom.xml 2011-06-27 10:45:56.000000000 +0200 -+++ maven-release-2.2-patched/maven-release-plugin/pom.xml 2011-07-26 16:03:02.203751549 +0200 -@@ -53,6 +53,11 @@ - - - org.apache.maven -+ maven-compat -+ ${mavenVersion} -+ -+ -+ org.apache.maven - maven-plugin-api - ${mavenVersion} - diff --git a/003-fixing-migration-to-component-metadata.patch b/003-fixing-migration-to-component-metadata.patch deleted file mode 100644 index 5609260..0000000 --- a/003-fixing-migration-to-component-metadata.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur maven-release-2.2.1.orig/maven-release-manager/pom.xml maven-release-2.2.1/maven-release-manager/pom.xml ---- maven-release-2.2.1.orig/maven-release-manager/pom.xml 2012-09-12 14:06:31.000000000 +0200 -+++ maven-release-2.2.1/maven-release-manager/pom.xml 2012-09-17 15:00:16.873536747 +0200 -@@ -295,8 +295,8 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -- 1.3.8 -+ plexus-component-metadata -+ 1.5.5 - - - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/maven-release-MNG-3954.patch b/maven-release-MNG-3954.patch deleted file mode 100644 index 557111e..0000000 --- a/maven-release-MNG-3954.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java~ 2011-07-28 15:42:12.000000000 +0200 -+++ maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java 2015-11-27 08:41:43.677304909 +0100 -@@ -364,8 +364,7 @@ - - if ( releaseEnvironment.getSettings() != null ) - { -- // FIXME: This is effectively useless in Maven 2.x, since getFile() always returns null -- File settingsFile = releaseEnvironment.getSettings().getRuntimeInfo().getFile(); -+ File settingsFile = org.apache.maven.settings.RuntimeInfo.DEFAULT_USER_SETTINGS_FILE; - if ( settingsFile != null && settingsFile.isFile() ) - { - req.setUserSettingsFile( settingsFile ); diff --git a/maven-release-ftbfs.patch b/maven-release-ftbfs.patch deleted file mode 100644 index 50ac412..0000000 --- a/maven-release-ftbfs.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- maven-release-2.2.1/maven-release-manager/src/main/mdo/release-descriptor.mdo.orig 2013-12-24 02:51:03.017016426 -0200 -+++ maven-release-2.2.1/maven-release-manager/src/main/mdo/release-descriptor.mdo 2013-12-24 02:51:57.939013819 -0200 -@@ -523,7 +523,7 @@ - - versionsMap.put( DEVELOPMENT_KEY, developmentVersion ); - versionsMap.put( RELEASE_KEY, releaseVersion ); -- resolvedSnapshotDependencies.put( artifactName, versionsMap ); -+ resolvedSnapshotDependencies.put( artifactName, String.class.cast(versionsMap) ); - } - - /** -@@ -575,7 +575,7 @@ - assert !originalScmInfo.containsKey( projectId ); - } - -- originalScmInfo.put( projectId, scm ); -+ originalScmInfo.put( projectId, String.class.cast(scm) ); - } - - /** -@@ -613,8 +613,8 @@ - { - if ( ( resolvedSnapshotDependencies == null ) && ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) ) ) - { -- java.util.Map versionMap = ( java.util.Map ) resolvedSnapshotDependencies.get( artifactConflictId ); -- return ( String ) versionMap.get( DEVELOPMENT_KEY ); -+ java.util.Map versionMap = java.util.Map.class.cast(resolvedSnapshotDependencies.get( artifactConflictId )); -+ return String.class.cast(versionMap.get( DEVELOPMENT_KEY )); - } - return null; - } -@@ -627,8 +627,8 @@ - { - if ( ( resolvedSnapshotDependencies == null ) && ( resolvedSnapshotDependencies.containsKey( artifactConflictId ) ) ) - { -- java.util.Map versionMap = ( java.util.Map ) resolvedSnapshotDependencies.get( artifactConflictId ); -- return ( String ) versionMap.get( RELEASE_KEY ); -+ java.util.Map versionMap = java.util.Map.class.cast(resolvedSnapshotDependencies.get( artifactConflictId )); -+ return String.class.cast(versionMap.get( RELEASE_KEY )); - } - return null; - } diff --git a/maven-release.spec b/maven-release.spec deleted file mode 100644 index e48a4cf..0000000 --- a/maven-release.spec +++ /dev/null @@ -1,239 +0,0 @@ -Name: maven-release -Version: 2.2.1 -Release: 24%{?dist} -Summary: Release a project updating the POM and tagging in the SCM -License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-release-plugin/ -BuildArch: noarch - -Source0: http://repo1.maven.org/maven2/org/apache/maven/release/%{name}/%{version}/%{name}-%{version}-source-release.zip - -# Remove deps needed for tests, till jmock gets packaged -Patch1: 002-mavenrelease-fixbuild.patch -Patch2: 003-fixing-migration-to-component-metadata.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1015123 -Patch3: %{name}-ftbfs.patch -# Maven's Setting.getRuntimeInfo() was removed, see https://issues.apache.org/jira/browse/MNG-3954 -Patch4: %{name}-MNG-3954.patch - -BuildRequires: maven-local -BuildRequires: mvn(commons-cli:commons-cli) -BuildRequires: mvn(commons-lang:commons-lang) -BuildRequires: mvn(jaxen:jaxen) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-artifact-manager) -BuildRequires: mvn(org.apache.maven:maven-compat) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-model) -BuildRequires: mvn(org.apache.maven:maven-parent:pom:) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven:maven-settings) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.scm:maven-scm-api) -BuildRequires: mvn(org.apache.maven.scm:maven-scm-provider-svn-commons) -BuildRequires: mvn(org.apache.maven.shared:maven-invoker) -BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) -BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api) -BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.jdom:jdom) -BuildRequires: mvn(org.sonatype.plexus:plexus-sec-dispatcher) - -%description -This plugin is used to release a project with Maven, saving a lot of -repetitive, manual work. Releasing a project is made in two steps: -prepare and perform. - -%package manager -Summary: Release a project updating the POM and tagging in the SCM - -%description manager -This package contains %{name}-manager needed by %{name}-plugin. - -%package plugin -Summary: Release a project updating the POM and tagging in the SCM - -%description plugin -This plugin is used to release a project with Maven, saving a lot of -repetitive, manual work. Releasing a project is made in two steps: -prepare and perform. - -%package javadoc -Summary: Javadoc for %{name} -Provides: %{name}-manager-javadoc = %{version}-%{release} -Obsoletes: %{name}-manager-javadoc <= 2.0-1 -Provides: %{name}-plugin-javadoc = %{version}-%{release} -Obsoletes: %{name}-plugin-javadoc <= 2.0-1 - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -q -n %{name}-%{version} - -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p0 - -cat > README << EOT -%{name}-%{version} - -This plugin is used to release a project with Maven, saving a lot of -repetitive, manual work. Releasing a project is made in two steps: -prepare and perform. -EOT - - -%build - -%mvn_file :%{name}-manager %{name}-manager -%mvn_file :%{name}-plugin %{name}-plugin -%mvn_package :%{name}-manager manager -%mvn_package :%{name}-plugin plugin -# Skip tests because we don't have dependencies (jmock) -%mvn_build -f - -%install -%mvn_install - -%files -f .mfiles -%doc LICENSE NOTICE README - -%files manager -f .mfiles-manager -%doc LICENSE NOTICE - -%files plugin -f .mfiles-plugin -%doc LICENSE NOTICE - -%files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE - -%changelog -* Wed Jan 29 2020 Fedora Release Engineering - 2.2.1-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.2.1-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 2.2.1-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 2.2.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 08 2018 Merlin Mathesius - 2.2.1-19 -- Add missing BR on jaxen to fix FTBFS - -* Wed Jul 26 2017 Fedora Release Engineering - 2.2.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.2.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jun 15 2016 Mikolaj Izdebski - 2.2.1-16 -- Regenerate build-requires - -* Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Nov 27 2015 Mikolaj Izdebski - 2.2.1-14 -- Add patch for MNG-3954 -- Resolves: rhbz#1239670 - -* Wed Jun 17 2015 Fedora Release Engineering - 2.2.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.2.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 28 2014 Michal Srb - 2.2.1-12 -- Rebuild to regenerate auto-requires - -* Wed Mar 19 2014 Mikolaj Izdebski - 2.2.1-11 -- Add missing BR on modello -- Resolves: rhbz#1077909 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 2.2.1-10 -- Use Requires: java-headless rebuild (#1067528) - -* Wed Jan 08 2014 pcpa - 2.2.1-10 -- fix rhbz#1015123 - -* Mon Aug 12 2013 gil cattaneo 2.2.1-9 -- fix rhbz#984875, rhbz#992200 -- fix some rpmlint problems -- update to current packaging guidelines - -* Sat Aug 03 2013 Fedora Release Engineering - 2.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 2.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 2.2.1-6 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Mon Sep 17 2012 Jaromir Capik - 2.2.1-5 -- Fixing incomplete migration to component metadata - -* Tue Aug 7 2012 Mikolaj Izdebski - 2.2.1-4 -- Remove BR: maven-scm-test - -* Thu Jul 19 2012 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 2.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 29 2011 Alexander Kurtakov 2.2.1-1 -- Update to latest upstream release. -- Adapt to current guidelines. - -* Tue Jul 26 2011 Guido Grazioli - 2.2-3 -- Reinclude maven-scm-test in BRs - -* Tue Jul 26 2011 Guido Grazioli - 2.2-2 -- Import patch provided by Jaromír Cápík (#725088) - -* Mon Jul 18 2011 Guido Grazioli - 2.2-1 -- Update to 2.2 -- Update to current guidelines -- Build with maven 3 - -* Tue Feb 08 2011 Fedora Release Engineering - 2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 3 2011 Alexander Kurtakov 2.0-2 -- Drop tomcat5 BRs. -- Drop versioned jars. - -* Mon Sep 13 2010 Guido Grazioli - 2.0-1 -- Update to upstream 2.0 - -* Sat Sep 11 2010 Guido Grazioli - 2.0-0.659858svn.4 -- Fix build requires -- Use javadoc:aggregate goal - -* Tue May 25 2010 Guido Grazioli - 2.0-0.659858svn.3 -- Fix build requires - -* Mon May 10 2010 Guido Grazioli - 2.0-0.659858svn.2 -- Fix release tag -- Better macro usage - -* Mon Apr 26 2010 Guido Grazioli - 2.0-0.659858svn.1 -- Install maven-release-parent pom in dedicated package -- Patch maven-release-plugin to skip helpmojo goal -- Patch to skip tests depending on (unpackaged) jmock - -* Fri Apr 16 2010 Guido Grazioli - 2.0-0.659858svn -- Initial packaging diff --git a/sources b/sources deleted file mode 100644 index cfe0cf1..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -1d135afb48bf3841f4ec4c9db5b57234 maven-release-2.2.tar.xz -adfb662ff2b604e46b1466b369dce8a7 maven-release-2.2.1-source-release.zip