Update to upstream version 2.0.0
This commit is contained in:
Marian Koncek
parent
890465b3cd
commit
d421e5f0cb
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@
|
||||
/noarch
|
||||
/plexus-containers-1.6.tar.gz
|
||||
/plexus-containers-1.7.1.tar.gz
|
||||
/plexus-containers-2.0.0.tar.gz
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 81ed06024dd78113d2e6c5090e59cacc43453a54 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Fri, 20 Jan 2017 17:27:51 +0100
|
||||
Subject: [PATCH] Port to current qdox
|
||||
|
||||
---
|
||||
.../java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java | 2 +-
|
||||
pom.xml | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
|
||||
index 0a798fe..41efa44 100644
|
||||
--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
|
||||
+++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
|
||||
@@ -244,7 +244,7 @@ public class QDoxComponentGleaner
|
||||
// Remove any Plexus specific interfaces from the calculation
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
- List<JavaClass> interfaces = new ArrayList<JavaClass>( javaClass.getImplementedInterfaces() );
|
||||
+ List<JavaClass> interfaces = new ArrayList<JavaClass>( javaClass.getInterfaces() );
|
||||
|
||||
for ( Iterator<JavaClass> it = interfaces.iterator(); it.hasNext(); )
|
||||
{
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index eaba94d..f80f0d2 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -85,7 +85,7 @@
|
||||
<dependency>
|
||||
<groupId>com.thoughtworks.qdox</groupId>
|
||||
<artifactId>qdox</artifactId>
|
||||
- <version>2.0-M2</version>
|
||||
+ <version>2.0-M5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jdom</groupId>
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: plexus-containers
|
||||
Version: 1.7.1
|
||||
Release: 9%{?dist}
|
||||
Version: 2.0.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Containers for Plexus
|
||||
# Most of the files are either under ASL 2.0 or MIT
|
||||
# The following files are under xpp:
|
||||
@ -14,31 +14,26 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver
|
||||
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
Source2: LICENSE.MIT
|
||||
|
||||
Patch0: 0001-Port-to-current-qdox.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.google.guava:guava:20.0)
|
||||
BuildRequires: mvn(commons-cli:commons-cli)
|
||||
BuildRequires: mvn(com.sun:tools)
|
||||
BuildRequires: mvn(com.thoughtworks.qdox:qdox)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-model)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven:maven-project)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.xbean:xbean-reflect)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-cli)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
BuildRequires: mvn(org.jdom:jdom2)
|
||||
BuildRequires: mvn(org.ow2.asm:asm)
|
||||
BuildRequires: mvn(org.ow2.asm:asm-commons)
|
||||
|
||||
Obsoletes: mvn(org.codehaus.plexus:plexus-component-javadoc) <= 1.7.1
|
||||
Obsoletes: mvn(org.codehaus.plexus:plexus-component-javadoc:pom:) <= 1.7.1
|
||||
Obsoletes: plexus-containers-component-javadoc <= 1.7.1
|
||||
|
||||
%description
|
||||
The Plexus project seeks to create end-to-end developer tools for
|
||||
@ -54,12 +49,6 @@ Summary: Component metadata from %{name}
|
||||
%description component-metadata
|
||||
%{summary}.
|
||||
|
||||
%package component-javadoc
|
||||
Summary: Javadoc component from %{name}
|
||||
|
||||
%description component-javadoc
|
||||
%{summary}.
|
||||
|
||||
%package component-annotations
|
||||
Summary: Component API from %{name}
|
||||
|
||||
@ -81,25 +70,13 @@ Summary: API documentation for all plexus-containers packages
|
||||
%prep
|
||||
%setup -q -n %{name}-%{name}-%{version}
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
cp %{SOURCE1} .
|
||||
cp %{SOURCE2} .
|
||||
|
||||
%pom_remove_plugin -r :maven-site-plugin
|
||||
|
||||
# For Maven 3 compat
|
||||
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
|
||||
|
||||
%pom_change_dep -r :google-collections com.google.guava:guava:20.0
|
||||
|
||||
# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM
|
||||
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
|
||||
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
|
||||
|
||||
%pom_remove_dep com.sun:tools plexus-component-javadoc
|
||||
%pom_add_dep com.sun:tools plexus-component-javadoc
|
||||
|
||||
# Generate OSGI info
|
||||
%pom_xpath_inject "pom:project" "
|
||||
<packaging>bundle</packaging>
|
||||
@ -119,12 +96,6 @@ cp %{SOURCE2} .
|
||||
</plugins>
|
||||
</build>" plexus-component-annotations
|
||||
|
||||
# to prevent ant from failing
|
||||
mkdir -p plexus-component-annotations/src/test/java
|
||||
|
||||
# integration tests fix
|
||||
sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|" plexus-component-javadoc/src/it/basic/pom.xml
|
||||
|
||||
# plexus-component-api has been merged into plexus-container-default
|
||||
%mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api"
|
||||
|
||||
@ -137,7 +108,6 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
|
||||
# plexus-containers pom goes into main package
|
||||
%files -f .mfiles-plexus-containers
|
||||
%license LICENSE-2.0.txt LICENSE.MIT
|
||||
@ -147,13 +117,14 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
|
||||
%license LICENSE-2.0.txt LICENSE.MIT
|
||||
%files component-metadata -f .mfiles-plexus-component-metadata
|
||||
%license LICENSE-2.0.txt LICENSE.MIT
|
||||
%files component-javadoc -f .mfiles-plexus-component-javadoc
|
||||
%license LICENSE-2.0.txt LICENSE.MIT
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE-2.0.txt LICENSE.MIT
|
||||
|
||||
%changelog
|
||||
* Thu May 30 2019 Marian Koncek <mkoncek@redhat.com> - 2.0.0-1
|
||||
- Update to upstream version 2.0.0
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.1-9
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (plexus-containers-1.7.1.tar.gz) = d799e70cec8b6ba171e4af406e1ebb038cffa33b9b317d36dd55f9c1f57fb241652509add1806aa7afd17d9be032087e3981983c5f277e5e0d3e618420283314
|
||||
SHA512 (plexus-containers-2.0.0.tar.gz) = 80f1f70a93b29886a2b9c7564b9ab56de82abac95958b7b293b9fff05a18de585a28d748954286a9c5b42c7221a66b10dbc3defa902d64248e9309255620da44
|
||||
|
||||
Loading…
Reference in New Issue
Block a user