diff --git a/.github/workflows/ci-build-manual.yml b/.github/workflows/ci-build-manual.yml index 606b0ce..319b005 100644 --- a/.github/workflows/ci-build-manual.yml +++ b/.github/workflows/ci-build-manual.yml @@ -1,23 +1,28 @@ -name: Build and push a development version on docker +name: Build and push a development version on docker -on: - workflow_dispatch: - +on: + workflow_dispatch: + inputs: + custom_tag: + type: string + description: Docker image tag + required: true + default: "latest-develop" jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v4 - with: - java-version: '11' - distribution: 'temurin' - cache: 'gradle' - - name: Build with Gradle - run: ./gradlew build -x test + - uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + cache: 'gradle' + - name: Build with Gradle + run: ./gradlew build -x test docker-build: needs: [ build ] @@ -42,6 +47,7 @@ jobs: image: lfoppiano/pub2tei registry: docker.io pushImage: true - tags: latest-develop + tags: | + latest-develop, ${{ github.event.inputs.custom_tag}} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/Stylesheets/NLM2TEI-article.xsl b/Stylesheets/NLM2TEI-article.xsl index 4448e85..a52c60f 100644 --- a/Stylesheets/NLM2TEI-article.xsl +++ b/Stylesheets/NLM2TEI-article.xsl @@ -24,7 +24,7 @@ - + @@ -1195,11 +1195,12 @@ - + + @@ -1354,7 +1355,7 @@ + not explicitly addressed by means of an XPath in another template--> @@ -2252,6 +2253,22 @@
+
+ +
+
+
+ + +
+
+ + + +

+ +

+
@@ -2520,6 +2537,34 @@
+ +
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+
diff --git a/build.gradle b/build.gradle index a088f55..148e616 100644 --- a/build.gradle +++ b/build.gradle @@ -119,7 +119,7 @@ dependencies { implementation 'javax.xml.bind:jaxb-api:2.3.0' implementation 'org.apache.opennlp:opennlp-tools:1.9.1' implementation 'black.ninia:jep:4.0.2' - implementation "org.apache.httpcomponents:httpclient:4.5.3" + implementation "org.apache.httpcomponents:httpclient:4.5.13" implementation "org.apache.lucene:lucene-analyzers-common:4.5.1" implementation group: 'org.jruby', name: 'jruby-complete', version: '9.2.13.0'