SHA256
1
0
forked from pool/tomcat10

Accepting request 1147339 from Java:packages

Link ecj.jar into the install instead of copying it

OBS-URL: https://build.opensuse.org/request/show/1147339
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat10?expand=0&rev=7
This commit is contained in:
Ana Guerrero 2024-02-18 19:24:47 +00:00 committed by Git OBS Bridge
commit 7d0b8cb9ce
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 17 14:55:36 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Link ecj.jar into the install instead of copying it
-------------------------------------------------------------------
Tue Feb 6 10:04:21 UTC 2024 - Michele Bussolotto <michele.bussolotto@suse.com>

View File

@ -438,8 +438,8 @@ pushd %{buildroot}%{_javadir}
popd
pushd output/build
%{_bindir}/build-jar-repository lib commons-collections \
commons-dbcp2 commons-pool2 ecj/ecj 2>&1
%{_bindir}/build-jar-repository -s lib commons-collections \
commons-dbcp2 commons-pool2 ecj/ecj 2>&1
# need to use -p here with b-j-r otherwise the examples webapp fails to
# load with a java.io.IOException
%{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
@ -455,6 +455,8 @@ pushd %{buildroot}%{libdir}
rm -f commons-dbcp.jar
ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar
ln -s $(build-classpath commons-pool2) commons-pool2.jar
rm ecj.jar
ln -s $(build-classpath ecj/ecj) ecj.jar
ln -s $(build-classpath ecj/ecj) jasper-jdt.jar
# Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap)