Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions main/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4190,19 +4190,6 @@ else
fi
AC_SUBST(GPERF)

dnl ===================================================================
dnl Check for building stax
dnl ===================================================================
AC_MSG_CHECKING([whether to build the stax])
if test -f "./stax/download/stax-1.2.0.jar"; then
BUILD_STAX=NO
AC_MSG_RESULT([no, will use the prebuilt stax/download/stax-1.2.0.jar])
else
BUILD_STAX=YES
AC_MSG_RESULT([yes])
fi
AC_SUBST(BUILD_STAX)

dnl ===================================================================
dnl Check for building ODK
dnl ===================================================================
Expand Down
6 changes: 0 additions & 6 deletions main/external_deps.lst
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,6 @@ if (SOLAR_JAVA == TRUE)
URL1 = https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)

if (SOLAR_JAVA == TRUE)
MD5 = 980143f96b3f6ce45d2e4947da21a5e9
name = stax-src-1.2.0.zip
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip

if (ENABLE_MEDIAWIKI == YES)
MD5 = a7983f859eafb2677d7ff386a023bc40
name = xsltml_2.1.2.zip
Expand Down
7 changes: 0 additions & 7 deletions main/rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -1264,13 +1264,6 @@ test/testuno/data/uno/sc/fvt/Bug100989MergeAcross0AddsExtraEmptyCell.xml
test/testuno/data/uno/sc/fvt/Bug128554FractionalSecondsIgnored.xml
test/testuno/data/uno/sc/fvt/Bug81233ColumnZReference.xml

##############################################################################
#
# files with Apache License 2.0 (ALv2)
# that are plain copies, so they cannot be modified

main/stax/download/README_stax-1.2.0.jar.txt

##############################################################################
#
# files with MIT license
Expand Down
2 changes: 1 addition & 1 deletion main/saxon/prj/build.lst
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xx saxon : solenv stax NULL
xx saxon : solenv NULL
xx saxon nmake - all xx_saxon NULL
Loading