Skip to content

Commit

Permalink
Make compatible with Java 11
Browse files Browse the repository at this point in the history
See ukf/ukf-meta#238.

This retains Xalan, but loads it from the classpath instead of the
endorsement mechanism used in earlier versions. This appears to work
(even with the extension classes) from the command line but might not
be stable in container environments, so we still need to move to
excluding Xerces and Xalan in favour of Java stages in the medium term.
  • Loading branch information
iay committed Sep 8, 2020
1 parent 6f03868 commit 92077b4
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 4 deletions.
33 changes: 29 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1588,7 +1588,6 @@
The individual properties listed here can be augmented or overridden
by properties defined in the external properties files, e.g., build.properties.
-->
<property name="mda.java.endorsed.dirs" value="${tools.dir}/endorsed"/>
<property name="mda.blocklists.dir" value="${blocklists.dir}"/>
<property name="mda.cacheDuration.aggregate.duration" value="${cacheDuration.aggregate.duration}"/>
<property name="mda.cacheDuration.perEntity.duration" value="${cacheDuration.perEntity.duration}"/>
Expand Down Expand Up @@ -1629,18 +1628,44 @@
<pathelement path="${mdx.dir}"/>

<!-- Include all APIs we may want to use. -->

<!-- The Shibboleth MDA. -->
<fileset dir="${tools.mda}/lib">
<include name="*.jar"/>
</fileset>

<!-- UK federation MDA beans, and ukf-members. -->
<fileset dir="${tools.dir}/ukf-mda">
<include name="*.jar"/>
</fileset>
<fileset dir="${tools.dir}/xalan/lib">
<include name="sdss-xalan-md-*.jar"/>
</fileset>

<!-- InCommon MDA beans. -->
<fileset dir="${tools.dir}/inc-mda">
<include name="*.jar"/>
</fileset>

<!-- Support libraries for any of the above. -->
<fileset dir="${tools.dir}/lib">
<include name="*.jar"/>
</fileset>

<!--
Use Xalan as our XML processor.
Note: this is not the old endorsement mechanism,
despite the directory name. Instead, we just load
it via the classpath.
-->
<fileset dir="${tools.dir}/xalan/impl">
<include name="*.jar"/>
</fileset>

<!--
Xalan-dependent UK federation classes.
-->
<fileset dir="${tools.dir}/xalan/lib">
<include name="sdss-xalan-md-*.jar"/>
</fileset>

</classpath>
<syspropertyset>
<propertyset refid="mda.properties"/>
Expand Down
Binary file added tools/lib/istack-commons-runtime-3.0.8.jar
Binary file not shown.
Binary file added tools/lib/jakarta.activation-1.2.2.jar
Binary file not shown.
Binary file added tools/lib/jakarta.xml.bind-api-2.3.2.jar
Binary file not shown.
Binary file added tools/lib/jaxb-runtime-2.3.2.jar
Binary file not shown.
Binary file removed tools/xalan/endorsed/resolver-2.9.1.jar
Binary file not shown.
Binary file removed tools/xalan/endorsed/serializer-2.9.1.jar
Binary file not shown.
Binary file removed tools/xalan/endorsed/xalan-2.7.1.jar
Binary file not shown.
Binary file removed tools/xalan/endorsed/xercesImpl-2.9.1.jar
Binary file not shown.
Binary file removed tools/xalan/endorsed/xml-apis-2.9.1.jar
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 92077b4

Please sign in to comment.