diff --git a/openjpa.spec b/openjpa.spec index 1ddf5b8..22abc2b 100644 --- a/openjpa.spec +++ b/openjpa.spec @@ -1,7 +1,7 @@ %global with_tests 0 Name: openjpa Version: 2.4.1 -Release: 3 +Release: 4 Summary: Java Persistence 2.0 API License: BSD and Apache-2.0 and CDDL and GPLv2+ Url: http://openjpa.apache.org/ @@ -11,7 +11,7 @@ Patch1: openjpa-2.4.1-javacc6.patch BuildRequires: maven-local mvn(ant-contrib:ant-contrib) mvn(com.sun.xml.bind:jaxb-impl) BuildRequires: mvn(commons-collections:commons-collections) mvn(commons-dbcp:commons-dbcp) BuildRequires: mvn(commons-lang:commons-lang) mvn(commons-logging:commons-logging) -BuildRequires: mvn(commons-pool:commons-pool) mvn(hsqldb:hsqldb:1) mvn(httpunit:httpunit) +BuildRequires: mvn(commons-pool:commons-pool) mvn(hsqldb:hsqldb:1) BuildRequires: mvn(jakarta-regexp:jakarta-regexp) mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.xml.bind:jaxb-api) mvn(junit:junit) mvn(log4j:log4j:1.2.17) BuildRequires: mvn(mysql:mysql-connector-java) mvn(net.sourceforge.serp:serp) @@ -66,6 +66,7 @@ This package contains javadoc for %{name}. %setup -q -n %{name}-parent-%{version} find . -name "*.class" -delete find . -name "*.jar" -delete +find . -name "TestJEST.java" -delete %patch0 -p0 %patch1 -p1 %pom_disable_module %{name} @@ -81,7 +82,9 @@ find . -name "*.jar" -delete %pom_remove_plugin :taglist-maven-plugin %pom_remove_plugin :apache-rat-plugin %pom_remove_dep net.sourceforge.findbugs:annotations + %pom_remove_dep simple-jndi:simple-jndi openjpa-persistence-jdbc +%pom_remove_dep httpunit:httpunit openjpa-jest %pom_xpath_remove "pom:profile[pom:id='ydoc-profile']" %pom_xpath_remove "pom:profile[pom:id='test-sybase-jconnect']" %{name}-persistence-jdbc %pom_xpath_remove "pom:profile[pom:id='test-soliddb']" %{name}-persistence-jdbc @@ -97,6 +100,7 @@ for p in persistence-jdbc persistence-locking; do %pom_xpath_remove "pom:profile[pom:id='test-oracle']" %{name}-${p} %pom_xpath_remove "pom:profile[pom:id='test-sqlserver']" %{name}-${p} %pom_xpath_remove "pom:profile[pom:id='test-sybase']" %{name}-${p} + done %pom_change_dep -r :geronimo-jpa_2.0_spec org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final %pom_remove_dep com.ibm.websphere:websphere_uow_api %{name}-kernel @@ -148,6 +152,9 @@ install -p -m 644 %{name}-ant %{buildroot}%{_sysconfdir}/ant.d/%{name} %license LICENSE NOTICE %changelog +* Wed Feb 3 2021 wutao - 2.4.1-4 +- remove httpunit dependency + * Tue Jan 19 2021 caodongxia - 2.4.1-3 - Modify license information.