Update to upstream version 0.2.0
This commit is contained in:
Mikolaj Izdebski
parent
935cc9a283
commit
53a916fae4
|
|
@ -12,3 +12,5 @@
|
|||
/org.eclipse.sisu.plexus-0.1.0.tar.bz2
|
||||
/org.eclipse.sisu.inject-0.1.1.tar.bz2
|
||||
/org.eclipse.sisu.plexus-0.1.1.tar.bz2
|
||||
/org.eclipse.sisu.inject-0.2.0.tar.bz2
|
||||
/org.eclipse.sisu.plexus-0.2.0.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
From d22b82bb351469b46726d329a1736aaa92241bad Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@redhat.com>
|
||||
Date: Wed, 25 Sep 2013 14:16:44 +0200
|
||||
Subject: [PATCH 1/2] Fix OSGi compatibility
|
||||
|
||||
---
|
||||
.../src/org/eclipse/sisu/launch/internal/SisuActivator.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sisu-inject/org.eclipse.sisu.inject.extender/src/org/eclipse/sisu/launch/internal/SisuActivator.java b/sisu-inject/org.eclipse.sisu.inject.extender/src/org/eclipse/sisu/launch/internal/SisuActivator.java
|
||||
index 23b43eb..ebbd923 100644
|
||||
--- a/sisu-inject/org.eclipse.sisu.inject.extender/src/org/eclipse/sisu/launch/internal/SisuActivator.java
|
||||
+++ b/sisu-inject/org.eclipse.sisu.inject.extender/src/org/eclipse/sisu/launch/internal/SisuActivator.java
|
||||
@@ -257,7 +257,7 @@ public final class SisuActivator
|
||||
}
|
||||
}, new SpaceModule( space, scanning ).with( extensions ) ).with( extensions ) );
|
||||
|
||||
- final Dictionary<Object, Object> metadata = new Hashtable<Object, Object>();
|
||||
+ final Dictionary<String, Object> metadata = new Hashtable<String, Object>();
|
||||
metadata.put( Constants.SERVICE_PID, CONTAINER_SYMBOLIC_NAME );
|
||||
extendedBundleContext.registerService( API, this, metadata );
|
||||
}
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 16622679b8cf7bd98c80ffd8acfeb20b17666d83 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@redhat.com>
|
||||
Date: Wed, 25 Sep 2013 14:17:24 +0200
|
||||
Subject: [PATCH 2/2] Fix compatibility with Plexus Classworlds 2.5
|
||||
|
||||
---
|
||||
.../org/codehaus/plexus/component/repository/ComponentDescriptor.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sisu-plexus/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/sisu-plexus/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java
|
||||
index 5c63170..9c42ec6 100644
|
||||
--- a/sisu-plexus/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java
|
||||
+++ b/sisu-plexus/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java
|
||||
@@ -195,7 +195,7 @@ public class ComponentDescriptor<T>
|
||||
{
|
||||
try
|
||||
{
|
||||
- return classRealm.loadClass( getRole() );
|
||||
+ return (Class) classRealm.loadClass( getRole() );
|
||||
}
|
||||
catch ( final Exception e )
|
||||
{
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
18
sisu.spec
18
sisu.spec
|
|
@ -1,6 +1,6 @@
|
|||
Name: sisu
|
||||
Epoch: 1
|
||||
Version: 0.1.1
|
||||
Version: 0.2.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Eclipse dependency injection framework
|
||||
# bundled asm is under BSD
|
||||
|
|
@ -12,10 +12,6 @@ URL: http://eclipse.org/sisu
|
|||
|
||||
Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/releases/%{version}.tar.bz2#/org.eclipse.%{name}.inject-%{version}.tar.bz2
|
||||
Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/releases/%{version}.tar.bz2#/org.eclipse.%{name}.plexus-%{version}.tar.bz2
|
||||
Patch0: 0001-Fix-OSGi-compatibility.patch
|
||||
# Incompatible version of Plexus Classworlds
|
||||
# Forwarded upstream: https://bugs.eclipse.org/bugs/show_bug.cgi?id=423596
|
||||
Patch1: 0002-Fix-compatibility-with-Plexus-Classworlds-2.5.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -52,11 +48,12 @@ BuildRequires: osgi(org.codehaus.plexus.component-annotations)
|
|||
BuildRequires: osgi(org.codehaus.plexus.utils)
|
||||
BuildRequires: osgi(org.eclipse.jdt.apt.core)
|
||||
BuildRequires: osgi(org.eclipse.osgi)
|
||||
BuildRequires: osgi(org.eclipse.osgi.source)
|
||||
BuildRequires: osgi(org.hamcrest.core)
|
||||
BuildRequires: osgi(org.junit)
|
||||
BuildRequires: osgi(org.sonatype.sisu.guice)
|
||||
BuildRequires: osgi(org.sonatype.sisu.inject.guice-servlet)
|
||||
BuildRequires: osgi(slf4j.api)
|
||||
BuildRequires: osgi(org.eclipse.osgi.source)
|
||||
|
||||
|
||||
%description
|
||||
|
|
@ -119,9 +116,6 @@ This package contains %{summary}.
|
|||
tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
|
||||
tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
|
||||
|
||||
#patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%mvn_file ":{*}" @1
|
||||
%mvn_package ":*{inject,plexus}" @1
|
||||
%mvn_package : __noinstall
|
||||
|
|
@ -148,7 +142,8 @@ done
|
|||
for pom in \
|
||||
sisu-inject/org.eclipse.sisu.inject \
|
||||
sisu-inject/org.eclipse.sisu.inject.extender \
|
||||
sisu-plexus/org.eclipse.sisu.plexus
|
||||
sisu-plexus/org.eclipse.sisu.plexus \
|
||||
sisu-plexus/org.eclipse.sisu.plexus.extender
|
||||
do
|
||||
%pom_remove_plugin :animal-sniffer-maven-plugin $pom
|
||||
done
|
||||
|
|
@ -198,6 +193,9 @@ done
|
|||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
e9cfd917ad43e734b956e261d48055d0 org.eclipse.sisu.inject-0.1.1.tar.bz2
|
||||
9273d92c1eb7a34c8aaf8dd629c5ea47 org.eclipse.sisu.plexus-0.1.1.tar.bz2
|
||||
343f3f3f4d7c1387cec0008db2ab515f org.eclipse.sisu.inject-0.2.0.tar.bz2
|
||||
753960f4b5d258fb3ecac108ec1a77cd org.eclipse.sisu.plexus-0.2.0.tar.bz2
|
||||
|
|
|
|||
Loading…
Reference in New Issue