From d172bc0dcbcf9f04158bed418d7548a69541003f Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mon, 28 Feb 2011 16:45:18 +0100 Subject: [PATCH] Update to 2.1.1 - Update patch - Disable guice-eclipse for now --- .gitignore | 1 + 0001-Fix-shading.patch | 75 ---------------------------------- 0001-Remove-test-deps.patch | 38 +++++++++++++++++ 0002-Fix-plexus-bundling.patch | 39 ++++++++++++++++++ sisu.spec | 31 +++++++++----- sources | 2 +- 6 files changed, 99 insertions(+), 87 deletions(-) delete mode 100644 0001-Fix-shading.patch create mode 100644 0001-Remove-test-deps.patch create mode 100644 0002-Fix-plexus-bundling.patch diff --git a/.gitignore b/.gitignore index 71615dd..ca0967e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz /sisu-1.4.3.2.tar.gz +/sisu-2.1.1.tar.bz2 diff --git a/0001-Fix-shading.patch b/0001-Fix-shading.patch deleted file mode 100644 index 865fce9..0000000 --- a/0001-Fix-shading.patch +++ /dev/null @@ -1,75 +0,0 @@ -From dc9fcf7a07ea3d7f0796625523ef8bd8fc248357 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Wed, 2 Feb 2011 13:59:28 +0100 -Subject: [PATCH] Fix shading - ---- - sisu-inject/guice-bean/sisu-inject-bean/pom.xml | 13 +++---------- - .../guice-plexus/sisu-inject-plexus/pom.xml | 8 -------- - 2 files changed, 3 insertions(+), 18 deletions(-) - -diff --git a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml b/sisu-inject/guice-bean/sisu-inject-bean/pom.xml -index 2b129c6..6a9a9b4 100644 ---- a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml -+++ b/sisu-inject/guice-bean/sisu-inject-bean/pom.xml -@@ -58,10 +58,9 @@ - - - org.sonatype.inject.*;-noimport:=true;-split-package:=merge-first;version=${project.version}, -- javax.*|org.aopalliance.*;version=1 - - -- org.sonatype.guice.*,org.objectweb.asm -+ org.sonatype.guice.* - - - -@@ -80,18 +79,12 @@ - ${project.groupId}:${project.artifactId} - - -- -- -- org.objectweb -- org.sonatype.guice -- -- - - - *:* - -- org/objectweb/asm/*Adapter* -- org/objectweb/asm/*Writer* -+ org.objectweb.asm:asm -+ javax.inject:javax.inject - - - -diff --git a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml -index 0eef00e..48fe364 100644 ---- a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml -+++ b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml -@@ -81,20 +81,12 @@ - ${project.groupId}:${project.artifactId} - - -- -- -- org.objectweb -- org.sonatype.guice -- -- - - - *:* - - META-INF/** -- org/codehaus/plexus/** - org/sonatype/guice/plexus/** -- org/objectweb/asm/*Writer* - - - --- -1.7.3.5 - diff --git a/0001-Remove-test-deps.patch b/0001-Remove-test-deps.patch new file mode 100644 index 0000000..f0f7d46 --- /dev/null +++ b/0001-Remove-test-deps.patch @@ -0,0 +1,38 @@ +From 3851989abd3be705ed6e2bdeed733192e795c654 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Mon, 28 Feb 2011 13:52:40 +0100 +Subject: [PATCH 1/2] Remove test deps + +--- + pom.xml | 15 --------------- + 1 files changed, 0 insertions(+), 15 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 35ecf55..5f4ac89 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -98,21 +98,6 @@ + https://repository.sonatype.org/service/local/staging/deploy/maven2 + + +- +- +- ch.qos.logback +- logback-classic +- 0.9.28 +- test +- +- +- org.testng +- testng +- 5.14.9 +- test +- +- +- + + + +-- +1.7.4 + diff --git a/0002-Fix-plexus-bundling.patch b/0002-Fix-plexus-bundling.patch new file mode 100644 index 0000000..554ead9 --- /dev/null +++ b/0002-Fix-plexus-bundling.patch @@ -0,0 +1,39 @@ +From 754a250de67f064662072c87f4f3e129ee149991 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Mon, 28 Feb 2011 16:41:30 +0100 +Subject: [PATCH 2/2] Fix plexus bundling + +--- + sisu-inject/guice-bean/sisu-inject-bean/pom.xml | 1 - + .../guice-plexus/sisu-inject-plexus/pom.xml | 3 --- + 2 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml b/sisu-inject/guice-bean/sisu-inject-bean/pom.xml +index 44f53bd..adbccd0 100644 +--- a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml ++++ b/sisu-inject/guice-bean/sisu-inject-bean/pom.xml +@@ -74,7 +74,6 @@ + + + org.sonatype.inject;-noimport:=true;-split-package:=merge-first;version=${project.version}, +- javax.*|org.aopalliance.*;version=1 + + + org.sonatype.guice.bean.* +diff --git a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml +index c49291f..6afb568 100644 +--- a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml ++++ b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml +@@ -74,9 +74,6 @@ + + org.slf4j,junit.framework + +- +- org.codehaus.plexus.*;-noimport:=true;-split-package:=merge-first +- + + META-INF.plexus,org.sonatype.guice.plexus.* + +-- +1.7.4 + diff --git a/sisu.spec b/sisu.spec index 05af5c5..992f95e 100644 --- a/sisu.spec +++ b/sisu.spec @@ -1,6 +1,6 @@ Name: sisu -Version: 1.4.3.2 -Release: 2%{?dist} +Version: 2.1.1 +Release: 1%{?dist} Summary: Sonatype dependency injection framework @@ -9,16 +9,17 @@ License: ASL 2.0 URL: http://github.com/sonatype/sisu # git clone git://github.com/sonatype/sisu -# git archive --prefix="sonatype-sisu-1.4.3.2/" --format=tar sisu-1.4.3.2 > sisu-1.4.3.2.tar.gz -Source0: %{name}-%{version}.tar.gz +# git archive --prefix="sisu-2.1.1/" --format=tar sisu-2.1.1 | bzip2 > sisu-2.1.1.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-depmap.xml -Patch0: 0001-Fix-shading.patch +Patch0: 0001-Remove-test-deps.patch +Patch1: 0002-Fix-plexus-bundling.patch BuildArch: noarch BuildRequires: google-guice -BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-install-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-invoker-plugin @@ -55,13 +56,16 @@ Requires: jpackage-utils %prep %setup -q %patch0 -p1 +%patch1 -p1 + + +# TODO enable guice-eclipse +sed -i 's:.*guice-eclipse.*::g' sisu-inject/pom.xml +rm -rf sisu-inject/guice-eclipse %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL -mvn-jpp \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven2.jpp.depmap.file=%{SOURCE1} \ +mvn-rpmbuild \ + -Dmaven.local.depmap.file=%{SOURCE1} \ -Dmaven.test.skip=true \ install javadoc:aggregate @@ -134,6 +138,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Mon Feb 28 2011 Stanislav Ochotnicky - 2.1.1-1 +- Update to 2.1.1 +- Update patch +- Disable guice-eclipse for now + * Wed Feb 09 2011 Fedora Release Engineering - 1.4.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 6aab513..f9a9f7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1646c2ce79a5239f7758377e39c28d39 sisu-1.4.3.2.tar.gz +9919541313609ba985d2ddc273d79b38 sisu-2.1.1.tar.bz2