You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/05/08 13:36:18 UTC
svn commit: r1831184 - in /tomcat/trunk: build.properties.default build.xml
webapps/docs/changelog.xml
Author: markt
Date: Tue May 8 13:36:18 2018
New Revision: 1831184
URL: http://svn.apache.org/viewvc?rev=1831184&view=rev
Log:
Get Tomcat trunk building with Java 11 EA.
Note that you can't release with Java 11 but since releases have to be performed with Java 8 this is not at issue (yet).
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1831184&r1=1831183&r2=1831184&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue May 8 13:36:18 2018
@@ -210,3 +210,11 @@ findbugs.home=${base.path}/findbugs-${fi
findbugs.lib=${findbugs.home}/lib
findbugs.jar=${findbugs.lib}/findbugs-ant.jar
findbugs.loc=${base-sf.loc}/project/findbugs/findbugs/${findbugs.version}/findbugs-${findbugs.version}.tar.gz
+
+# ----- SAAJ API, used by Code Signing for releases -----
+# ----- No longer part of JRE from Java 11 onwards -----
+# ----- CDDL Licensed -----
+saaj-api.version=1.3.5
+saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
+saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
+saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1831184&r1=1831183&r2=1831184&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue May 8 13:36:18 2018
@@ -200,6 +200,7 @@
<!-- Classpaths -->
<path id="compile.classpath">
<pathelement location="${jdt.jar}"/>
+ <pathelement location="${saaj-api.jar}"/>
</path>
<path id="tomcat.classpath">
@@ -2630,6 +2631,13 @@ skip.installer property in build.propert
<param name="destdir" value="${jdt.home}"/>
</antcall>
+ <!-- Download SAAJ API -->
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${saaj-api.loc}"/>
+ <param name="destfile" value="${saaj-api.jar}"/>
+ <param name="destdir" value="${saaj-api.home}"/>
+ </antcall>
+
</target>
<target name="download-test-compile"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1831184&r1=1831183&r2=1831184&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 8 13:36:18 2018
@@ -111,6 +111,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Ensure that Apache Tomcat may be built from source with Java 11. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.8 (markt)" rtext="2018-05-03">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org