rpms/tomcat
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: Update to 9.0.10 Add bnd.annotation and slf4j-api jars to the classpath so that the build can complete the OSGi steps

Browse Source
This commit is contained in:
Coty Sutherland 2018-08-07 10:36:36 -04:00
parent c670fc3d7c
commit 32304e7570
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tomcat-build.patch
View File

@ -1,12 +1,12 @@
Index: build.xml --- build.xml.orig 2018-08-07 10:32:04.994403913 -0400
=================================================================== +++ build.xml 2018-08-07 10:32:30.874319588 -0400
--- build.xml (revision 1837267) @@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom
+++ build.xml (working copy)
@@ -3207,6 +3207,7 @@
<path id="bndlib.classpath"> <path id="bndlib.classpath">
<fileset file="${bnd.jar}" /> <fileset file="${bnd.jar}" />
<fileset file="${bndlib.jar}" /> <fileset file="${bndlib.jar}" />
+ <fileset file="${bndlibg.jar}" /> + <fileset file="${bndlibg.jar}" />
+ <fileset file="${bndannotation.jar}" />
+ <fileset file="${slf4j-api.jar}" />
</path> </path>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bndlib.classpath" /> <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bndlib.classpath" />

2
tomcat.spec
View File

@ -285,6 +285,8 @@ export OPT_JAR_LIST="xalan-j2-serializer"
-Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
-Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \
-Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \
-Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
-Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \
-Dno.build.dbcp=true \ -Dno.build.dbcp=true \
-Dversion="%{version}" \ -Dversion="%{version}" \
-Dversion.build="%{micro_version}" \ -Dversion.build="%{micro_version}" \