[jboss-jts] Updated patch to remove the jboss-as-parent dep from the correct files
Marek Goldmann
goldmann at fedoraproject.org
Tue Jul 3 14:01:12 UTC 2012
commit a7daf198134a9785bd4ed5f9906575b39ce2bdd0
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date: Tue Jul 3 16:01:02 2012 +0200
Updated patch to remove the jboss-as-parent dep from the correct files
...-4.16.2.Final-jboss-as-parent-dep-removal.patch | 31 ++++++++++++++++++--
jboss-jts.spec | 5 ++-
2 files changed, 32 insertions(+), 4 deletions(-)
---
diff --git a/jboss-jts-4.16.2.Final-jboss-as-parent-dep-removal.patch b/jboss-jts-4.16.2.Final-jboss-as-parent-dep-removal.patch
index c7c1dab..a0a4986 100644
--- a/jboss-jts-4.16.2.Final-jboss-as-parent-dep-removal.patch
+++ b/jboss-jts-4.16.2.Final-jboss-as-parent-dep-removal.patch
@@ -1,6 +1,31 @@
-diff -Naur jboss-jts-4.16.2.Final/maven/pom-template.xml jboss-jts-4.16.2.Final-work/maven/pom-template.xml
---- jboss-jts-4.16.2.Final/maven/pom-template.xml 2011-12-02 17:54:01.000000000 +0100
-+++ jboss-jts-4.16.2.Final-work/maven/pom-template.xml 2012-07-03 10:40:48.156000012 +0200
+diff -Naur orig/jbossjta-integration.pom work/jbossjta-integration.pom
+--- orig/jbossjta-integration.pom 2012-07-03 15:53:21.919999586 +0200
++++ work/jbossjta-integration.pom 2012-07-03 15:54:03.512001081 +0200
+@@ -151,21 +151,6 @@
+ </plugins>
+ </build>
+
+- <dependencyManagement>
+- <dependencies>
+-
+- <dependency>
+- <!-- https://repository.jboss.org/nexus/service/local/repositories/releases/content/org/jboss/as/jboss-as-parent/7.1.0.Beta1b/jboss-as-parent-7.1.0.Beta1b.pom -->
+- <groupId>org.jboss.as</groupId>
+- <artifactId>jboss-as-parent</artifactId>
+- <version>7.1.0.Beta1b</version>
+- <type>pom</type>
+- <scope>import</scope>
+- </dependency>
+-
+- </dependencies>
+- </dependencyManagement>
+-
+ <dependencies>
+
+ <!--
+diff -Naur orig/jbossjta.pom work/jbossjta.pom
+--- orig/jbossjta.pom 2012-07-03 15:53:21.919999586 +0200
++++ work/jbossjta.pom 2012-07-03 15:53:52.377998861 +0200
@@ -151,21 +151,6 @@
</plugins>
</build>
diff --git a/jboss-jts.spec b/jboss-jts.spec
index 16ee068..d36b4bb 100644
--- a/jboss-jts.spec
+++ b/jboss-jts.spec
@@ -3,7 +3,7 @@
Name: jboss-jts
Version: 4.16.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Distributed Transaction Manager
Group: Development/Libraries
License: LGPLv2+
@@ -201,6 +201,9 @@ cp -rp install/htdocs/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Tue Jul 03 2012 Marek Goldmann <mgoldman at redhat.com> 4.16.2-6
+- Updated patch to remove the jboss-as-parent dep from the correct files
+
* Tue Jul 03 2012 Marek Goldmann <mgoldman at redhat.com> 4.16.2-5
- Removed the jboss-as-parent dependency
More information about the scm-commits
mailing list