Merge pull request #110 from apache/xalan-java-mvn-refactored

Maven migration, refactored, plus maven build changes since then.

.github/workflows/main.yml

@@ -35,34 +35,39 @@ jobs:
         java-version: 8
     - name: 'Build Xalan jars'
       run: |
-        ant jar
+        mvn --no-transfer-progress clean compile site verify
     - uses: actions/checkout@v3
       name: 'Checkout xalan-test'
       with:
         repository: apache/xalan-test
         path: xalan-test
         ref: master
+    - name: 'Cheat xalan-test up to be sibling of xalan-java'
+      run: |
+        mv xalan-test ..; ls ..
     - name: 'Run xalan-test tests'
-      working-directory: xalan-test
+      working-directory: ../xalan-test
 # NOTE: "alltest" target includes conformance tests known not to run in Xalan,
 # as well as having dependencies on some targets which have since been edited
 # out. The following is our typical minimal build test as documented in README,
 # minus conf.xsltc since that one is currently throwing four known failures and
 # isn't set up to say "but that's not a regression".
-      run: |
-        ant jar extensions.classes smoketest apitest -Dxalan.relpath=../ -Dparserjar=../lib/endorsed/xercesImpl.jar -Dxml-apis.jar=../lib/endorsed/xml-apis.jar
 
-# ant fulldist is failing: in CI
-# /home/runner/work/xalan-java/xalan-java/build.xml:1399: /home/runner/work/xalan-java/xalan-test does not exist.
-# Error replicated on my system if there is not a sibling xalan-test.
-# NOT replicated if sibling xalan-test directory is present
-# Simplest fix would be to have the above test checkout emulate the dev environment;
-# better would be to fix fulldist to intelligently check both locations;
-# best might be to adopt xalan-test back into the xalan repository, if it's no longer being used elsewhere.
-    - name: 'Cheat xalan-test up to be sibling of xalan-java'
-      run: |
-        mv xalan-test ..; ls ..
-    - id: build_artifacts
+# NOTE: Adjustments made for mvn build leaving things in a slightly different
+# place than ant build did (and recreating /lib).
       run: |
-        ant fulldist
+        ls; ant -debug jar extensions.classes smoketest apitest -Dxalan.relpath=../xalan-java -Dparserjar=../xalan-java/lib/xercesImpl-2.12.2.jar -Dxml-apis.jar=../xalan-java/lib/xml-apis-1.4.01.jar
 
+# Build distribution artifacts: Used to pull xalan-test back down as child and
+# run fulldist:
+#      run: |
+#        ant fulldist
+# fulldist isn't currently a separate target in the mvn build process
+# A near-equivalent is being performed every time to build the .tar.gz
+# and .zip distribution files.
+#
+# BUT NOTE that the binary distro has traditionally included
+# xalan-test as a subdirectory; maven build doesn't yet pull that in.
+# Discussion is in progress about whether it is (a) necessary, (b) a good
+# idea.
+# TODO: REVIEW.

.gitignore

@@ -1,36 +1,41 @@
-/bin/
-/build/
-/classes/
-/.idea/
+# Maven output
+target/
+**/dependency-reduced-pom.xml
+
+# In Maven, dependencies are downloaded during build; 
+# we don't want to check them in
+/tools/
+
+# Xalan "Ant emulation" directories for xalan-test and distribution,
+# created by Maven build.
+# (xalan-test referenced dependencies from xalan-java; distro may be
+# publishing from lib/ though I hope not.)
+build/
+lib/
+
+# Eclipse configuration
+.settings/
+.project
+.classpath
+
+# IntelliJ IDEA
+.idea/
 *.iml
-.DS_Store
 
-# We download the dependencies if they are missing
-/lib/
-/tools/java_cup.jar
-/tmp/
+# MacOS Finder
+.DS_Store
 
-# Generated sources
+# XPath parser generated during compilation
 /src/org/apache/xalan/processor/XSLProcessorVersion.java
 /src/org/apache/xalan/xsltc/compiler/XPathLexer.java
 /src/org/apache/xalan/xsltc/compiler/XPathParser.java
 /src/org/apache/xalan/xsltc/compiler/sym.java
-/xdocs/sources/xalan/DONE
-/xdocs/sources/xalan/XSLTCDONE
-
-# The following are unpacked from zipfile
-# NOTE: Might be simpler to just check 'em in unzipped.
-/xdocs/style/graphics/
-/xdocs/style/loader.xml
-/xdocs/style/resources/
-/xdocs/style/stylesheets/any2header.xsl
-/xdocs/style/stylesheets/any2project.xsl
-/xdocs/style/stylesheets/book2group.xsl
-/xdocs/style/stylesheets/book2project.xsl
-/xdocs/style/stylesheets/changes2document.xsl
-/xdocs/style/stylesheets/context2footer.xsl
-/xdocs/style/stylesheets/context2label.xsl
-/xdocs/style/stylesheets/directory2project.xsl
-/xdocs/style/stylesheets/document2html.xsl
-/xdocs/style/stylesheets/faqs2document.xsl
-/xdocs/style/stylesheets/group2document.xsl
+
+# Stylebook processing progress flags.
+/stylebook/sources/xalan/DONE
+/stylebook/sources/xalan/XSLTCDONE
+
+# Various temporary/work directories used by other tools
+/bin/
+/classes/
+/tmp/