import sisu-0.3.4-2.module+el8.2.0+5557+11a14461
This commit is contained in:
CentOS Sources
commit
6188a5e20f
|
|
@ -0,0 +1,2 @@
|
|||
SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
|
||||
SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
52bc0ce065136e67bedb1ebec4b5e89f66e94f22 SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
|
||||
3bd9315a76b32209d018c6ffe07bf55addd3c27c SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
From b14ee1ef509d9717eaa29e672282901847f2f735 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Mon, 16 Sep 2019 10:48:10 +0200
|
||||
Subject: [PATCH] Remove dependency on glassfish-servlet-api
|
||||
|
||||
---
|
||||
.../eclipse/sisu/inject/Implementations.java | 56 +------------------
|
||||
1 file changed, 1 insertion(+), 55 deletions(-)
|
||||
|
||||
diff --git a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
|
||||
index 523c9b2..89db5da 100644
|
||||
--- a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
|
||||
+++ b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java
|
||||
@@ -38,17 +38,6 @@ final class Implementations
|
||||
|
||||
static
|
||||
{
|
||||
- boolean hasGuiceServlet;
|
||||
- try
|
||||
- {
|
||||
- hasGuiceServlet = BindingTargetVisitor.class.isInstance( ServletFinder.THIS );
|
||||
- }
|
||||
- catch ( final LinkageError e )
|
||||
- {
|
||||
- hasGuiceServlet = false;
|
||||
- }
|
||||
- HAS_GUICE_SERVLET = hasGuiceServlet;
|
||||
-
|
||||
boolean hasJsr250Priority;
|
||||
try
|
||||
{
|
||||
@@ -65,8 +54,6 @@ final class Implementations
|
||||
// Constants
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
- private static final boolean HAS_GUICE_SERVLET;
|
||||
-
|
||||
private static final boolean HAS_JSR250_PRIORITY;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
@@ -106,7 +93,7 @@ final class Implementations
|
||||
|
||||
// peek behind servlet/filter extension bindings when checking priority, so we can order them by rank
|
||||
final Class<?> implementation =
|
||||
- binding.acceptTargetVisitor( HAS_GUICE_SERVLET && isPriority ? ServletFinder.THIS : ClassFinder.THIS );
|
||||
+ binding.acceptTargetVisitor( ClassFinder.THIS );
|
||||
|
||||
T annotation = null;
|
||||
if ( null != implementation )
|
||||
@@ -215,45 +202,4 @@ final class Implementations
|
||||
return binding.getPrivateElements().getInjector().getBinding( binding.getKey() ).acceptTargetVisitor( this );
|
||||
}
|
||||
}
|
||||
-
|
||||
- /**
|
||||
- * {@link ClassFinder} that can also peek behind servlet/filter bindings.
|
||||
- */
|
||||
- static final class ServletFinder
|
||||
- extends ClassFinder
|
||||
- implements com.google.inject.servlet.ServletModuleTargetVisitor<Object, Class<?>>
|
||||
- {
|
||||
- // ----------------------------------------------------------------------
|
||||
- // Constants
|
||||
- // ----------------------------------------------------------------------
|
||||
-
|
||||
- @SuppressWarnings( "hiding" )
|
||||
- static final BindingTargetVisitor<Object, Class<?>> THIS = new ServletFinder();
|
||||
-
|
||||
- // ----------------------------------------------------------------------
|
||||
- // Public methods
|
||||
- // ----------------------------------------------------------------------
|
||||
-
|
||||
- public Class<?> visit( final com.google.inject.servlet.InstanceFilterBinding binding )
|
||||
- {
|
||||
- return binding.getFilterInstance().getClass();
|
||||
- }
|
||||
-
|
||||
- public Class<?> visit( final com.google.inject.servlet.InstanceServletBinding binding )
|
||||
- {
|
||||
- return binding.getServletInstance().getClass();
|
||||
- }
|
||||
-
|
||||
- public Class<?> visit( final com.google.inject.servlet.LinkedFilterBinding binding )
|
||||
- {
|
||||
- // this assumes only one level of indirection: api-->impl
|
||||
- return binding.getLinkedKey().getTypeLiteral().getRawType();
|
||||
- }
|
||||
-
|
||||
- public Class<?> visit( final com.google.inject.servlet.LinkedServletBinding binding )
|
||||
- {
|
||||
- // this assumes only one level of indirection: api-->impl
|
||||
- return binding.getLinkedKey().getTypeLiteral().getRawType();
|
||||
- }
|
||||
- }
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
--- sisu-inject/org.eclipse.sisu.inject/META-INF/MANIFEST.MF~ 2014-04-21 16:32:25.000000000 +0200
|
||||
+++ sisu-inject/org.eclipse.sisu.inject/META-INF/MANIFEST.MF 2014-04-23 10:53:22.538142253 +0200
|
||||
@@ -16,6 +16,7 @@
|
||||
com.google.inject.matcher;version="1.3",
|
||||
com.google.inject.name;version="1.3",
|
||||
com.google.inject.spi;version="1.3",
|
||||
+ com.google.common.base,
|
||||
org.osgi.framework;version="1.5",
|
||||
org.osgi.util.tracker;version="1.4",
|
||||
org.slf4j;resolution:=optional,
|
||||
--- sisu-inject/org.eclipse.sisu.inject/build.properties~ 2015-02-25 14:46:42.392037463 +0100
|
||||
+++ sisu-inject/org.eclipse.sisu.inject/build.properties 2015-02-25 14:44:56.626803789 +0100
|
||||
@@ -17,5 +17,5 @@
|
||||
.
|
||||
|
||||
# build with JSR250 v1.2 and workaround indirect Guava dependency via Guice 4
|
||||
-extra.. = platform:/plugin/javax.annotation,platform:/plugin/com.google.guava
|
||||
-additional.bundles = javax.annotation,com.google.guava
|
||||
+extra.. = platform:/plugin/javax.annotation-api,platform:/plugin/com.google.guava
|
||||
+additional.bundles = javax.annotation-api,com.google.guava
|
||||
|
|
@ -0,0 +1,205 @@
|
|||
--- sisu-inject/org.eclipse.sisu.inject.tests/src/org/eclipse/sisu/inject/LocatedBeansTest.java~ 2014-09-12 08:32:32.899725268 +0200
|
||||
+++ sisu-inject/org.eclipse.sisu.inject.tests/src/org/eclipse/sisu/inject/LocatedBeansTest.java 2014-09-12 08:37:45.656099710 +0200
|
||||
@@ -128,30 +128,6 @@
|
||||
assertSame( a, itr2.next().getValue() );
|
||||
}
|
||||
|
||||
- public void testUnrestrictedSearch()
|
||||
- {
|
||||
- final LocatedBeans<Annotation, Bean> beans = locate( Key.get( Bean.class ) );
|
||||
- final Iterator<BeanEntry<Annotation, Bean>> itr = beans.iterator();
|
||||
-
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( QualifyingStrategy.DEFAULT_QUALIFIER, itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( QualifyingStrategy.BLANK_QUALIFIER, itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( Names.named( "Named1" ), itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( Names.named( "Named2" ), itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( QualifyingStrategy.BLANK_QUALIFIER, itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( MarkedBeanImpl1.class.getAnnotation( Marked.class ), itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( Names.named( "Marked2" ), itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( Names.named( "Marked3" ), itr.next().getKey() );
|
||||
- assertFalse( itr.hasNext() );
|
||||
- }
|
||||
-
|
||||
public void testNamedSearch()
|
||||
{
|
||||
final LocatedBeans<Named, Bean> beans = locate( Key.get( Bean.class, Named.class ) );
|
||||
@@ -181,20 +156,6 @@
|
||||
assertFalse( itr.hasNext() );
|
||||
}
|
||||
|
||||
- public void testMarkedSearch()
|
||||
- {
|
||||
- final LocatedBeans<Marked, Bean> beans = locate( Key.get( Bean.class, Marked.class ) );
|
||||
- final Iterator<BeanEntry<Marked, Bean>> itr = beans.iterator();
|
||||
-
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( MarkedBeanImpl1.class.getAnnotation( Marked.class ), itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( MarkedBeanImpl2.class.getAnnotation( Marked.class ), itr.next().getKey() );
|
||||
- assertTrue( itr.hasNext() );
|
||||
- assertEquals( MarkedBeanProvider.class.getAnnotation( Marked.class ), itr.next().getKey() );
|
||||
- assertFalse( itr.hasNext() );
|
||||
- }
|
||||
-
|
||||
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 );
|
||||
- }
|
||||
- }
|
||||
}
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.eclipse.sisu</groupId>
|
||||
<artifactId>org.eclipse.sisu.inject</artifactId>
|
||||
<version>@VERSION@</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
<classifier>no_aop</classifier>
|
||||
<version>4.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.inject</groupId>
|
||||
<artifactId>javax.inject</artifactId>
|
||||
<version>1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.enterprise</groupId>
|
||||
<artifactId>cdi-api</artifactId>
|
||||
<version>1.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>javax.annotation-api</artifactId>
|
||||
<version>1.2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.inject.extensions</groupId>
|
||||
<artifactId>guice-servlet</artifactId>
|
||||
<version>4.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>2.5</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.13</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>osgi.core</artifactId>
|
||||
<version>6.0.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.12</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<version>6.9.10</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<sourceDirectory>org.eclipse.sisu.inject/src</sourceDirectory>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java~ 2015-09-13 20:15:37.000000000 +0200
|
||||
+++ sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java 2017-01-29 19:56:51.608151337 +0100
|
||||
@@ -80,7 +80,7 @@
|
||||
|
||||
protected static boolean hasPlexusAnnotations( final Bundle bundle )
|
||||
{
|
||||
- final String imports = bundle.getHeaders().get( Constants.IMPORT_PACKAGE );
|
||||
+ final String imports = bundle.getHeaders().get( Constants.IMPORT_PACKAGE ).toString();
|
||||
return null != imports && imports.contains( "org.codehaus.plexus.component.annotations" );
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.fedoraproject.maven</groupId>
|
||||
<artifactId>aggregator-project</artifactId>
|
||||
<version>@VERSION@</version>
|
||||
<packaging>pom</packaging>
|
||||
<modules>
|
||||
<module>sisu-inject</module>
|
||||
<module>sisu-plexus</module>
|
||||
</modules>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.eclipse.sisu</groupId>
|
||||
<artifactId>org.eclipse.sisu.plexus</artifactId>
|
||||
<version>@VERSION@</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>org.eclipse.sisu.inject</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-classworlds</artifactId>
|
||||
<version>2.5.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-component-annotations</artifactId>
|
||||
<version>1.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-utils</artifactId>
|
||||
<version>3.0.22</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
<classifier>no_aop</classifier>
|
||||
<version>4.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.13</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>osgi.core</artifactId>
|
||||
<version>6.0.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.12</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<sourceDirectory>org.eclipse.sisu.plexus/src</sourceDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<targetPath>META-INF/plexus</targetPath>
|
||||
<filtering>false</filtering>
|
||||
<directory>${basedir}/org.eclipse.sisu.plexus/META-INF/plexus</directory>
|
||||
<includes>
|
||||
<include>components.xml</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,309 @@
|
|||
Name: sisu
|
||||
Version: 0.3.4
|
||||
Release: 2%{?dist}
|
||||
Summary: Eclipse dependency injection framework
|
||||
# sisu is EPL-1.0
|
||||
# bundled asm is BSD
|
||||
License: EPL-1.0 and BSD
|
||||
URL: http://eclipse.org/sisu
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz
|
||||
Source1: http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{version}.tar.gz
|
||||
|
||||
Source100: sisu-parent.pom
|
||||
Source101: sisu-inject.pom
|
||||
Source102: sisu-plexus.pom
|
||||
|
||||
Patch0: sisu-OSGi-import-guava.patch
|
||||
Patch2: sisu-ignored-tests.patch
|
||||
Patch3: sisu-osgi-api.patch
|
||||
Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch
|
||||
|
||||
BuildRequires: maven-local-openjdk8
|
||||
BuildRequires: mvn(com.google.inject.extensions:guice-servlet)
|
||||
BuildRequires: mvn(com.google.inject:guice::no_aop:)
|
||||
BuildRequires: mvn(javax.annotation:javax.annotation-api)
|
||||
BuildRequires: %{?module_prefix}mvn(javax.enterprise:cdi-api)
|
||||
BuildRequires: mvn(javax.inject:javax.inject)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-classworlds)
|
||||
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-component-annotations)
|
||||
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
|
||||
BuildRequires: mvn(org.osgi:osgi.core)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.testng:testng)
|
||||
|
||||
Provides: bundled(objectweb-asm)
|
||||
|
||||
%description
|
||||
Java dependency injection framework with backward support for plexus and bean
|
||||
style dependency injection.
|
||||
|
||||
%{?module_package}
|
||||
%{?javadoc_package}
|
||||
|
||||
%prep
|
||||
%setup -q -c -T
|
||||
tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
|
||||
tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
|
||||
|
||||
cp %{SOURCE100} pom.xml
|
||||
cp %{SOURCE101} sisu-inject/pom.xml
|
||||
cp %{SOURCE102} sisu-plexus/pom.xml
|
||||
|
||||
%patch0
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4 -p1
|
||||
|
||||
%pom_remove_dep :servlet-api sisu-inject
|
||||
|
||||
%pom_xpath_set -r /pom:project/pom:version %{version}
|
||||
|
||||
%mvn_file ":{*}" @1
|
||||
%mvn_package ":*{inject,plexus}"
|
||||
%mvn_package : __noinstall
|
||||
%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -n %{?module_prefix}sisu -f .mfiles
|
||||
%license sisu-inject/LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-2
|
||||
- Build with OpenJDK 8
|
||||
|
||||
* Wed Nov 06 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-1
|
||||
- Update to upstream version 0.3.4
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.3-9
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-8
|
||||
- Merge inject and plexus subpackages
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-7
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Tue Jul 24 2018 Michael Simacek <msimacek@redhat.com> - 1:0.3.3-6
|
||||
- Declare bundled objectweb-asm
|
||||
- Fix license tag to include BSD for asm
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jul 2 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-4
|
||||
- Update license tag
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Apr 11 2017 Michael Simacek <msimacek@redhat.com> - 1:0.3.3-1
|
||||
- Update to upstream version 0.3.3
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Sun Jan 29 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-6
|
||||
- Restore alias for org.sonatype.sisu:sisu-inject-plexus
|
||||
|
||||
* Sun Jan 29 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-5
|
||||
- Build without Tycho
|
||||
- Remove sisu-tests subpackage
|
||||
- Drop old obsoletes
|
||||
|
||||
* Mon Feb 22 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-4
|
||||
- Add alias for org.sonatype.sisu:sisu-inject-plexus
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jan 7 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-2
|
||||
- Remove unneeded patch
|
||||
|
||||
* Wed Sep 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.2-1
|
||||
- Update to upstream version 0.3.2
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.3.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon May 18 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.1-1
|
||||
- Update to upstream version 0.3.1
|
||||
|
||||
* Thu Apr 23 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.0-2
|
||||
- Install test artifacts
|
||||
|
||||
* Mon Feb 23 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.0-1
|
||||
- Update to upstream version 0.3.0
|
||||
|
||||
* Wed Feb 18 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.0-0.2.M1
|
||||
- Unbundle ASM
|
||||
- Resolves: rhbz#1085903
|
||||
|
||||
* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.0-0.1.M1
|
||||
- Update to upstream milestone 0.3.0.M1
|
||||
|
||||
* Tue Sep 30 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-10
|
||||
- Port to plexus-utils 3.0.18
|
||||
|
||||
* Thu Sep 18 2014 Michal Srb <msrb@redhat.com> - 1:0.2.1-9
|
||||
- Rebuild to fix metadata
|
||||
- Remove explicit Requires
|
||||
|
||||
* Fri Sep 12 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-8
|
||||
- Update to latest XMvn version
|
||||
- Enable tests
|
||||
|
||||
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-7
|
||||
- Fix build-requires on sonatype-oss-parent
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.2.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 30 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-5
|
||||
- Install JARs and POMs only
|
||||
|
||||
* Thu May 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-4
|
||||
- Build with XMvn 2.0.0
|
||||
|
||||
* Wed May 07 2014 Michael Simacek <msimacek@redhat.com> - 1:0.2.1-3
|
||||
- Build with Java 8
|
||||
|
||||
* Wed Apr 23 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-2
|
||||
- Import guava in OSGi manifest
|
||||
|
||||
* Tue Apr 22 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-1
|
||||
- Update to upstream version 0.2.1
|
||||
- Remove patch for Eclipse bug 429369
|
||||
|
||||
* Wed Apr 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.0-5
|
||||
- Update upstream patch for bug 429369
|
||||
- Force usage of Java 1.7
|
||||
|
||||
* Mon Mar 3 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.0-4
|
||||
- Revert upstream feature which introduced a regression
|
||||
- Resolves: rhbz#1070915
|
||||
|
||||
* Thu Feb 20 2014 Michal Srb <msrb@redhat.com> - 1:0.2.0-3
|
||||
- Remove R on cdi-api
|
||||
|
||||
* Thu Feb 20 2014 Michal Srb <msrb@redhat.com> - 1:0.2.0-2
|
||||
- Update BR/R for version 0.2.0
|
||||
- Enable tests
|
||||
|
||||
* Mon Feb 17 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.0-1
|
||||
- Update to upstream version 0.2.0
|
||||
|
||||
* Wed Dec 4 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.1.1-1
|
||||
- Update to upstream version 0.1.1
|
||||
|
||||
* Wed Nov 13 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.1.0-1
|
||||
- Update to upstream version 0.1.0
|
||||
|
||||
* Wed Oct 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.0.0-0.7.M5
|
||||
- Rebuild to regenerate broken POMs
|
||||
- Related: rhbz#1021484
|
||||
|
||||
* Fri Oct 18 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.0.0-0.6.M5
|
||||
- Don't inject pom.properties
|
||||
|
||||
* Wed Sep 25 2013 Michal Srb <msrb@redhat.com> - 1:0.0.0-0.5.M5
|
||||
- Update to upstream version 0.0.0.M5
|
||||
- Install EPL license file
|
||||
- Inject pom.properties
|
||||
- Regenerate BR
|
||||
- Add R
|
||||
|
||||
* Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.0.0-0.4.M4
|
||||
- Update to XMvn 1.0.0
|
||||
|
||||
* Tue Aug 13 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.0.0-0.3.M4
|
||||
- Obsolete sisu main package, resolves: rhbz#996288
|
||||
|
||||
* Tue Jul 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.0.0-0.2.M4
|
||||
- Remove unneeded provides and compat symlinks
|
||||
|
||||
* Mon Jul 22 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.0.0-0.1.M4
|
||||
- Update to upstream version 0.0.0.M4
|
||||
|
||||
* Wed Mar 27 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.3.0-8
|
||||
- Remove unneeded animal-sniffer BuildRequires
|
||||
- Add forge-parent to BuildRequires to ensure it's present
|
||||
|
||||
* Thu Mar 14 2013 Michal Srb <msrb@redhat.com> - 2.3.0-7
|
||||
- sisu-inject-bean: add dependency on asm
|
||||
- Fix dependencies on javax.inject and javax.enterprise.inject
|
||||
- Remove bundled JARs and .class files from tarball
|
||||
|
||||
* Thu Feb 7 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.0-6
|
||||
- Add ASM dependency only to a single module, not all of them
|
||||
- Disable animal-sniffer plugin
|
||||
- Don't generate auto-requires for optional dependencies
|
||||
|
||||
* Wed Feb 06 2013 Tomas Radej <tradej@redhat.com> - 2.3.0-5
|
||||
- Added BR on animal-sniffer
|
||||
|
||||
* Tue Feb 05 2013 Tomas Radej <tradej@redhat.com> - 2.3.0-4
|
||||
- Split into subpackages
|
||||
- Build with new macros
|
||||
- Unbundled objectweb-asm
|
||||
|
||||
* Wed Dec 5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.0-3
|
||||
- Fix OSGi __requires_exclude
|
||||
|
||||
* Wed Dec 5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.0-2
|
||||
- Disable OSGi auto-requires: org.sonatype.sisu.guava
|
||||
|
||||
* Mon Dec 3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.0-1
|
||||
- Update to upstream version 2.3.0
|
||||
|
||||
* Tue Jul 24 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2.3-6
|
||||
- Convert patches to POM macros
|
||||
|
||||
* Mon Jul 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2.3-5
|
||||
- Fix license tag
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Fri Aug 19 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.3-2
|
||||
- Add backward compatible package path for lifecycles
|
||||
- Remove temporary BRs/Rs
|
||||
|
||||
* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.3-1
|
||||
- Update to latest upstream 2.2.3 (#683795)
|
||||
- Add forge-parent to Requires
|
||||
- Rework spec to be more simple, update patches
|
||||
|
||||
* Tue Mar 1 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.1.1-2
|
||||
- Add atinject into poms as dependency
|
||||
|
||||
* Mon Feb 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.1.1-1
|
||||
- Update to 2.1.1
|
||||
- Update patch
|
||||
- Disable guice-eclipse for now
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Feb 2 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4.3.2-1
|
||||
- Update to latest upstream version
|
||||
- Versionless jars & javadocs
|
||||
|
||||
* Mon Oct 18 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4.2-2
|
||||
- Add felix-framework BR
|
||||
|
||||
* Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4.2-1
|
||||
- Initial version of the package
|
||||
Loading…
Reference in New Issue