Merge branch 'feature/gitlabci' into 'nightlyBuild'

Feature/gitlabci

See merge request egiz/eaaf_components!5

1 files changed, 42 insertions, 35 deletions

diff --git a/pom.xml b/pom.xml
index 309dab97..c9f7309a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,38 +43,39 @@
     <iaik.prod.iaik_xades.version>2.13_moa</iaik.prod.iaik_xades.version>
     <iaik.prod.iaik_xsect.version>2.14_moa</iaik.prod.iaik_xsect.version>
 
-    <hsm-facade-provider.version>0.5.1</hsm-facade-provider.version>
-    <io.grpc-core.version>1.30.2</io.grpc-core.version>
+    <hsm-facade-provider.version>0.5.3-SNAPSHOT</hsm-facade-provider.version>
+    <io.grpc-core.version>1.34.0</io.grpc-core.version>
 
     <!-- Other third-party libs -->
     <org.springframework.version>5.2.8.RELEASE</org.springframework.version>
     <org.opensaml.version>3.4.5</org.opensaml.version>
     <org.apache.santuario.xmlsec.version>2.2.0</org.apache.santuario.xmlsec.version>
-    <org.bouncycastle.bcprov-jdk15to18.version>1.66</org.bouncycastle.bcprov-jdk15to18.version>
-    <org.bouncycastle.bctls-jdk15to18.version>1.66</org.bouncycastle.bctls-jdk15to18.version>
+    <org.bouncycastle.bcprov-jdk15to18.version>1.67</org.bouncycastle.bcprov-jdk15to18.version>
+    <org.bouncycastle.bctls-jdk15to18.version>1.67</org.bouncycastle.bctls-jdk15to18.version>
 
     <org.slf4j.version>1.7.30</org.slf4j.version>
-    <commons-codec.version>1.14</commons-codec.version>
+    <commons-codec.version>1.15</commons-codec.version>
     <org.apache.commons-lang3.version>3.11</org.apache.commons-lang3.version>
     <org.apache.commons-text.version>1.9</org.apache.commons-text.version>
+    <org.apache.commons-collections>3.2.2</org.apache.commons-collections>
     <org.apache.commons-collections4>4.4</org.apache.commons-collections4>
-    <commons-io.version>2.7</commons-io.version>
+    <commons-io.version>2.8.0</commons-io.version>
     <commons-fileupload.version>1.4</commons-fileupload.version>
     <javax.servlet-api>3.0.1</javax.servlet-api>
     <org.apache.velocity.version>1.7</org.apache.velocity.version>
     <javax.annotation-api>1.3.2</javax.annotation-api>
-    <joda-time.version>2.10.6</joda-time.version>
+    <joda-time.version>2.10.8</joda-time.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <com.google.guava.version>29.0-jre</com.google.guava.version>
+    <com.google.guava.version>30.0-jre</com.google.guava.version>
 
-    <httpclient.version>4.5.12</httpclient.version>
-    <httpcore.version>4.4.13</httpcore.version>
+    <httpclient.version>4.5.13</httpclient.version>
+    <httpcore.version>4.4.14</httpcore.version>
 
-    <com.fasterxml.jackson.core.version>2.11.1</com.fasterxml.jackson.core.version>
+    <com.fasterxml.jackson.core.version>2.12.0</com.fasterxml.jackson.core.version>
     <org.bitbucket.b_c.jose4j.version>0.7.2</org.bitbucket.b_c.jose4j.version>
 
     <jaxen.jaxen.version>1.1.6</jaxen.jaxen.version>
-    <xerces.version>2.11.0</xerces.version>
+    <xerces.version>2.12.0</xerces.version>
     <xalan.version>2.7.1</xalan.version>
 
     <!-- jUnit testing -->
@@ -86,11 +87,11 @@
     <org.projectlombok.lombok.version>1.18.12</org.projectlombok.lombok.version>
 
     <!-- Code quality checks -->
-    <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
-    <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
-    <maven-pmd-plugin.version>3.12.0</maven-pmd-plugin.version>
-    <spotbugs-maven-plugin.version>3.1.12.2</spotbugs-maven-plugin.version>
-    <dependency-check-maven.version>5.3.2</dependency-check-maven.version>
+    <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
+    <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+    <maven-pmd-plugin.version>3.14.0</maven-pmd-plugin.version>
+    <spotbugs-maven-plugin.version>4.1.4</spotbugs-maven-plugin.version>
+    <dependency-check-maven.version>6.0.3</dependency-check-maven.version>
 
     <license.outputDirectory>${project.build.directory}/thirdparty_licenses</license.outputDirectory>
     <pmw_rules_location>https://apps.egiz.gv.at/checkstyle/egiz_pmd_checks.xml</pmw_rules_location>
@@ -99,25 +100,13 @@
 
   <repositories>
     <repository>
-      <id>asit-snapshot</id>
-      <url>https://dev.a-sit.at/repositories/snapshot</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
+      <id>gitlab</id>
+      <url>https://gitlab.iaik.tugraz.at/api/v4/groups/119/-/packages/maven</url>
     </repository>
     <repository>
-      <id>asit-release</id>
-      <url>https://dev.a-sit.at/repositories/release</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
+      <id>gitlab-localbuild</id>
+      <url>https://gitlab.iaik.tugraz.at/api/v4/groups/119/-/packages/maven</url>
+    </repository>    
     <repository>
       <id>egiz-commons</id>
       <url>https://apps.egiz.gv.at/maven/</url>
@@ -143,6 +132,19 @@
       </activation>
     </profile>
     <profile>
+      <id>gitlabDeploy</id>
+      <distributionManagement>
+        <repository>
+          <id>gitlab</id>
+          <url>https://gitlab.iaik.tugraz.at/api/v4/projects/507/packages/maven</url>
+        </repository>
+        <snapshotRepository>
+          <id>gitlab</id>
+          <url>https://gitlab.iaik.tugraz.at/api/v4/projects/507/packages/maven</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
+    <profile>
       <id>jenkinsDeploy</id>
       <distributionManagement>
         <repository>
@@ -353,6 +355,11 @@
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
         <version>${javax.annotation-api}</version>
+      </dependency>      
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${org.apache.commons-collections}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -737,4 +744,4 @@
     </plugins>
   </reporting>
 
-</project>
\ No newline at end of file
+</project>