commit 80e53710f524d248402cab752682f5cc23be665d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 07:00:16 2015 +0100
Update to upstream milestone 0.3.0.M1
.gitignore | 2 +
sisu-ignored-tests.patch | 151 ++++++++++++++++++++++++++++++++++++++++++++++
sisu.spec | 23 +++++---
sources | 4 +-
4 files changed, 170 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaa901a..bd7e4bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
/org.eclipse.sisu.plexus-0.2.0.tar.bz2
/org.eclipse.sisu.inject-0.2.1.tar.bz2
/org.eclipse.sisu.plexus-0.2.1.tar.bz2
+/org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
+/org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
diff --git a/sisu-ignored-tests.patch b/sisu-ignored-tests.patch
index 1115049..484fa7d 100644
--- a/sisu-ignored-tests.patch
+++ b/sisu-ignored-tests.patch
@@ -52,3 +52,154 @@
public void testMarkedWithAttributesSearch()
{
final LocatedBeans<Marked, Bean> beans =
+---
sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java~ 2014-08-24
01:48:47.000000000 +0200
++++
sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java 2015-02-04
07:06:49.696531924 +0100
+@@ -159,83 +159,6 @@
+ new PlexusXmlScanner( null, plexusXml, null ).scan( space, true );
+ }
+
+- @SuppressWarnings( "deprecation" )
+- public void testComponents()
+- {
+- final ClassSpace space = new URLClassSpace(
PlexusXmlScannerTest.class.getClassLoader() );
+-
+- final Map<String, PlexusBeanMetadata> metadata = new HashMap<String,
PlexusBeanMetadata>();
+- final PlexusXmlScanner scanner = new PlexusXmlScanner( null, null, metadata );
+-
+- final Map<Component, DeferredClass<?>> componentMap = scanner.scan(
space, true );
+-
+- assertEquals( 6, componentMap.size() );
+-
+- final Component component1 =
+- new ComponentImpl( DefaultBean.class, Hints.DEFAULT_HINT,
Strategies.PER_LOOKUP, "" );
+- assertEquals( DefaultBean.class, componentMap.get( component1 ).load() );
+-
+- final Component component2 = new ComponentImpl( Bean.class, "debug",
Strategies.SINGLETON, "For debugging" );
+- assertEquals( DebugBean.class, componentMap.get( component2 ).load() );
+-
+- final Component component3 = new ComponentImpl( Bean.class, Hints.DEFAULT_HINT,
Strategies.SINGLETON, "" );
+- assertEquals( AnotherBean.class, componentMap.get( component3 ).load() );
+-
+- final Component component4 = new ComponentImpl( Bean.class, "clone",
Strategies.SINGLETON, "" );
+- assertEquals( DefaultBean.class, componentMap.get( component4
).load().getSuperclass() );
+- final Class<?> proxy = CustomTestClassLoader.proxy( componentMap.get(
component4 ).load() );
+-
+- try
+- {
+- assertNotNull( proxy.getMethod( "TestMe" ) );
+- }
+- catch ( final NoSuchMethodException e )
+- {
+- fail( "Proxied class is missing 'TestMe' method" );
+- }
+-
+- final PlexusBeanMetadata metadata1 = metadata.get( DefaultBean.class.getName()
);
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new ConfigurationImpl( "someFieldName",
"<some-field-name><item>PRIMARY</item></some-field-name>"
),
+- metadata1.getConfiguration( new NamedProperty(
"someFieldName" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "simple", "value" ),
+- metadata1.getConfiguration( new NamedProperty( "simple"
) ) );
+-
+- assertEquals( new ConfigurationImpl( "value", "<value
with=\"attribute\"></value>" ),
+- metadata1.getConfiguration( new NamedProperty( "value" )
) );
+-
+- assertEquals( new ConfigurationImpl( "emptyValue1",
"<empty-value1 with=\"attribute\" />" ),
+- metadata1.getConfiguration( new NamedProperty(
"emptyValue1" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "emptyValue2", "" ),
+- metadata1.getConfiguration( new NamedProperty(
"emptyValue2" ) ) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new RequirementImpl( Bean.class, true, "debug" ),
+- metadata1.getRequirement( new NamedProperty( "bean",
TypeLiteral.get( Bean.class ) ) ) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- metadata1.getConfiguration( new NamedProperty( "foo" ) );
+-
+- assertEquals( new RequirementImpl( Bean.class, false, Hints.DEFAULT_HINT,
"debug" ),
+- metadata1.getRequirement( new NamedProperty( "beanMap" )
) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new RequirementImpl( Bean.class, false ),
+- metadata1.getRequirement( new NamedProperty( "beanField"
) ) );
+-
+- assertTrue( metadata1.isEmpty() );
+-
+- assertNotNull( metadata.get( AnotherBean.class.getName() ) );
+- assertNull( metadata.get( DebugBean.class.getName() ) );
+- }
+-
+ static class FixedClassSpace
+ implements ClassSpace
+ {
+@@ -392,64 +315,4 @@
+ }
+ }
+
+- static final class CustomTestClassLoader
+- extends ClassLoader
+- {
+- private static final String PROXY_MARKER = "$proxy";
+-
+- CustomTestClassLoader( final ClassLoader parent )
+- {
+- super( parent );
+- }
+-
+- static Class<?> proxy( final Class<?> clazz )
+- {
+- try
+- {
+- return new CustomTestClassLoader( clazz.getClassLoader() ).loadClass(
clazz.getName() + PROXY_MARKER );
+- }
+- catch ( final ClassNotFoundException e )
+- {
+- throw new TypeNotPresentException( clazz.getName(), e );
+- }
+- }
+-
+- @Override
+- protected synchronized Class<?> loadClass( final String name, final
boolean resolve )
+- throws ClassNotFoundException
+- {
+- return super.loadClass( name, resolve );
+- }
+-
+- @Override
+- protected Class<?> findClass( final String name )
+- throws ClassNotFoundException
+- {
+- final String proxyName = name.replace( '.', '/' );
+- final String superName = proxyName.substring( 0, proxyName.length() -
PROXY_MARKER.length() );
+-
+- final ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_MAXS );
+- cw.visit( Opcodes.V1_5, Modifier.PUBLIC | Modifier.FINAL, proxyName, null,
superName, null );
+- MethodVisitor mv = cw.visitMethod( Modifier.PUBLIC,
"<init>", "()V", null, null );
+-
+- mv.visitCode();
+- mv.visitVarInsn( Opcodes.ALOAD, 0 );
+- mv.visitMethodInsn( Opcodes.INVOKESPECIAL, superName,
"<init>", "()V", false );
+- mv.visitInsn( Opcodes.RETURN );
+- mv.visitMaxs( 0, 0 );
+- mv.visitEnd();
+-
+- mv = cw.visitMethod( Modifier.PUBLIC, "TestMe", "()V",
null, null );
+-
+- mv.visitCode();
+- mv.visitInsn( Opcodes.RETURN );
+- mv.visitMaxs( 0, 0 );
+- mv.visitEnd();
+- cw.visitEnd();
+-
+- final byte[] buf = cw.toByteArray();
+-
+- return defineClass( name, buf, 0, buf.length );
+- }
+- }
+ }
diff --git a/sisu.spec b/sisu.spec
index ff4d5e0..d3b440e 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,7 +1,11 @@
+# Release type, either "milestone" or "release"
+%global reltype milestone
+%global reltag .M1
+
Name: sisu
Epoch: 1
-Version: 0.2.1
-Release: 10%{?dist}
+Version: 0.3.0
+Release: 0.1%{?reltag}%{?dist}
Summary: Eclipse dependency injection framework
# bundled asm is under BSD
# See also:
https://fedorahosted.org/fpc/ticket/346
@@ -10,8 +14,8 @@ URL:
http://eclipse.org/sisu
# TODO: unbundle asm
-Source0:
http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/...
-Source1:
http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/...
+Source0:
http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/...
+Source1:
http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/...
Patch0: %{name}-OSGi-import-guava.patch
Patch1: %{name}-java8.patch
@@ -115,8 +119,8 @@ This package contains %{summary}.
%prep
%setup -q -c -T
-tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
-tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
+tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
+tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
%patch0
%patch1
@@ -184,9 +188,9 @@ EOF
%install
%mvn_artifact sisu-inject/pom.xml
-%mvn_artifact sisu-inject/org.eclipse.sisu.inject/pom.xml
sisu-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar
+%mvn_artifact sisu-inject/org.eclipse.sisu.inject/pom.xml
sisu-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}%{?reltag}.jar
%mvn_artifact sisu-plexus/pom.xml
-%mvn_artifact sisu-plexus/org.eclipse.sisu.plexus/pom.xml
sisu-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar
+%mvn_artifact sisu-plexus/org.eclipse.sisu.plexus/pom.xml
sisu-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}%{?reltag}.jar
%mvn_install
@@ -201,6 +205,9 @@ EOF
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:0.3.0-0.1.M1
+- Update to upstream milestone 0.3.0.M1
+
* Tue Sep 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:0.2.1-10
- Port to plexus-utils 3.0.18
diff --git a/sources b/sources
index a256204..8794505 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cec0b709e3718e3d220b00cc67b4292c org.eclipse.sisu.inject-0.2.1.tar.bz2
-d7b14e659f55ddb3f74384d39e5096ce org.eclipse.sisu.plexus-0.2.1.tar.bz2
+7c8e0b75878b71e5b77e2a8e1b35ffa8 org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
+4afe3fb24ff0d93066b670e288c365b3 org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2