From 58daaf6746dac3c1838bbd2449917fc27460c90b3401d5b5dd824bbaa064226f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 19 Mar 2019 08:49:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=1 --- .gitattributes | 23 +++ .gitignore | 1 + org.eclipse.sisu.inject-0.3.3.tar.xz | 3 + org.eclipse.sisu.plexus-0.3.3.tar.xz | 3 + sisu-OSGi-import-guava.patch | 20 +++ sisu-build.tar.xz | 3 + sisu-ignored-tests.patch | 205 +++++++++++++++++++++++++++ sisu-inject.pom | 72 ++++++++++ sisu-osgi-api.patch | 11 ++ sisu-plexus.pom | 67 +++++++++ sisu.spec | 144 +++++++++++++++++++ 11 files changed, 552 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 org.eclipse.sisu.inject-0.3.3.tar.xz create mode 100644 org.eclipse.sisu.plexus-0.3.3.tar.xz create mode 100644 sisu-OSGi-import-guava.patch create mode 100644 sisu-build.tar.xz create mode 100644 sisu-ignored-tests.patch create mode 100644 sisu-inject.pom create mode 100644 sisu-osgi-api.patch create mode 100644 sisu-plexus.pom create mode 100644 sisu.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/org.eclipse.sisu.inject-0.3.3.tar.xz b/org.eclipse.sisu.inject-0.3.3.tar.xz new file mode 100644 index 0000000..0f6e2d7 --- /dev/null +++ b/org.eclipse.sisu.inject-0.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3485561cd3bfe874b70aa773fac0d2de9038c25b794ea21594b05b20c172ade +size 213620 diff --git a/org.eclipse.sisu.plexus-0.3.3.tar.xz b/org.eclipse.sisu.plexus-0.3.3.tar.xz new file mode 100644 index 0000000..d6cba46 --- /dev/null +++ b/org.eclipse.sisu.plexus-0.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:424bc833be5096407e6b6fb4dc93d3cbe503be0b78e40f0ef497570b4e8403b8 +size 361580 diff --git a/sisu-OSGi-import-guava.patch b/sisu-OSGi-import-guava.patch new file mode 100644 index 0000000..68cd3a2 --- /dev/null +++ b/sisu-OSGi-import-guava.patch @@ -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 diff --git a/sisu-build.tar.xz b/sisu-build.tar.xz new file mode 100644 index 0000000..ced1567 --- /dev/null +++ b/sisu-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fe54646eba5cdd6c2ca57626b307a18740f0701fd89f10cb8337fd2e38e3c0f +size 1964 diff --git a/sisu-ignored-tests.patch b/sisu-ignored-tests.patch new file mode 100644 index 0000000..5af8dc8 --- /dev/null +++ b/sisu-ignored-tests.patch @@ -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 beans = locate( Key.get( Bean.class ) ); +- final Iterator> 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 beans = locate( Key.get( Bean.class, Named.class ) ); +@@ -181,20 +156,6 @@ + assertFalse( itr.hasNext() ); + } + +- public void testMarkedSearch() +- { +- final LocatedBeans beans = locate( Key.get( Bean.class, Marked.class ) ); +- final Iterator> 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 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 metadata = new HashMap(); +- final PlexusXmlScanner scanner = new PlexusXmlScanner( null, null, metadata ); +- +- final Map> 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", "PRIMARY" ), +- metadata1.getConfiguration( new NamedProperty( "someFieldName" ) ) ); +- +- assertEquals( new ConfigurationImpl( "simple", "value" ), +- metadata1.getConfiguration( new NamedProperty( "simple" ) ) ); +- +- assertEquals( new ConfigurationImpl( "value", "" ), +- metadata1.getConfiguration( new NamedProperty( "value" ) ) ); +- +- assertEquals( new ConfigurationImpl( "emptyValue1", "" ), +- 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, "", "()V", null, null ); +- +- mv.visitCode(); +- mv.visitVarInsn( Opcodes.ALOAD, 0 ); +- mv.visitMethodInsn( Opcodes.INVOKESPECIAL, superName, "", "()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-inject.pom b/sisu-inject.pom new file mode 100644 index 0000000..db3172d --- /dev/null +++ b/sisu-inject.pom @@ -0,0 +1,72 @@ + + 4.0.0 + org.eclipse.sisu + org.eclipse.sisu.inject + @VERSION@ + + + com.google.inject + guice + no_aop + 4.0 + provided + + + javax.inject + javax.inject + 1 + provided + + + javax.enterprise + cdi-api + 1.1 + + + javax.annotation + javax.annotation-api + 1.2 + provided + + + com.google.inject.extensions + guice-servlet + 4.0 + provided + + + javax.servlet + servlet-api + 2.5 + provided + + + org.slf4j + slf4j-api + 1.7.13 + provided + + + org.osgi + osgi.core + 6.0.0 + provided + + + junit + junit + 4.12 + provided + + + org.testng + testng + 6.9.10 + provided + + + + org.eclipse.sisu.inject/src + + diff --git a/sisu-osgi-api.patch b/sisu-osgi-api.patch new file mode 100644 index 0000000..019b700 --- /dev/null +++ b/sisu-osgi-api.patch @@ -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" ); + } + diff --git a/sisu-plexus.pom b/sisu-plexus.pom new file mode 100644 index 0000000..b138e52 --- /dev/null +++ b/sisu-plexus.pom @@ -0,0 +1,67 @@ + + 4.0.0 + org.eclipse.sisu + org.eclipse.sisu.plexus + @VERSION@ + + + ${project.groupId} + org.eclipse.sisu.inject + ${project.version} + + + org.codehaus.plexus + plexus-classworlds + 2.5.2 + + + org.codehaus.plexus + plexus-component-annotations + 1.6 + + + org.codehaus.plexus + plexus-utils + 3.0.22 + + + com.google.inject + guice + no_aop + 4.0 + provided + + + org.slf4j + slf4j-api + 1.7.13 + provided + + + org.osgi + osgi.core + 6.0.0 + provided + + + junit + junit + 4.12 + provided + + + + org.eclipse.sisu.plexus/src + + + META-INF/plexus + false + ${basedir}/org.eclipse.sisu.plexus/META-INF/plexus + + components.xml + + + + + diff --git a/sisu.spec b/sisu.spec new file mode 100644 index 0000000..09e2835 --- /dev/null +++ b/sisu.spec @@ -0,0 +1,144 @@ +# +# spec file for package sisu +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global reltype release +#global reltag .M1 +Name: sisu +Version: 0.3.3 +Release: 0 +Summary: Eclipse dependency injection framework +# sisu is EPL-1.0, bundled asm is BSD +License: EPL-1.0 AND BSD-3-Clause +Group: Development/Libraries/Java +URL: http://eclipse.org/sisu +Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.xz#/org.eclipse.%{name}.inject-%{version}%{?reltag}.tar.xz +Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.xz#/org.eclipse.%{name}.plexus-%{version}%{?reltag}.tar.xz +Source2: %{name}-build.tar.xz +Source100: %{name}-inject.pom +Source101: %{name}-plexus.pom +Patch0: %{name}-OSGi-import-guava.patch +Patch2: %{name}-ignored-tests.patch +Patch3: %{name}-osgi-api.patch +BuildRequires: ant +BuildRequires: atinject +BuildRequires: cdi-api +BuildRequires: fdupes +BuildRequires: glassfish-annotation-api +BuildRequires: glassfish-servlet-api +BuildRequires: google-guice +BuildRequires: guice-servlet +BuildRequires: javapackages-local +BuildRequires: junit +BuildRequires: osgi-core +BuildRequires: plexus-classworlds +BuildRequires: plexus-containers-component-annotations +BuildRequires: plexus-utils +BuildRequires: slf4j +BuildRequires: testng +BuildRequires: xmvn-install +BuildRequires: xmvn-resolve +BuildRequires: xz +Provides: bundled(objectweb-asm) +BuildArch: noarch + +%description +Java dependency injection framework with backward support for plexus and bean +style dependency injection. + +%package inject +Summary: Sisu inject +Group: Development/Libraries/Java + +%description inject +This package contains %{summary}. + +%package plexus +Summary: Sisu Plexus +Group: Development/Libraries/Java + +%description plexus +This package contains %{summary}. + +%package javadoc +Summary: API documentation for Sisu +Group: Documentation/HTML + +%description javadoc +This package contains %{summary}. + +%prep +%setup -q -c -T +tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s +cp %{SOURCE100} sisu-inject/pom.xml +tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s +cp %{SOURCE101} sisu-plexus/pom.xml +tar xf %{SOURCE2} + +%patch0 +%patch2 +%patch3 + +for i in inject plexus; do + %pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i} +done + +%{mvn_file} ":{*}" @1 +%{mvn_package} ":*{inject,plexus}" @1 +%{mvn_alias} :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus + +%build +mkdir -p lib +build-jar-repository -s lib \ + glassfish-annotation-api \ + glassfish-servlet-api \ + google-guice-no_aop \ + guice/guice-servlet \ + javax.enterprise.inject/cdi-api \ + javax.inject/atinject \ + junit \ + osgi-core/osgi.core \ + plexus/utils \ + plexus/classworlds \ + plexus-containers/plexus-component-annotations \ + slf4j/api \ + testng +%ant package javadoc + +for i in inject plexus; do + %mvn_artifact %{name}-${i}/pom.xml %{name}-${i}/target/org.eclipse.sisu.${i}-%{version}.jar +done + +%install +%mvn_install + +for i in inject plexus; do + install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i} + cp -pr %{name}-inject/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/ +done +%fdupes -s %{buildroot}%{_javadocdir} + +%files inject -f .mfiles-inject +%license sisu-inject/LICENSE.txt + +%files plexus -f .mfiles-plexus + +%files javadoc +%license sisu-inject/LICENSE.txt +%{_javadocdir}/%{name} + +%changelog