Mentions légales du service

Skip to content
Snippets Groups Projects
Commit defd74b2 authored by Cédric Eoche-Duval's avatar Cédric Eoche-Duval
Browse files

Merge branch 'develop' into 'master'

Merge bug fix GZL-5068 into master - release 4.1.5

See merge request gazelle/library/gazelle-tm-tools!12
parents 63208f62 7989c603
No related branches found
No related tags found
1 merge request!12Merge bug fix GZL-5068 into master - release 4.1.5
<?xml version='1.0' encoding='UTF-8'?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.ihe.gazelle.model</groupId>
<artifactId>gazelle-model</artifactId>
<version>4.4.0</version>
<version>4.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle.tm</groupId>
......@@ -17,7 +18,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<git.user.name>gitlab-ci</git.user.name>
<git.user.token>changeit</git.user.token>
<git.project.url>https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/library/gazelle-tm-tools.git</git.project.url>
<git.project.url>
https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/library/gazelle-tm-tools.git
</git.project.url>
<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
<nexus.staging.maven.plugin.version>1.6.8</nexus.staging.maven.plugin.version>
<sonar.maven.plugin>3.5.0.1254</sonar.maven.plugin>
......@@ -137,11 +140,6 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-functions</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle.hql</groupId>
<artifactId>gazelle-hql</artifactId>
......@@ -257,11 +255,25 @@
<artifactId>UserAgentUtils</artifactId>
<version>1.8</version>
</dependency>
<!-- jasper dependencies -->
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports-functions</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.5</version>
</dependency>
<!-- end of jasper dependencies -->
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
......@@ -350,7 +362,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>5.4.4.Final</version>
<!-- <scope>provided</scope>-->
<!-- <scope>provided</scope>-->
<exclusions>
<exclusion>
<artifactId>xml-apis</artifactId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment