aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas <>2021-06-15 12:30:30 +0200
committerThomas <>2021-06-15 12:30:30 +0200
commit1c6eba08f2a1c8008b85a71bc2c5d0a9d5e50361 (patch)
treeda2c4308368631081bc6b6880f6f5e0969ec7734
parent9f0fa316c8f7adeb3529cb4c3b2c553f085f7d95 (diff)
downloadNational_eIDAS_Gateway-1c6eba08f2a1c8008b85a71bc2c5d0a9d5e50361.tar.gz
National_eIDAS_Gateway-1c6eba08f2a1c8008b85a71bc2c5d0a9d5e50361.tar.bz2
National_eIDAS_Gateway-1c6eba08f2a1c8008b85a71bc2c5d0a9d5e50361.zip
fix some warning in maven build process and switch to another GitLab CI maven image
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--connector/pom.xml10
-rw-r--r--pom.xml13
3 files changed, 9 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 523230e3..9cecaf7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
-image: maven:latest
+#image: maven:latest
+image: maven:3.6.3-jdk-11
variables:
LC_ALL: "en_US.UTF-8"
diff --git a/connector/pom.xml b/connector/pom.xml
index 77651483..bbc54443 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -126,21 +126,11 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>at.gv.egiz.eaaf</groupId>
- <artifactId>eaaf_module_pvp2_sp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf-springboot-utils</artifactId>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 734ce689..fd8d816e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,12 +344,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <version>${spring-boot-starter-web.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.github.skjolber</groupId>
<artifactId>mockito-soap-cxf</artifactId>
<version>${mockito-soap-cxf.version}</version>
@@ -384,6 +378,13 @@
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>at.gv.egiz.eaaf</groupId>
+ <artifactId>eaaf_module_pvp2_sp</artifactId>
+ <version>${eaaf-core.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>at.asitplus.eidas.ms_specific</groupId>
<artifactId>connector_lib</artifactId>
<version>${egiz.eidas.version}</version>