[google-guice/f15] Remove test and missing deps from pom.xml
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu May 12 13:58:53 UTC 2011
commit bf6ca62c38692b0bbfb7989549481fef8ef59952
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu May 12 15:52:20 2011 +0200
Remove test and missing deps from pom.xml
...e-test-and-missing-deps-from-core-pom.xml.patch | 61 ++++++++++++++++++++
google-guice.spec | 13 +++-
2 files changed, 70 insertions(+), 4 deletions(-)
---
diff --git a/0001-Remove-test-and-missing-deps-from-core-pom.xml.patch b/0001-Remove-test-and-missing-deps-from-core-pom.xml.patch
new file mode 100644
index 0000000..463e6fc
--- /dev/null
+++ b/0001-Remove-test-and-missing-deps-from-core-pom.xml.patch
@@ -0,0 +1,61 @@
+From 0790a9ffbe05520dd0eafc2fb7fd812e17fa5eee Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Thu, 12 May 2011 15:42:28 +0200
+Subject: [PATCH] Remove test and missing deps from core pom.xml
+
+---
+ core/pom.xml | 31 +------------------------------
+ 1 files changed, 1 insertions(+), 30 deletions(-)
+
+diff --git a/core/pom.xml b/core/pom.xml
+index d0410c5..d12ab39 100644
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -23,43 +23,14 @@
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
+- <dependency>
+- <groupId>aopalliance</groupId>
+- <artifactId>aopalliance</artifactId>
+- <version>1.0</version>
+- </dependency>
+ <!--
+ | Replace with official CGLIB artifact when it's released
+ -->
+ <dependency>
+- <groupId>org.sonatype.sisu.inject</groupId>
++ <groupId>net.sf.cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>${cglib.version}</version>
+ </dependency>
+- <dependency>
+- <groupId>javax.inject</groupId>
+- <artifactId>javax.inject-tck</artifactId>
+- <version>1</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.springframework</groupId>
+- <artifactId>spring-beans</artifactId>
+- <version>3.0.5.RELEASE</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>biz.aQute</groupId>
+- <artifactId>bnd</artifactId>
+- <version>0.0.384</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.felix</groupId>
+- <artifactId>org.apache.felix.framework</artifactId>
+- <version>3.0.5</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <build>
+--
+1.7.4.4
+
diff --git a/google-guice.spec b/google-guice.spec
index 45a8f51..70c102c 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -2,7 +2,7 @@
Name: google-%{short_name}
Version: 3.0
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
Summary: Lightweight dependency injection framework
@@ -19,6 +19,9 @@ Source0: https://%{name}.googlecode.com/files/%{short_name}-%{version}-rc
# needed for maven 3 to work
Patch0: sisu-custom.patch
+# bz#704222
+Patch1: 0001-Remove-test-and-missing-deps-from-core-pom.xml.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -31,6 +34,7 @@ BuildRequires: junit
BuildRequires: atinject
BuildRequires: zip
BuildRequires: slf4j
+BuildRequires: jpackage-utils
Requires: java >= 1:1.6.0
Requires(post): jpackage-utils
@@ -66,6 +70,7 @@ Requires: jpackage-utils
%prep
%setup -q -n %{short_name}-%{version}-rc2-src
%patch0
+%patch1 -p1
# remove parent definition referencing google-parent
sed -ie '/<parent>/,/<\/parent/ {d}' pom.xml
@@ -149,9 +154,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%postun
%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc COPYING
%{_javadir}/*.jar
%{_mavenpomdir}/*
@@ -159,13 +162,15 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files javadoc
-%defattr(-,root,root,-)
%doc COPYING
%doc %{_javadocdir}/%{name}
%changelog
+* Thu May 12 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0-0.2.rc2
+- Remove test and missing deps from pom.xml
+
* Tue Mar 1 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0-0.1.rc2
- Update to 3.0rc2
- Changes according to new guidelines (versionless jars & javadocs)
More information about the scm-commits
mailing list