rpm/plexus-containers
SHA256
1
0
Fork 0
forked from pool/plexus-containers
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=24

Browse Source
This commit is contained in:
Fridrich Strba 2019-11-22 02:37:14 +00:00 committed by Git OBS Bridge
parent 3e2cb01cc8
commit ee46c24d79
8 changed files with 71 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Port-to-current-qdox.patch
View File

@ -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

14
plexus-component-metadata.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package plexus
# spec file for package plexus-component-metadata
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%global comp_name plexus-component-metadata
%bcond_with tests
Name: %{comp_name}
Version: 1.7.1
Version: 2.1.0
Release: 0
Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT
@ -33,7 +33,7 @@ URL: https://github.com/codehaus-plexus/plexus-containers
Source0: https://github.com/codehaus-plexus/%{base_name}/archive/%{base_name}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
Patch0: 0001-Port-to-current-qdox.patch
Patch0: plexus-containers-asm6.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(com.thoughtworks.qdox:qdox)
@ -95,9 +95,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%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>
@ -120,9 +117,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
# 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
%build
pushd %{comp_name}
%{mvn_file} :%{comp_name} %{base_name}/%{comp_name}

3
plexus-containers-1.7.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec0608d1c144450eb299b0cd964c3b5fbb8b36143bf18c8019481187c1788577
size 349903

3
plexus-containers-2.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b077bff72fd7b7705e3410557f38f7b7671babaefab28a0e70ccb7b1e3eac6c
size 347570

48
plexus-containers-asm6.patch Normal file
View File

@ -0,0 +1,48 @@
diff -urEbwB plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
--- plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java 2019-10-23 12:28:46.000000000 +0200
+++ plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java 2019-11-22 03:26:41.546581926 +0100
@@ -35,7 +35,7 @@
private final AnnClass annClass;
private AnnReader(AnnClass annClass) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.annClass = annClass;
}
@@ -64,7 +64,7 @@
public FieldVisitor visitField(int access, final String name, final String desc, String signature, Object value) {
final AnnField field = new AnnField(annClass, access, name, desc);
annClass.addField(field);
- return new FieldVisitor(Opcodes.ASM7) {
+ return new FieldVisitor(Opcodes.ASM6) {
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
Ann ann = new Ann(desc);
@@ -79,7 +79,7 @@
final AnnMethod method = new AnnMethod(annClass, access, mname, mdesc);
annClass.addMethod(method);
- return new MethodVisitor(Opcodes.ASM7) {
+ return new MethodVisitor(Opcodes.ASM6) {
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
Ann ann = new Ann(desc);
@@ -99,7 +99,7 @@
private Ann ann;
public AnnAnnReader(Ann ann) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.ann = ann;
}
@@ -132,7 +132,7 @@
private ArrayList<String> array = new ArrayList<String>();
public AnnAnnArrayReader(Ann ann, String name) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.ann = ann;
this.name = name;
}

4
plexus-containers-build.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6498e024e6f2b30aedf22b10a4006023d4a8ac27d6eb26a010ae0357d3eb444
size 4964
oid sha256:9a06444eb2bd8543e75e5828db22a6a693a0fa14e5548c724421cc0e33d7cdee
size 4968

40
plexus-containers.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package plexus-containers
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%bcond_with tests
Name: plexus-containers
Version: 1.7.1
Version: 2.1.0
Release: 0
Summary: Containers for Plexus
# Most of the files are either under ASL 2.0 or MIT
@ -32,16 +32,14 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
Source100: %{name}-build.tar.xz
Patch0: 0001-Port-to-current-qdox.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: guava20
BuildRequires: guava
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: plexus-classworlds
BuildRequires: plexus-utils
BuildRequires: xbean
BuildConflicts: java-devel >= 9
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
@ -55,14 +53,6 @@ application server. There are many reusable components for hibernate,
form processing, jndi, i18n, velocity, etc. Plexus also includes an
application server which is like a J2EE application server.
%package component-javadoc
Summary: Javadoc component from %{name}
Group: Development/Libraries/Java
Requires: mvn(com.sun:tools)
%description component-javadoc
%{summary}.
%package component-annotations
Summary: Component API from %{name}
Group: Development/Libraries/Java
@ -73,7 +63,7 @@ Group: Development/Libraries/Java
%package container-default
Summary: Default Container from %{name}
Group: Development/Libraries/Java
Requires: mvn(com.google.guava:guava:20.0)
Requires: mvn(com.google.guava:guava)
Requires: mvn(org.apache.xbean:xbean-reflect)
Requires: mvn(org.codehaus.plexus:plexus-classworlds)
Requires: mvn(org.codehaus.plexus:plexus-utils)
@ -94,13 +84,11 @@ Group: Documentation/HTML
%setup -q -n %{name}-%{name}-%{version} -a100
mkdir -p lib
build-jar-repository -s lib plexus/classworlds plexus/utils guava20/guava-20.0 junit xbean/xbean-reflect
build-jar-repository -s lib plexus/classworlds plexus/utils guava/guava junit xbean/xbean-reflect
%if %{with tests}
build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest/core
%endif
%patch0 -p1
cp %{SOURCE1} .
cp %{SOURCE2} .
@ -117,9 +105,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%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>
@ -142,11 +127,8 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
# 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
%build
for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do
for i in plexus-component-annotations plexus-container-default; do
pushd ${i}
%pom_remove_parent .
%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId><version>%{version}</version>" .
@ -161,7 +143,7 @@ done
%install
# jars
install -dm 0755 %{buildroot}%{_javadir}/%{name}
for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do
for i in plexus-component-annotations plexus-container-default; do
install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
done
install -dm 0755 %{buildroot}%{_javadir}/plexus
@ -170,16 +152,15 @@ ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexu
# poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do
for i in plexus-component-annotations plexus-container-default; do
install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
done
%add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations
%add_maven_depmap %{name}/plexus-component-javadoc.pom %{name}/plexus-component-javadoc.jar -f component-javadoc
%add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
for i in plexus-component-annotations plexus-component-javadoc plexus-container-default; do
for i in plexus-component-annotations plexus-container-default; do
cp -pr ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
done
%fdupes -s %{buildroot}%{_javadocdir}
@ -191,9 +172,6 @@ done
%files container-default -f .mfiles-container-default
%license LICENSE-2.0.txt LICENSE.MIT
%files component-javadoc -f .mfiles-component-javadoc
%license LICENSE-2.0.txt LICENSE.MIT
%files javadoc
%license LICENSE-2.0.txt LICENSE.MIT
%{_javadocdir}/%{name}

19
plexus-metadata-generator.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package plexus-metadata-generator
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%global comp_name component-metadata
%bcond_with tests
Name: plexus-metadata-generator
Version: 1.7.1
Version: 2.1.0
Release: 0
Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT
@ -34,7 +34,7 @@ Source0: https://github.com/codehaus-plexus/%{base_name}/archive/%{base_n
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
Source100: %{base_name}-build.tar.xz
Patch0: 0001-Port-to-current-qdox.patch
Patch0: plexus-containers-asm6.patch
Patch1000: %{name}-nomojo.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
@ -50,9 +50,8 @@ BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
BuildRequires: qdox >= 2
BuildRequires: xbean
BuildConflicts: java-devel >= 9
Requires: apache-commons-cli
Requires: guava20
Requires: guava
Requires: jdom2
Requires: objectweb-asm
Requires: plexus-cli
@ -109,9 +108,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
%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>
@ -134,17 +130,12 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
# 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
rm -rf plexus-%{comp_name}/src/main/java/org/codehaus/plexus/maven
rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven
%pom_remove_dep :maven-core plexus-%{comp_name}
%pom_remove_dep :maven-model plexus-%{comp_name}
%pom_remove_dep :maven-plugin-api plexus-%{comp_name}
%pom_remove_dep :maven-project plexus-%{comp_name}
%pom_remove_dep :maven-plugin-annotations plexus-%{comp_name}
%pom_remove_parent plexus-%{comp_name}
%pom_xpath_inject "pom:project" "
@ -176,7 +167,7 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
# script
%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava20/guava-20.0:xbean/xbean-reflect %{name}
%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
%files -f .mfiles
%license LICENSE-2.0.txt LICENSE.MIT