Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
8a1023af35
!14 [sync] PR-13: License compliance rectification
From: @openeuler-sync-bot 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
2024-07-18 06:58:54 +00:00
wk333
84168dddbc License compliance rectification
(cherry picked from commit a861658d38868e983078173f6cc9bbd5783b7f03)
2024-07-17 16:26:08 +08:00
openeuler-ci-bot
282c99d4af
!10 Fix build failure due to buildnumber-maven-plugin updated
From: @wang--ge 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-08-21 03:47:58 +00:00
wang--ge
8e31a3f2c0 fix build failure due to buildnumber-maven-plugin updated 2023-08-18 17:25:02 +08:00
openeuler-ci-bot
596d003c95 !5 remove httpunit dep
From: @jackie_wu123
Reviewed-by: @maminjie,@wangchong1995924
Signed-off-by: @wangchong1995924
2021-02-04 09:55:52 +08:00
jackie_wu
8e85c7ca3d remove httpunit dep 2021-02-03 17:07:09 +08:00
openeuler-ci-bot
430fa7aa6d !4 Modify license information
From: @caodongxia
Reviewed-by: @hht8,@wangchong1995924
Signed-off-by: @wangchong1995924
2021-01-20 14:23:21 +08:00
caodongxia
4b074cdd49 Modify license information 2021-01-20 10:28:02 +08:00
openeuler-ci-bot
ed89d3d654 !2 Remove simple-json dep
From: @hht8
Reviewed-by: @rita_dong
Signed-off-by: @rita_dong
2020-11-02 15:35:46 +08:00
hht8
638c5e784c Remove simple-json dep 2020-10-27 20:38:43 +08:00

View File

@ -1,9 +1,9 @@
%global with_tests 0
Name: openjpa
Version: 2.4.1
Release: 1
Release: 6
Summary: Java Persistence 2.0 API
License: ASL 2.0 and CDDL
License: BSD and Apache-2.0 and CDDL-1.0 and GPLv2+
Url: http://openjpa.apache.org/
Source0: http://archive.apache.org/dist/openjpa/%{version}/%{name}-parent-%{version}-source-release.zip
Patch0: %{name}-2.3.0-remove-WASRegistryManagedRuntime.patch
@ -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)
@ -34,13 +34,16 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin)
BuildRequires: mvn(org.apache.xbean:xbean-finder)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin)
BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.0-api) mvn(org.jmock:jmock)
BuildRequires: mvn(org.jmock:jmock-junit4) mvn(org.osgi:org.osgi.core) mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.slf4j:slf4j-api) mvn(postgresql:postgresql)
BuildRequires: mvn(simple-jndi:simple-jndi)
BuildRequires: mvn(org.eclipse.aether:aether-connector-basic)
BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon)
BuildRequires: mvn(org.apache.maven.wagon:wagon-http)
BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
BuildRequires: subversion
%if 0
BuildRequires: mvn(mariadb:mariadb-connector-java)
%endif
@ -67,6 +70,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}
@ -82,6 +86,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 +104,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
@ -120,7 +128,7 @@ sed -i "s|org.apache.xbean.asm5|org.objectweb.asm|" \
%build
export MAVEN_OPTS="-Xms1024m -Xmx2048m -Xss5m"
%mvn_build -- \
%mvn_build -b -- \
%if %{with_tests}
-Ptest-derby \
%else
@ -148,5 +156,20 @@ install -p -m 644 %{name}-ant %{buildroot}%{_sysconfdir}/ant.d/%{name}
%license LICENSE NOTICE
%changelog
* Thu Jun 13 2024 wangkai <13474090681@163.com> - 2.4.1-6
- License compliance rectification
* Fri Aug 18 2023 Ge Wang <wang__ge@126.com> - 2.4.1-5
- Fix build failure due to buildnumber-maven-plugin updated
* Wed Feb 3 2021 wutao <wutao61@huawei.com> - 2.4.1-4
- remove httpunit dependency
* Tue Jan 19 2021 caodongxia <caodongxia@huawei.com> - 2.4.1-3
- Modify license information.
* Tue Oct 27 2020 huanghaitao <huanghaitao8@huawei.com> - 2.4.1-2
- Remove simple-json dep
* Wed Aug 19 2020 zhanghua <zhanghua40@huawei.com> - 2.4.1-1
- Package init