From f9c97049b94f035be3944562fc6fc00453155482 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Aug 08 2019 13:52:26 +0000 Subject: hibernate3 fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675105 --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e520e52..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/hibernate-orm-3.6.10.Final.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..726c364 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +hibernate3 fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675105 diff --git a/hibernate-orm-cglib-3.1.patch b/hibernate-orm-cglib-3.1.patch deleted file mode 100644 index 29769b0..0000000 --- a/hibernate-orm-cglib-3.1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java -index c33f15c..6955f39 100644 ---- a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java -+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java -@@ -37,6 +37,7 @@ import net.sf.cglib.transform.impl.InterceptFieldFilter; - import net.sf.cglib.transform.impl.InterceptFieldTransformer; - import net.sf.cglib.core.ClassNameReader; - import net.sf.cglib.core.DebuggingClassWriter; -+ - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; - import org.hibernate.bytecode.AbstractClassTransformerImpl; -@@ -80,7 +81,7 @@ public class CglibClassTransformer extends AbstractClassTransformerImpl { - } - - String[] names = ClassNameReader.getClassInfo( reader ); -- ClassWriter w = new DebuggingClassWriter( ClassWriter.COMPUTE_MAXS ); -+ DebuggingClassWriter w = new DebuggingClassWriter( ClassWriter.COMPUTE_MAXS ); - ClassTransformer t = getClassTransformer( names ); - if ( t != null ) { - if ( log.isDebugEnabled() ) { diff --git a/hibernate-orm-fix-ant-gid.patch b/hibernate-orm-fix-ant-gid.patch deleted file mode 100644 index 98b17a6..0000000 --- a/hibernate-orm-fix-ant-gid.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hibernate-orm-3.6.10.Final.orig/hibernate-core/pom.xml 2012-02-08 19:26:33.000000000 -0500 -+++ hibernate-orm-3.6.10.Final/hibernate-core/pom.xml 2012-03-14 05:28:12.159272896 -0400 -@@ -139,7 +139,7 @@ - - - -- ant -+ org.apache.ant - ant - 1.6.5 - provided diff --git a/hibernate-orm-fix-cglib-gid.patch b/hibernate-orm-fix-cglib-gid.patch deleted file mode 100644 index 5c7d060..0000000 --- a/hibernate-orm-fix-cglib-gid.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- hibernate-orm-3.6.10.Final.orig/hibernate-core/pom.xml 2012-02-08 19:26:33.000000000 -0500 -+++ hibernate-orm-3.6.10.Final/hibernate-core/pom.xml 2012-03-14 05:20:55.672313070 -0400 -@@ -107,7 +107,7 @@ - true - - -- cglib -+ net.sf.cglib - cglib - true - ---- hibernate-orm-3.6.10.Final.orig/hibernate-parent/pom.xml 2012-02-08 19:26:33.000000000 -0500 -+++ hibernate-orm-3.6.10.Final/hibernate-parent/pom.xml 2012-03-14 05:37:54.773219172 -0400 -@@ -518,7 +463,7 @@ - - - -- cglib -+ net.sf.cglib - cglib - 2.2 - ---- hibernate-orm-3.6.10.Final.orig/hibernate-entitymanager/pom.xml 2012-02-08 19:26:33.000000000 -0500 -+++ hibernate-orm-3.6.10.Final/hibernate-entitymanager/pom.xml 2012-03-14 05:43:42.564187107 -0400 -@@ -47,7 +47,7 @@ - ${project.version} - - -- cglib -+ net.sf.cglib - cglib - - diff --git a/hibernate-orm-fix-jacc-gid-aid.patch b/hibernate-orm-fix-jacc-gid-aid.patch deleted file mode 100644 index 93c06a1..0000000 --- a/hibernate-orm-fix-jacc-gid-aid.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- hibernate-orm-3.6.10.Final.orig/hibernate-core/pom.xml 2012-02-08 19:26:33.000000000 -0500 -+++ hibernate-orm-3.6.10.Final/hibernate-core/pom.xml 2012-03-14 05:25:30.731287792 -0400 -@@ -119,8 +119,8 @@ - 1.1 - - -- org.jboss.javaee -- jboss-jacc-api_JDK4 -+ org.jboss.spec.javax.security.jacc -+ jboss-jacc-api_1.4_spec - 1.1.0 - provided - diff --git a/hibernate-orm-infinispan-5-support.patch b/hibernate-orm-infinispan-5-support.patch deleted file mode 100644 index 104e53f..0000000 --- a/hibernate-orm-infinispan-5-support.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- hibernate-orm-3.6.10.Final/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java.orig 2012-08-08 12:41:44.619000123 +0200 -+++ hibernate-orm-3.6.10.Final/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java 2012-08-08 12:45:57.434000123 +0200 -@@ -270,7 +270,7 @@ - - protected boolean handleEvictAllModification(CacheEntryModifiedEvent event) { - if (!event.isPre() && (replication || event.isOriginLocal()) && CacheHelper.isEvictAllNotification(event.getKey(), event.getValue())) { -- if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was put: {0}", event); -+ if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was put"); - invalidateState.set(InvalidateState.INVALID); - return true; - } -@@ -279,13 +279,13 @@ - - @CacheEntryInvalidated - public void entryInvalidated(CacheEntryInvalidatedEvent event) { -- if (log.isTraceEnabled()) log.trace("Cache entry invalidated: {0}", event); -+ if (log.isTraceEnabled()) log.trace("Cache entry invalidated"); - handleEvictAllInvalidation(event); - } - - protected boolean handleEvictAllInvalidation(CacheEntryInvalidatedEvent event) { - if (!event.isPre() && CacheHelper.isEvictAllNotification(event.getKey())) { -- if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was invalidated: {0}", event); -+ if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was invalidated"); - invalidateState.set(InvalidateState.INVALID); - return true; - } -@@ -303,4 +303,4 @@ - } - } - --} -\ No newline at end of file -+} diff --git a/hibernate3-depmap b/hibernate3-depmap deleted file mode 100644 index 5be192f..0000000 --- a/hibernate3-depmap +++ /dev/null @@ -1,27 +0,0 @@ - - - - jgroups - jgroups - 2.6.13.GA - - - JPP - jgroups212 - 2.12.3.Final - - - - - org.jboss.javaee - jboss-transaction-api - 1.0.1.GA - - - JPP - jboss-transaction-1.1-api - 1.0.1-SNAPSHOT - - - - diff --git a/hibernate3.spec b/hibernate3.spec deleted file mode 100644 index 2ed7bda..0000000 --- a/hibernate3.spec +++ /dev/null @@ -1,294 +0,0 @@ -%global namedreltag .Final -%global namedversion %{version}%{?namedreltag} -%global majorversion 3 -%global oname hibernate-orm - -Name: hibernate3 -Version: 3.6.10 -Release: 27%{?dist} -Summary: Relational persistence and query service -License: LGPLv2+ -URL: http://www.hibernate.org/ -# git clone git://github.com/hibernate/hibernate-orm -# cd hibernate-orm/ && git archive --format=tar --prefix=hibernate-orm-3.6.10.Final/ 3.6.10.Final | xz > hibernate-3.6.10.Final.tar.xz -Source0: hibernate-orm-3.6.10.Final.tar.xz -Source1: hibernate3-depmap -Patch0: hibernate-orm-fix-cglib-gid.patch -Patch1: hibernate-orm-fix-jacc-gid-aid.patch -Patch2: hibernate-orm-fix-ant-gid.patch -Patch3: hibernate-orm-infinispan-5-support.patch -Patch4: hibernate-orm-cglib-3.1.patch - -BuildArch: noarch - -BuildRequires: jpackage-utils -BuildRequires: javapackages-tools >= 0.7.2 -BuildRequires: maven-local -BuildRequires: maven-antrun-plugin -BuildRequires: maven-release-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-injection-plugin -BuildRequires: antlr-maven-plugin -BuildRequires: geronimo-validation -BuildRequires: geronimo-jta -BuildRequires: hibernate-validator -BuildRequires: cglib -BuildRequires: jboss-jacc-1.4-api -BuildRequires: c3p0 -BuildRequires: proxool -BuildRequires: hibernate-commons-annotations -BuildRequires: jboss-servlet-3.0-api -BuildRequires: ehcache-core -# jbosscache was retired -# BuildRequires: jbosscache-core -# BuildRequires: jbosscache-common-parent -# H3 dont support infinispan > 5.3.0 -# BuildRequires: infinispan -BuildRequires: rhq-plugin-annotations -BuildRequires: h2 -BuildRequires: mvn(hsqldb:hsqldb:1) -BuildRequires: mvn(org.slf4j:slf4j-log4j12) -BuildRequires: glassfish-jaxb -BuildRequires: shrinkwrap -BuildRequires: jboss-transaction-1.1-api - -Obsoletes: %{name}-infinispan < %{version}-%{release} -Obsoletes: %{name}-jbosscache < %{version}-%{release} - -%description -Hibernate is a powerful, ultra-high performance -object/relational persistence and query service -for Java. - -%package javadoc -Summary: API docs for %{name} - -%description javadoc -API documentation for %{name}. - -%package entitymanager -Summary: Hibernate Entity Manager - -%description entitymanager -%{summary}. - -%package envers -Summary: Hibernate support for entity auditing - -%description envers -%{summary}. - -%package c3p0 -Summary: C3P0-based implementation of Hibernate ConnectionProvider - -%description c3p0 -%{summary}. - -%package proxool -Summary: Proxool-based implementation of Hibernate ConnectionProvder - -%description proxool -%{summary}. - -%package ehcache -Summary: Integration of Hibernate with Ehcache - -%description ehcache -%{summary}. - -%package testing -Summary: Hibernate JUnit test utilities - -%description testing -%{summary}. - -%prep -%setup -q -n %{oname}-%{namedversion} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -#%%patch3 -p1 -%patch4 -p1 - -%pom_remove_plugin org.jboss.maven.plugins:maven-jdocbook-plugin hibernate-parent -%pom_remove_plugin org.jboss.maven.plugins:maven-jdocbook-style-plugin hibernate-parent -%pom_remove_plugin :gmaven-plugin hibernate-parent -%pom_disable_module hibernate-testsuite -%pom_disable_module hibernate-oscache -%pom_disable_module hibernate-swarmcache -%pom_disable_module hibernate-jdbc3-testing -%pom_disable_module hibernate-jdbc4-testing - -%pom_disable_module hibernate-infinispan -%pom_disable_module hibernate-jbosscache - -# Remove test deps infinispan jbosscache -for m in envers entitymanager ehcache; do -%pom_xpath_remove "pom:dependencies/pom:dependency[pom:scope = 'test']" hibernate-${m}/pom.xml -done - -# We don't need it -%pom_xpath_remove pom:build/pom:extensions hibernate-parent/pom.xml - -# disable hibernate-tools support -%pom_remove_dep org.hibernate:hibernate-tools hibernate-envers -%pom_remove_dep ant:ant hibernate-envers -rm -r hibernate-envers/src/main/java/org/hibernate/tool/ant/*.java \ - hibernate-envers/src/main/java/org/hibernate/envers/ant/*.java - -# Make hibernate-testing back a test dependency... -#sed -i "s||test|" hibernate-infinispan/pom.xml - -# Fix the c3p0 gid -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'c3p0' ]/pom:groupId" com.mchange hibernate-c3p0 - -# Fix the hibernate-commons-annotations gid -for f in hibernate-core hibernate-envers;do -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'hibernate-commons-annotations' ]/pom:groupId" org.hibernate.common ${f} -done - -for f in hibernate-core hibernate-entitymanager hibernate-parent;do -sed -i "s|javax.validation|org.apache.geronimo.specs|" ${f}/pom.xml -sed -i "s|validation-api|geronimo-validation_1.0_spec|" ${f}/pom.xml -done - -sed -i "s|javax.transaction|org.jboss.spec.javax.transaction|" hibernate-core/pom.xml -sed -i "s|jta|jboss-transaction-api_1.1_spec|" hibernate-core/pom.xml -sed -i "s|1.1|1.0.1.Final|" hibernate-core/pom.xml - -%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId = 'hibernate-commons-annotations' ]/pom:groupId" org.hibernate.common hibernate-parent - -sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1307,02110-1301," lgpl.txt - -%mvn_compat_version : %{majorversion} %{namedversion} -%mvn_package ":hibernate-parent" %{name} -%mvn_package ":hibernate-core" %{name} -%mvn_package ":hibernate" __noinstall - -%build - -# Currently 4 tests fail with this error: -# "Unable to get the default Bean Validation factory" -export jdk16_home=/usr -export LANG=C.UTF-8 -%mvn_build -s -f -- -DdisableDistribution=true - -%install -%mvn_install - -%files -f .mfiles-%{name} -%doc changelog.txt -%license lgpl.txt - -%files javadoc -f .mfiles-javadoc -%license lgpl.txt - -%files entitymanager -f .mfiles-hibernate-entitymanager -%license lgpl.txt - -%files envers -f .mfiles-hibernate-envers -%license lgpl.txt - -%files c3p0 -f .mfiles-hibernate-c3p0 -%license lgpl.txt - -%files ehcache -f .mfiles-hibernate-ehcache -%license lgpl.txt - -%files proxool -f .mfiles-hibernate-proxool -%license lgpl.txt - -%files testing -f .mfiles-hibernate-testing -%license lgpl.txt - -%changelog -* Thu Jul 25 2019 Fedora Release Engineering - 3.6.10-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 3.6.10-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 3.6.10-25 -- Use C.UTF-8 locale - See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot - -* Fri Jul 13 2018 Fedora Release Engineering - 3.6.10-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 3.6.10-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.6.10-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.6.10-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jun 21 2016 gil cattaneo 3.6.10-20 -- add missing build requires - -* Wed Feb 03 2016 Fedora Release Engineering - 3.6.10-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 30 2016 gil cattaneo - 3.6.10-18 -- rebuilt - -* Wed Jun 17 2015 Fedora Release Engineering - 3.6.10-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Feb 05 2015 gil cattaneo 3.6.10-16 -- introduce license macro - -* Thu Jun 26 2014 gil cattaneo 3.6.10-15 -- disable jbosscache support - -* Sat Jun 07 2014 Fedora Release Engineering - 3.6.10-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 3.6.10-13 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Sep 14 2013 gil cattaneo 3.6.10-12 -- rebuilt with new hibernate-commons-annotations -- fix validation-api gId:aId - -* Sat Aug 03 2013 Fedora Release Engineering - 3.6.10-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 10 2013 Marek Goldmann - 3.6.10-10 -- Removing test deps from poms -- Added geronimo-jta to R for hibernate-core - -* Thu Feb 14 2013 Fedora Release Engineering - 3.6.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 3.6.10-8 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Oct 30 2012 Marek Goldmann - 3.6.10-7 -- Versioned jars to make it possible to install next to hibernate (4) package - -* Mon Aug 20 2012 Marek Goldmann - 3.6.10-6 -- hibernate-testing should be a test dependency in infinispan module - -* Sun Aug 12 2012 gil cattaneo - 3.6.10-5 -- Enable envers module -- Installed testing module (built but not installed) -- Disabled jdbc4-testing module -- Added maven fragments files in appropriate subpackages - -* Fri Aug 10 2012 Andy Grimm - 3.6.10-4 -- Enable jbosscache and infinispan modules (RHBZ#846658) -- Remove duplicate files from core package - -* Mon Aug 06 2012 Andy Grimm - 3.6.10-3 -- Enable ehcache module (#845209) -- Use pom macros for module disablement -- Split into subpackages - -* Thu Jul 19 2012 Fedora Release Engineering - 3.6.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Mar 14 2012 Andy Grimm - 3.6.10-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index 1896206..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -0a2fc55adc48915b53b0ac29d877093d hibernate-orm-3.6.10.Final.tar.xz