Skip to content
Snippets Groups Projects
Commit 819d9841 authored by Stefan E. Funk's avatar Stefan E. Funk
Browse files

Add specific TEI Stylesheets version to POM file 

Take version in gitlab-ci from POM
parent 8e9a1e66
No related branches found
No related tags found
No related merge requests found
Pipeline #284860 canceled
Stage: build_version
Stage: deploy_java
Stage: deploy_deb
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 5
− 0
View file @ 819d9841
...@@ -54,6 +54,9 @@ get_version: ...@@ -54,6 +54,9 @@ get_version:
- 'PVERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.1:evaluate -Dexpression=project.version -q -DforceStdout)' - '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 "export PVERSION=$PVERSION" > $VARIABLES_FILE
- echo "Project version from main pom file is $PVERSION" - 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: artifacts:
name: POM_VERSION name: POM_VERSION
paths: paths:
...@@ -67,7 +70,9 @@ build_and_deploy: ...@@ -67,7 +70,9 @@ build_and_deploy:
# - main # - main
stage: deploy_java stage: deploy_java
script: script:
- source $VARIABLES_FILE
- git submodule update --recursive --init - git submodule update --recursive --init
- git -C src/main/webapp/tei-stylesheets/ checkout $TEI_STYLESHEETS_VERSION
# REMOVE SKIPTESTS AS SOON AS TESTS ARE WORKING...!! # REMOVE SKIPTESTS AS SOON AS TESTS ARE WORKING...!!
- mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -DskipTests=true - mvn $MAVEN_OPTS $MAVEN_CLI_OPTS $MAVEN_DEPLOY_OPTS -U clean verify -Ptextgrid.deb -DskipTests=true
artifacts: artifacts:
......
pom.xml
+ 8
− 4
View file @ 819d9841
...@@ -23,7 +23,11 @@ ...@@ -23,7 +23,11 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-source-version>1.7</java-source-version> <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> <commons-io-version>2.4</commons-io-version>
<link-rewriter-version>0.4.1-RELEASE</link-rewriter-version> <link-rewriter-version>0.4.1-RELEASE</link-rewriter-version>
<saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck --> <saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck -->
...@@ -31,7 +35,7 @@ ...@@ -31,7 +35,7 @@
<confclient-version>4.1.0</confclient-version> <confclient-version>4.1.0</confclient-version>
<tgsearch-version>4.0.1</tgsearch-version> <tgsearch-version>4.0.1</tgsearch-version>
<tgcrud-version>2.6.0</tgcrud-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! --> just fix it tomorrow! -->
<!--tgcrud-version>11.3.0-TG-RELEASE</tgcrud-version --> <!--tgcrud-version>11.3.0-TG-RELEASE</tgcrud-version -->
<guava-version>15.0</guava-version> <guava-version>15.0</guava-version>
...@@ -54,7 +58,7 @@ ...@@ -54,7 +58,7 @@
<epubcheck-version>4.0.0-alpha11</epubcheck-version> <epubcheck-version>4.0.0-alpha11</epubcheck-version>
<xmlunit-version>1.5</xmlunit-version> <xmlunit-version>1.5</xmlunit-version>
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-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 --> and can be overridden in profiles -->
<aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published> <aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
<aggregator.textgridrep.default>https://textgridlab.org/1.0/confserv</aggregator.textgridrep.default> <aggregator.textgridrep.default>https://textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
...@@ -237,7 +241,7 @@ ...@@ -237,7 +241,7 @@
<wtpversion>2.0</wtpversion> <wtpversion>2.0</wtpversion>
</configuration> </configuration>
</plugin> </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. --> only. It has no influence on the Maven build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
......
tei-stylesheets @ 3a2ee78c
Compare c1e61418...3a2ee78c
Subproject commit c1e614184e313aad200cfbdb6af27320d5009e38 Subproject commit 3a2ee78c0b8f26c20012c02c300dd8ea262e810f
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment