diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.tmp similarity index 100% rename from .github/workflows/debian.yml rename to .github/workflows/debian.tmp diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.tmp similarity index 100% rename from .github/workflows/macos.yml rename to .github/workflows/macos.tmp diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 27a86770b..eaecea964 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,6 +17,11 @@ jobs: outputs: common_changed: ${{ steps.common-changed.outputs.only_changed }} steps: + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - uses: actions/checkout@v2 - id: common-changed diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.tmp similarity index 100% rename from .github/workflows/windows.yml rename to .github/workflows/windows.tmp diff --git a/Makefile b/Makefile index e4e85efce..4ac4afc8f 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ XSLT_GENERATED := xslt/iec.international-standard.xsl \ xslt/bipm.rapport.xsl \ xslt/jcgm.standard.xsl -MN2PDF_DOWNLOAD_PATH := https://github.com/metanorma/mn2pdf/releases/download/v2.10/mn2pdf-2.10.jar +MN2PDF_DOWNLOAD_PATH := https://github.com/metanorma/mn2pdf/releases/download/v2.12/mn2pdf-2.12.jar # MN2PDF_DOWNLOAD_PATH := https://maven.pkg.github.com/metanorma/mn2pdf/com/metanorma/fop/mn2pdf/1.7/mn2pdf-1.7.jar MN2PDF_EXECUTABLE := $(notdir $(MN2PDF_DOWNLOAD_PATH)) @@ -95,7 +95,13 @@ targets: xslts: xsltsclean $(XSLT_GENERATED) $(MN2PDF_EXECUTABLE): - curl -sSL ${MN2PDF_DOWNLOAD_PATH} -o $(MN2PDF_EXECUTABLE) + git clone https://github.com/metanorma/mn2pdf; \ + cd mn2pdf; \ + git checkout upgrade/pdfbox_3_0_3; \ + mvn --settings settings.xml -DskipTests clean package shade:shade; \ + cd ..; \ + cp ./mn2pdf/target/mn2pdf-2.12.jar $(MN2PDF_EXECUTABLE) +# curl -sSL ${MN2PDF_DOWNLOAD_PATH} -o $(MN2PDF_EXECUTABLE) xalan/xalan.jar: ifeq ($(OS),Windows_NT) diff --git a/settings.xml b/settings.xml new file mode 100644 index 000000000..e1623ab07 --- /dev/null +++ b/settings.xml @@ -0,0 +1,43 @@ + + + + multiple-repos + + + + + multiple-repos + + + central + https://repo1.maven.org/maven2 + + + metanorma + GitHub Metanorma Apache Maven Packages + https://maven.pkg.github.com/metanorma/barcode4j + + + + + + + + + metanorma + ${env.GITHUB_ACTOR} + ${env.GITHUB_TOKEN} + + + metanorma_mn2pdf + ${env.GITHUB_USERNAME} + ${env.GITHUB_TOKEN} + + +