From 819d9841550475fc3d0f205a9bd714a548260d38 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Mon, 21 Mar 2022 17:46:39 +0100
Subject: [PATCH] Add specific TEI Stylesheets version to POM file Take version
in gitlab-ci from POM
---
.gitlab-ci.yml | 5 +++++
pom.xml | 12 ++++++++----
src/main/webapp/tei-stylesheets | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 255f2ee..0b799f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,6 +54,9 @@ get_version:
- 'PVERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.1:evaluate -Dexpression=project.version -q -DforceStdout)'
- echo "export PVERSION=$PVERSION" > $VARIABLES_FILE
- echo "Project version from main pom file is $PVERSION"
+ - 'TEI_STYLESHEETS_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.1:evaluate -Dexpression=project.properties.tei-stylesheet-version -q -DforceStdout)'
+ - echo "export TEI_STYLESHEET_VERSION=$TEI_STYLESHEETS_VERSION" > $VARIABLES_FILE
+ - echo "TEI Stylesheets version from main pom file is $TEI_STYLESHEETS_VERSION"
artifacts:
name: POM_VERSION
paths:
@@ -67,7 +70,9 @@ build_and_deploy:
# - main
stage: deploy_java
script:
+ - source $VARIABLES_FILE
- git submodule update --recursive --init
+ - git -C src/main/webapp/tei-stylesheets/ checkout $TEI_STYLESHEETS_VERSION
# REMOVE SKIPTESTS AS SOON AS TESTS ARE WORKING...!!
- mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -DskipTests=true
artifacts:
diff --git a/pom.xml b/pom.xml
index fc7b801..5284cd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-source-version>1.7</java-source-version>
- <java-target-version>1.7</java-target-version>
+ <java-target-version>1.7</java-target-version>
+
+ <!-- Referenced from .gitlab-ci.yml for use in git submodule -->
+ <tei-stylesheet-version>v7.33.0</tei-stylesheet-version>
+
<commons-io-version>2.4</commons-io-version>
<link-rewriter-version>0.4.1-RELEASE</link-rewriter-version>
<saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck -->
@@ -31,7 +35,7 @@
<confclient-version>4.1.0</confclient-version>
<tgsearch-version>4.0.1</tgsearch-version>
<tgcrud-version>2.6.0</tgcrud-version>
- <!-- TG-crud client configuration is not working with newest crud, I'll
+ <!-- TG-crud client configuration is not working with newest crud, I'll
just fix it tomorrow! -->
<!--tgcrud-version>11.3.0-TG-RELEASE</tgcrud-version -->
<guava-version>15.0</guava-version>
@@ -54,7 +58,7 @@
<epubcheck-version>4.0.0-alpha11</epubcheck-version>
<xmlunit-version>1.5</xmlunit-version>
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
- <!-- The following properties are used for configuring the web service
+ <!-- The following properties are used for configuring the web service
and can be overridden in profiles -->
<aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
<aggregator.textgridrep.default>https://textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
@@ -237,7 +241,7 @@
<wtpversion>2.0</wtpversion>
</configuration>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings
+ <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
diff --git a/src/main/webapp/tei-stylesheets b/src/main/webapp/tei-stylesheets
index c1e6141..3a2ee78 160000
--- a/src/main/webapp/tei-stylesheets
+++ b/src/main/webapp/tei-stylesheets
@@ -1 +1 @@
-Subproject commit c1e614184e313aad200cfbdb6af27320d5009e38
+Subproject commit 3a2ee78c0b8f26c20012c02c300dd8ea262e810f
--
GitLab