Accepting request 1147338 from Java:packages

Link ecj.jar into the install instead of copying it

OBS-URL: https://build.opensuse.org/request/show/1147338
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=104
This commit is contained in:
2024-02-18 19:24:46 +00:00
committed by Git OBS Bridge
2 changed files with 8 additions and 1 deletions

View File

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

View File

@@ -409,7 +409,7 @@ pushd %{buildroot}%{_javadir}
popd
pushd output/build
%{_bindir}/build-jar-repository lib commons-collections \
%{_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
@@ -427,6 +427,8 @@ pushd %{buildroot}%{libdir}
ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar
ln -s $(build-classpath commons-pool2) commons-pool2.jar
ln -s $(build-classpath ecj/ecj) jasper-jdt.jar
rm ecj.jar
ln -s $(build-classpath ecj/ecj) ecj.jar
# Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap)
cp -a %{buildroot}%{bindir}/tomcat-juli.jar ./