Skip to content
Snippets Groups Projects
Commit 4e60622c authored by lcottret's avatar lcottret
Browse files

Merge branch 'release/1.5.2'

parents bfe3567f 60985ab6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 30 deletions
.gitlab-ci.yml
+ 0
− 6
View file @ 4e60622c
......@@ -55,18 +55,12 @@ build:
script:
- mvn $MAVEN_OPTS compile
- TRUEVERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
- echo "TRUEVERSION:$TRUEVERSION"
- VERSION=$TRUEVERSION
- echo "VERSION:$VERSION"
- if [ "$CI_COMMIT_BRANCH" = "master" ]; then VERSION=${VERSION%"-SNAPSHOT"}; fi
- echo "VERSION:$VERSION"
- LOWER_CASE_VERSION=${VERSION,,}
- echo "LOWER_CASE_VERSION:$LOWER_CASE_VERSION"
# Replace / by _ in the name of the commit
- FORMATTED_COMMIT_BRANCH=${CI_COMMIT_BRANCH//\//_}
- echo "FORMATTED_COMMIT_BRANCH:$FORMATTED_COMMIT_BRANCH"
- LOWER_CASE_COMMIT_BRANCH=${FORMATTED_COMMIT_BRANCH,,}
- echo "LOWER_CASE_COMMIT_BRANCH:$LOWER_CASE_COMMIT_BRANCH"
- echo "VERSION=$VERSION" >> build.env
- echo "TRUEVERSION=$TRUEVERSION" >> build.env
- echo "FORMATTED_COMMIT_BRANCH=$FORMATTED_COMMIT_BRANCH" >> build.env
......
coverage/pom.xml
+ 1
− 1
View file @ 4e60622c
......@@ -44,7 +44,7 @@
<parent>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
met4j-chemUtils/pom.xml
+ 2
− 2
View file @ 4e60622c
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</parent>
<properties>
......@@ -29,7 +29,7 @@
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-core</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
<dependency>
......
met4j-core/pom.xml
+ 1
− 1
View file @ 4e60622c
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</parent>
<scm>
......
met4j-graph/pom.xml
+ 4
− 4
View file @ 4e60622c
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>met4j-graph</artifactId>
......@@ -35,7 +35,7 @@
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-core</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
......@@ -45,12 +45,12 @@
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-mathUtils</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-chemUtils</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
</dependencies>
......
met4j-io/pom.xml
+ 2
− 2
View file @ 4e60622c
......@@ -6,7 +6,7 @@
<parent>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>met4j-io</artifactId>
......@@ -25,7 +25,7 @@
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-core</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sbml.jsbml</groupId>
......
met4j-mapping/pom.xml
+ 2
− 2
View file @ 4e60622c
......@@ -4,7 +4,7 @@
<parent>
<artifactId>met4j</artifactId>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -19,7 +19,7 @@
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-core</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......
met4j-mathUtils/pom.xml
+ 1
− 1
View file @ 4e60622c
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</parent>
......
met4j-reconstruction/pom.xml
+ 2
− 2
View file @ 4e60622c
......@@ -41,7 +41,7 @@
<parent>
<artifactId>met4j</artifactId>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -61,7 +61,7 @@
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-io</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......
met4j-toolbox/pom.xml
+ 8
− 8
View file @ 4e60622c
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</parent>
<artifactId>met4j-toolbox</artifactId>
......@@ -27,37 +27,37 @@
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-chemUtils</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-io</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-core</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-mathUtils</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-graph</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-mapping</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j-reconstruction</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
<dependency>
......
pom.xml
+ 1
− 1
View file @ 4e60622c
......@@ -5,7 +5,7 @@
<groupId>fr.inrae.toulouse.metexplore</groupId>
<artifactId>met4j</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>met4j</name>
......
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