Attachment 6574 Details for Bug 15964 – patch to disable testing subpackage of hibernate4

[patch] patch to disable testing subpackage of hibernate4

hibernate4-notesting.diff (text/plain), 3.72 KB, created by David Walser on 2015-05-18 21:16:43 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: David Walser

Created: 2015-05-18 21:16:43 CEST

Size: 3.72 KB

patch

obsolete

>Index: SOURCES/hibernate-parent-4.3.5.Final.pom
>===================================================================
>--- SOURCES/hibernate-parent-4.3.5.Final.pom	(revision 822335)
>+++ SOURCES/hibernate-parent-4.3.5.Final.pom	(working copy)
>@@ -16,7 +16,7 @@
>     <module>hibernate-infinispan</module>
>     <module>hibernate-osgi</module>
>     <module>hibernate-proxool</module>
>-    <module>hibernate-testing</module>
>+    
>   </modules>
>   <build>
>     <pluginManagement>
>@@ -49,10 +49,10 @@
>                 <title>Internal</title>
>                 <packages>*.internal.*</packages>
>               </group>
>-              <group>
>+              
>             </groups>
>             <links>
>               <link>http://docs.oracle.com/javase/6/docs/api/</link>
>Index: SPECS/hibernate4.spec
>===================================================================
>--- SPECS/hibernate4.spec	(revision 822335)
>+++ SPECS/hibernate4.spec	(working copy)
>@@ -49,7 +49,7 @@
> BuildRequires: javassist
> BuildRequires: jboss-common-core
> BuildRequires: jboss-jacc-1.4-api
>-BuildRequires: narayana
>+#BuildRequires: narayana
> BuildRequires: jboss-logging
> BuildRequires: jboss-naming
> BuildRequires: jboss-transaction-1.1-api
>@@ -145,11 +145,11 @@
> %description   osgi
> Support for running Hibernate O/RM in OSGi environments.
> 
>-%package       testing
>-Summary:       Hibernate Testing
>+#%%package       testing
>+#Summary:       Hibernate Testing
> 
>-%description   testing
>-Hibernate JUnit test utilities.
>+#%%description   testing
>+#Hibernate JUnit test utilities.
> 
> %package       javadoc
> Summary:       Javadoc for %{name}
>@@ -174,7 +174,7 @@
> cp %{SOURCE5} hibernate-envers/pom.xml
> cp %{SOURCE6} hibernate-infinispan/pom.xml
> cp %{SOURCE7} hibernate-proxool/pom.xml
>-cp %{SOURCE8} hibernate-testing/pom.xml
>+#cp %%{SOURCE8} hibernate-testing/pom.xml
> cp %{SOURCE9} hibernate-osgi/pom.xml
> 
> cp -p %{SOURCE60} .
>@@ -335,7 +335,8 @@
> 
> popd
> 
>-for m in c3p0 ehcache entitymanager envers infinispan osgi proxool testing; do
>+# testing removed from the following list for now
>+for m in c3p0 ehcache entitymanager envers infinispan osgi proxool ; do
> %pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-${m} "
> <extensions>true</extensions>
> <configuration>
>@@ -378,13 +379,13 @@
> %pom_add_dep "org.apache.ant:ant:1.9.4:provided" hibernate-core/pom.xml
> %pom_add_dep "javax.validation:validation-api" hibernate-core/pom.xml
> %pom_add_dep "junit:junit:4:test" hibernate-core/pom.xml
>-%pom_add_dep "org.hibernate:hibernate-testing:%{namedversion}:test" hibernate-core/pom.xml
>+#%%pom_add_dep "org.hibernate:hibernate-testing:%%{namedversion}:test" hibernate-core/pom.xml
> %pom_add_dep "javax.enterprise:cdi-api" hibernate-entitymanager/pom.xml
> %pom_add_dep "org.eclipse.osgi:org.eclipse.osgi" hibernate-osgi/pom.xml
> 
> # Use narayana instead of old jboss-jts
>-%pom_remove_dep "org.jboss.jbossts:jbossjta" hibernate-testing/pom.xml
>-%pom_add_dep "org.jboss.narayana.jta:jta" hibernate-testing/pom.xml
>+#%%pom_remove_dep "org.jboss.jbossts:jbossjta" hibernate-testing/pom.xml
>+#%%pom_add_dep "org.jboss.narayana.jta:jta" hibernate-testing/pom.xml
> 
> # fix non ASCII chars
> for f in $(grep -e 'Pedersen\|Lichtmaier\|Chanfreau\|Benke\|Carlos\|CREATE\ SCHEMA' --include *.java -r -l | sort | uniq); do
>@@ -422,8 +423,8 @@
> %files proxool -f .mfiles-hibernate-proxool
> %doc lgpl.txt LICENSE-2.0.txt
> 
>-%files testing -f .mfiles-hibernate-testing
>-%doc lgpl.txt LICENSE-2.0.txt
>+#%%files testing -f .mfiles-hibernate-testing
>+#%%doc lgpl.txt LICENSE-2.0.txt
> 
> %files osgi -f .mfiles-hibernate-osgi
> %doc lgpl.txt

Index: SOURCES/hibernate-parent-4.3.5.Final.pom
===================================================================
--- SOURCES/hibernate-parent-4.3.5.Final.pom	(revision 822335)
+++ SOURCES/hibernate-parent-4.3.5.Final.pom	(working copy)
@@ -16,7 +16,7 @@
     <module>hibernate-infinispan</module>
     <module>hibernate-osgi</module>
     <module>hibernate-proxool</module>
-    <module>hibernate-testing</module>
+    <!--<module>hibernate-testing</module>-->
   </modules>
   <build>
     <pluginManagement>
@@ -49,10 +49,10 @@
                 <title>Internal</title>
                 <packages>*.internal.*</packages>
               </group>
-              <group>
+              <!--<group>
                 <title>Testing Support</title>
                 <packages>org.hibernate.testing*</packages>
-              </group>
+              </group>-->
             </groups>
             <links>
               <link>http://docs.oracle.com/javase/6/docs/api/</link>
Index: SPECS/hibernate4.spec
===================================================================
--- SPECS/hibernate4.spec	(revision 822335)
+++ SPECS/hibernate4.spec	(working copy)
@@ -49,7 +49,7 @@
 BuildRequires: javassist
 BuildRequires: jboss-common-core
 BuildRequires: jboss-jacc-1.4-api
-BuildRequires: narayana
+#BuildRequires: narayana
 BuildRequires: jboss-logging
 BuildRequires: jboss-naming
 BuildRequires: jboss-transaction-1.1-api
@@ -145,11 +145,11 @@
 %description   osgi
 Support for running Hibernate O/RM in OSGi environments.
 
-%package       testing
-Summary:       Hibernate Testing
+#%%package       testing
+#Summary:       Hibernate Testing
 
-%description   testing
-Hibernate JUnit test utilities.
+#%%description   testing
+#Hibernate JUnit test utilities.
 
 %package       javadoc
 Summary:       Javadoc for %{name}
@@ -174,7 +174,7 @@
 cp %{SOURCE5} hibernate-envers/pom.xml
 cp %{SOURCE6} hibernate-infinispan/pom.xml
 cp %{SOURCE7} hibernate-proxool/pom.xml
-cp %{SOURCE8} hibernate-testing/pom.xml
+#cp %%{SOURCE8} hibernate-testing/pom.xml
 cp %{SOURCE9} hibernate-osgi/pom.xml
 
 cp -p %{SOURCE60} .
@@ -335,7 +335,8 @@
 
 popd
 
-for m in c3p0 ehcache entitymanager envers infinispan osgi proxool testing; do
+# testing removed from the following list for now
+for m in c3p0 ehcache entitymanager envers infinispan osgi proxool ; do
 %pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-${m} "
 <extensions>true</extensions>
 <configuration>
@@ -378,13 +379,13 @@
 %pom_add_dep "org.apache.ant:ant:1.9.4:provided" hibernate-core/pom.xml
 %pom_add_dep "javax.validation:validation-api" hibernate-core/pom.xml
 %pom_add_dep "junit:junit:4:test" hibernate-core/pom.xml
-%pom_add_dep "org.hibernate:hibernate-testing:%{namedversion}:test" hibernate-core/pom.xml
+#%%pom_add_dep "org.hibernate:hibernate-testing:%%{namedversion}:test" hibernate-core/pom.xml
 %pom_add_dep "javax.enterprise:cdi-api" hibernate-entitymanager/pom.xml
 %pom_add_dep "org.eclipse.osgi:org.eclipse.osgi" hibernate-osgi/pom.xml
 
 # Use narayana instead of old jboss-jts
-%pom_remove_dep "org.jboss.jbossts:jbossjta" hibernate-testing/pom.xml
-%pom_add_dep "org.jboss.narayana.jta:jta" hibernate-testing/pom.xml
+#%%pom_remove_dep "org.jboss.jbossts:jbossjta" hibernate-testing/pom.xml
+#%%pom_add_dep "org.jboss.narayana.jta:jta" hibernate-testing/pom.xml
 
 # fix non ASCII chars
 for f in $(grep -e 'Pedersen\|Lichtmaier\|Chanfreau\|Benke\|Carlos\|CREATE\ SCHEMA' --include *.java -r -l | sort | uniq); do
@@ -422,8 +423,8 @@
 %files proxool -f .mfiles-hibernate-proxool
 %doc lgpl.txt LICENSE-2.0.txt
 
-%files testing -f .mfiles-hibernate-testing
-%doc lgpl.txt LICENSE-2.0.txt
+#%%files testing -f .mfiles-hibernate-testing
+#%%doc lgpl.txt LICENSE-2.0.txt
 
 %files osgi -f .mfiles-hibernate-osgi
 %doc lgpl.txt

Actions: View | Diff

Attachments on bug 15964: 6574