rpms/plexus-containers
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 1.7.1

Browse Source
This commit is contained in:
Michael Simacek 2017-01-20 17:32:21 +01:00
parent d8ae4b0cb0
commit 3dedc3c005
7 changed files with 56 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/*.src.rpm
/noarch
/plexus-containers-1.6.tar.gz
/plexus-containers-1.7.1.tar.gz

32
0001-Fix-test-oom.patch
View File

@ -1,32 +0,0 @@
From 8533ee80c48fd43a1ac9bda00a69de10ef65866b Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 28 Jun 2011 12:41:26 +0200
Subject: [PATCH 1/2] Fix test oom
---
...ponentClassicSingletonComponentManagerTest.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java
index 61812f6..33650eb 100644
--- a/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java
+++ b/plexus-container-default/src/test/java/org/codehaus/plexus/component/manager/SlowComponentClassicSingletonComponentManagerTest.java
@@ -34,12 +34,14 @@ public class SlowComponentClassicSingletonComponentManagerTest
/**
* Tests that multiple concurrent threads don't acquire different components.
- */
+ *
+ * Test disabled - failing in mock due to OOM
public void testThreads1000()
throws Exception
{
test( 1000 );
}
+ */
private void test( int count )
throws Exception
--
1.7.5.4

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

@ -0,0 +1,39 @@
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

71
0002-Update-to-Plexus-Classworlds-2.5.patch
View File

@ -1,71 +0,0 @@
From b0d63f977a529a2a782ebf9473e4333416b9cc96 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 5 Dec 2013 14:36:05 +0100
Subject: [PATCH 2/2] Update to Plexus Classworlds 2.5
---
.../org/codehaus/plexus/component/repository/ComponentDescriptor.java | 4 ++--
.../org/codehaus/plexus/component/repository/ComponentDescriptor.java | 4 ++--
pom.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
index 1139d17..51e78ee 100644
--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
@@ -189,7 +189,7 @@ public class ComponentDescriptor<T>
{
try
{
- roleClass = realm.loadClass( role );
+ roleClass = (Class) realm.loadClass( role );
Thread.currentThread();
}
catch ( Throwable ignored )
@@ -299,7 +299,7 @@ public class ComponentDescriptor<T>
{
try
{
- implementationClass = realm.loadClass( implementation );
+ implementationClass = (Class) realm.loadClass( implementation );
Thread.currentThread();
}
catch ( Throwable ignored )
diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
index ef23e19..35fd85e 100644
--- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+++ b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
@@ -189,7 +189,7 @@ public class ComponentDescriptor<T>
{
try
{
- roleClass = getRealm().loadClass( getRole() );
+ roleClass = (Class) getRealm().loadClass( getRole() );
Thread.currentThread();
}
catch ( Throwable ignored )
@@ -299,7 +299,7 @@ public class ComponentDescriptor<T>
{
try
{
- implementationClass = getRealm().loadClass( getImplementation() );
+ implementationClass = (Class) getRealm().loadClass( getImplementation() );
Thread.currentThread();
}
catch ( Throwable ignored )
diff --git a/pom.xml b/pom.xml
index 890fca3..b262fe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
</scm>
<properties>
- <classWorldsVersion>2.2.2</classWorldsVersion>
+ <classWorldsVersion>2.5</classWorldsVersion>
<plexusUtilsVersion>1.4.5</plexusUtilsVersion>
<xbeanReflectVersion>3.4</xbeanReflectVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--
1.8.1.4

235
0003-Port-to-objectweb-asm-5.patch
View File

@ -1,235 +0,0 @@
From c7a9d9ecab6ceb464b41d833fef49b6c2bb0e616 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Fri, 4 Jul 2014 16:23:21 +0100
Subject: [PATCH 3/3] Port to objectweb-asm 5
---
plexus-component-metadata/pom.xml | 6 +-
.../codehaus/plexus/metadata/ann/AnnReader.java | 124 ++-------------------
2 files changed, 12 insertions(+), 118 deletions(-)
diff --git a/plexus-component-metadata/pom.xml b/plexus-component-metadata/pom.xml
index adfb80c..e42be8a 100644
--- a/plexus-component-metadata/pom.xml
+++ b/plexus-component-metadata/pom.xml
@@ -59,9 +59,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.1</version>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>5.0.2</version>
</dependency>
</dependencies>
diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
index 9ff59ac..cb4d45d 100644
--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
+++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
@@ -21,21 +21,21 @@ import java.io.InputStream;
import java.util.ArrayList;
import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.Attribute;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
/**
* @author Eugene Kuleshov
*/
-public class AnnReader implements ClassVisitor {
+public class AnnReader extends ClassVisitor {
private final AnnClass annClass;
private AnnReader(AnnClass annClass) {
+ super(Opcodes.ASM5);
this.annClass = annClass;
}
@@ -64,19 +64,13 @@ public class AnnReader implements ClassVisitor {
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() {
+ return new FieldVisitor(Opcodes.ASM5) {
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
Ann ann = new Ann(desc);
field.addAnn(ann);
return new AnnAnnReader(ann);
}
-
- public void visitAttribute(Attribute attr) {
- }
-
- public void visitEnd() {
- }
};
}
@@ -85,7 +79,7 @@ public class AnnReader implements ClassVisitor {
final AnnMethod method = new AnnMethod(annClass, access, mname, mdesc);
annClass.addMethod(method);
- return new MethodVisitor() {
+ return new MethodVisitor(Opcodes.ASM5) {
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
Ann ann = new Ann(desc);
@@ -98,98 +92,14 @@ public class AnnReader implements ClassVisitor {
method.addParamAnn(parameter, ann);
return new AnnAnnReader(ann);
}
-
- public AnnotationVisitor visitAnnotationDefault() {
- // TODO
- return null;
- }
-
- public void visitAttribute(Attribute attr) {
- }
-
- public void visitCode() {
- }
-
- public void visitFieldInsn(int opcode, String owner, String name, String desc) {
- }
-
- public void visitFrame(int type, int local, Object[] local2, int stack, Object[] stack2) {
- }
-
- public void visitIincInsn(int var, int increment) {
- }
-
- public void visitInsn(int opcode) {
- }
-
- public void visitIntInsn(int opcode, int operand) {
- }
-
- public void visitJumpInsn(int opcode, Label label) {
- }
-
- public void visitLabel(Label label) {
- }
-
- public void visitLdcInsn(Object cst) {
- }
-
- public void visitMethodInsn(int opcode, String owner, String name, String desc) {
- }
-
- public void visitMultiANewArrayInsn(String desc, int dims) {
- }
-
- public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
- }
-
- public void visitTableSwitchInsn(int min, int max, Label dflt, Label[] labels) {
- }
-
- public void visitTypeInsn(int opcode, String type) {
- }
-
- public void visitVarInsn(int opcode, int var) {
- }
-
- public void visitMaxs(int maxStack, int maxLocals) {
- }
-
- public void visitLocalVariable(String name, String desc,
- String signature, Label start, Label end, int index) {
- }
-
- public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
- }
-
- public void visitLineNumber(int line, Label start) {
- }
-
- public void visitEnd() {
- }
-
};
}
- public void visitInnerClass(String name, String outer, String inner, int access) {
- }
-
- public void visitOuterClass(String owner, String name, String desc) {
- }
-
- public void visitAttribute(Attribute attr) {
- }
-
- public void visitSource(String source, String debug) {
- }
-
- public void visitEnd() {
- }
-
- static class AnnAnnReader implements AnnotationVisitor {
+ static class AnnAnnReader extends AnnotationVisitor {
private Ann ann;
public AnnAnnReader(Ann ann) {
+ super(Opcodes.ASM5);
this.ann = ann;
}
@@ -210,13 +120,9 @@ public class AnnReader implements ClassVisitor {
public AnnotationVisitor visitArray(String name) {
return new AnnAnnArrayReader(ann, name);
}
-
- public void visitEnd() {
- }
-
}
- static class AnnAnnArrayReader implements AnnotationVisitor {
+ static class AnnAnnArrayReader extends AnnotationVisitor {
private Ann ann;
@@ -226,6 +132,7 @@ public class AnnReader implements ClassVisitor {
private ArrayList<String> array = new ArrayList<String>();
public AnnAnnArrayReader(Ann ann, String name) {
+ super(Opcodes.ASM5);
this.ann = ann;
this.name = name;
}
@@ -236,21 +143,8 @@ public class AnnReader implements ClassVisitor {
}
}
- public AnnotationVisitor visitAnnotation(String name, String value) {
- return null;
- }
-
- public AnnotationVisitor visitArray(String arg0) {
- return null;
- }
-
public void visitEnd() {
ann.addParam(name, array.toArray(new String[array.size()]));
}
-
- public void visitEnum(String arg0, String arg1, String arg2) {
- }
-
}
-
}
--
1.9.0

20
plexus-containers.spec
View File

@ -1,33 +1,36 @@
Name: plexus-containers
Version: 1.6
Release: 6%{?dist}
Version: 1.7.1
Release: 1%{?dist}
Summary: Containers for Plexus
License: ASL 2.0 and MIT
URL: https://github.com/codehaus-plexus/plexus-containers
BuildArch: noarch
Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
Patch0: 0001-Port-to-current-qdox.patch
BuildRequires: maven-local
BuildRequires: mvn(com.google.collections:google-collections)
BuildRequires: mvn(commons-cli:commons-cli)
BuildRequires: mvn(com.sun:tools)
BuildRequires: mvn(com.thoughtworks.qdox:qdox)
BuildRequires: mvn(jdom:jdom)
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-all)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
%description
@ -81,6 +84,10 @@ Obsoletes: %{name}-container-default-javadoc < %{version}-%{release}
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch0 -p1
%pom_remove_plugin -r :maven-site-plugin
# For Maven 3 compat
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
@ -139,6 +146,9 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
%files javadoc -f .mfiles-javadoc
%changelog
* Fri Jan 20 2017 Michael Simacek <msimacek@redhat.com> - 1.7.1-1
- Update to upstream version 1.7.1
* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-6
- Regenerate build-requires

2
sources
View File

@ -1 +1 @@
714aacab3f96df34dffa2d2e9db6d3b1 plexus-containers-1.6.tar.gz
SHA512 (plexus-containers-1.7.1.tar.gz) = d799e70cec8b6ba171e4af406e1ebb038cffa33b9b317d36dd55f9c1f57fb241652509add1806aa7afd17d9be032087e3981983c5f277e5e0d3e618420283314