diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 390 |
1 files changed, 307 insertions, 83 deletions
@@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>at.gv.egiz</groupId> <artifactId>eaaf</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> <name>EGIZ EAAF components</name> @@ -23,71 +23,93 @@ <at.gv.egiz.components.eventlog-api.version>0.4</at.gv.egiz.components.eventlog-api.version> <at.gv.egiz.components.egiz-spring-api>0.3.1</at.gv.egiz.components.egiz-spring-api> - <MOA.spss.server.moa-sig-lib.version>3.1.2</MOA.spss.server.moa-sig-lib.version> - <MOA.spss.tsl_lib.version>2.0.2</MOA.spss.tsl_lib.version> + <MOA.spss.server.moa-sig-lib.version>3.1.5-SNAPSHOT</MOA.spss.server.moa-sig-lib.version> + <MOA.spss.tsl_lib.version>2.0.4.1</MOA.spss.tsl_lib.version> <!-- IAIK libs --> - <iaik.prod.iaik_cms.version>5.1</iaik.prod.iaik_cms.version> - <iaik.prod.iaik_cpades.version>2.5.1_moa</iaik.prod.iaik_cpades.version> + <iaik.prod.iaik_cms.version>5.1.1</iaik.prod.iaik_cms.version> + <iaik.prod.iaik_cpades.version>2.4_moa</iaik.prod.iaik_cpades.version> <iaik.prod.iaik_cpxlevel.version>0.9_moa</iaik.prod.iaik_cpxlevel.version> - <iaik.prod.iaik_eccelerate.version>5.01</iaik.prod.iaik_eccelerate.version> - <iaik.prod.iaik_eccelerate_addon.version>5.01</iaik.prod.iaik_eccelerate_addon.version> - <iaik.prod.iaik_eccelerate_cms.version>5.01</iaik.prod.iaik_eccelerate_cms.version> - <iaik.prod.iaik_jce_full.version>5.52_moa</iaik.prod.iaik_jce_full.version> + <iaik.prod.iaik_eccelerate.version>6.02</iaik.prod.iaik_eccelerate.version> + <iaik.prod.iaik_eccelerate_addon.version>6.02</iaik.prod.iaik_eccelerate_addon.version> + <iaik.prod.iaik_eccelerate_cms.version>6.02</iaik.prod.iaik_eccelerate_cms.version> + <iaik.prod.iaik_jce_full.version>5.62_moa</iaik.prod.iaik_jce_full.version> <iaik.prod.iaik_jsse.version>4.4</iaik.prod.iaik_jsse.version> - <iaik.prod.iaik_moa.version>2.06</iaik.prod.iaik_moa.version> - <iaik.prod.iaik_pki_module.version>2.01_moa</iaik.prod.iaik_pki_module.version> + <iaik.prod.iaik_moa.version>2.07</iaik.prod.iaik_moa.version> + <iaik.prod.iaik_pki_module.version>2.02_moa</iaik.prod.iaik_pki_module.version> <iaik.prod.iaik_sva.version>1.0.3_moa</iaik.prod.iaik_sva.version> <iaik.prod.iaik_tsp.version>2.32_eval</iaik.prod.iaik_tsp.version> <iaik.prod.iaik_util.version>0.23</iaik.prod.iaik_util.version> <iaik.prod.iaik_xades.version>2.13_moa</iaik.prod.iaik_xades.version> - <iaik.prod.iaik_xsect.version>2.13_moa</iaik.prod.iaik_xsect.version> + <iaik.prod.iaik_xsect.version>2.14_moa</iaik.prod.iaik_xsect.version> - <hsm-facade-provider.version>0.4.0-SNAPSHOT</hsm-facade-provider.version> - <io.grpc-core.version>1.25.0</io.grpc-core.version> + <hsm-facade-provider.version>0.8.0</hsm-facade-provider.version> + <io.grpc-core.version>1.41.0</io.grpc-core.version> <!-- Other third-party libs --> - <org.springframework.version>5.1.5.RELEASE</org.springframework.version> - <org.opensaml.version>4.0.0</org.opensaml.version> - <org.apache.santuario.xmlsec.version>2.1.4</org.apache.santuario.xmlsec.version> - <org.bouncycastle.bcprov-jdk15on.version>1.64</org.bouncycastle.bcprov-jdk15on.version> - - <org.slf4j.version>1.7.25</org.slf4j.version> - <commons-codec.version>1.11</commons-codec.version> - <org.apache.commons-lang3.version>3.8.1</org.apache.commons-lang3.version> - <org.apache.commons-text.version>1.6</org.apache.commons-text.version> - <org.apache.commons-collections4>4.2</org.apache.commons-collections4> - <commons-fileupload.version>1.3.3</commons-fileupload.version> + <spring-boot-starter-web.version>2.6.2</spring-boot-starter-web.version> + <org.springframework.version>5.3.14</org.springframework.version> + <org.opensaml.version>4.0.1</org.opensaml.version> + <org.apache.santuario.xmlsec.version>2.3.0</org.apache.santuario.xmlsec.version> + <org.cryptacular.version>1.2.4</org.cryptacular.version> + <org.bouncycastle.bcprov-jdk15to18.version>1.70</org.bouncycastle.bcprov-jdk15to18.version> + <org.bouncycastle.bctls-jdk15to18.version>1.70</org.bouncycastle.bctls-jdk15to18.version> + + <org.slf4j.version>1.7.32</org.slf4j.version> + <log4j.version>2.17.1</log4j.version> + <ch.qos.logback-access.version>1.2.10</ch.qos.logback-access.version> + + <commons-codec.version>1.15</commons-codec.version> + <org.apache.commons-lang3.version>3.12.0</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.11.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.1</joda-time.version> + <joda-time.version>2.10.13</joda-time.version> <jsr305.version>3.0.2</jsr305.version> - <com.google.guava.version>28.1-jre</com.google.guava.version> + <com.google.guava.version>31.0.1-jre</com.google.guava.version> + <org.owasp.encoder.version>1.2.3</org.owasp.encoder.version> - <httpclient.version>4.5.7</httpclient.version> - <httpcore.version>4.4.11</httpcore.version> + <httpclient.version>4.5.13</httpclient.version> + <httpcore.version>4.4.15</httpcore.version> - <com.fasterxml.jackson.core.version>2.9.8</com.fasterxml.jackson.core.version> - <org.bitbucket.b_c.jose4j.version>0.6.5</org.bitbucket.b_c.jose4j.version> + <com.fasterxml.jackson.core.version>2.13.1</com.fasterxml.jackson.core.version> + <org.bitbucket.b_c.jose4j.version>0.7.9</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.1</xerces.version> <xalan.version>2.7.1</xalan.version> <!-- jUnit testing --> - <surefire.version>2.22.1</surefire.version> - <junit.version>4.12</junit.version> - <com.squareup.okhttp3.version>4.4.1</com.squareup.okhttp3.version> + <surefire.version>2.22.2</surefire.version> + <junit-jupiter-api.version>5.8.2</junit-jupiter-api.version> + <com.squareup.okhttp3.version>4.9.3</com.squareup.okhttp3.version> + <org.powermock.version>2.0.9</org.powermock.version> <!-- Code helper plug-ins --> - <org.projectlombok.lombok.version>1.18.10</org.projectlombok.lombok.version> + <org.projectlombok.lombok.version>1.18.16</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> + <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version> + <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version> + <maven-pmd-plugin.version>3.14.0</maven-pmd-plugin.version> + <spotbugs-maven-plugin.version>4.2.0</spotbugs-maven-plugin.version> + <findsecbugs-plugin.version>1.11.0</findsecbugs-plugin.version> + <dependency-check-maven.version>6.0.3</dependency-check-maven.version> + + <!-- Compile and deploy plugins --> + <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version> + <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> + <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> + <maven-source-plugin.version>3.2.1</maven-source-plugin.version> + <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> + <wagon-ssh.version>3.4.3</wagon-ssh.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> @@ -96,18 +118,16 @@ <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>gitlab-localbuild</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> + <id>egiz-commons</id> + <url>https://apps.egiz.gv.at/maven/</url> <releases> <enabled>true</enabled> </releases> @@ -116,16 +136,20 @@ </snapshots> </repository> <repository> - <id>egiz-commons</id> - <url>https://apps.egiz.gv.at/maven/</url> + <id>egiz-commons-snapshot</id> + <url>https://apps.egiz.gv.at/maven-snapshot/</url> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> </repository> + <repository> <id>shibboleth.internet2.edu</id> <name>Internet2</name> - <url>https://apps.egiz.gv.at/shibboleth_nexus/</url> + <url>https://build.shibboleth.net/nexus/content/groups/public/</url> </repository> </repositories> @@ -140,6 +164,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> @@ -156,7 +193,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> + <version>${maven-deploy-plugin.version}</version> <configuration> <deployAtEnd>true</deployAtEnd> </configuration> @@ -173,6 +210,25 @@ </plugins> </build> </profile> + <profile> + <id>owasp-dependency-check</id> + <build> + <plugins> + <plugin> + <groupId>org.owasp</groupId> + <artifactId>dependency-check-maven</artifactId> + <version>${dependency-check-maven.version}</version> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <modules> @@ -180,6 +236,8 @@ <module>eaaf_core_utils</module> <module>eaaf_core</module> <module>eaaf_modules</module> + <module>build_reporting</module> + <module>eaaf-springboot-utils</module> </modules> <dependencyManagement> @@ -193,8 +251,45 @@ <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_core_utils</artifactId> <version>${egiz.eaaf.version}</version> + </dependency> + <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf-core</artifactId> + <version>${egiz.eaaf.version}</version> + </dependency> + <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_auth_sl20</artifactId> + <version>${egiz.eaaf.version}</version> + </dependency> + <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_moa-sig</artifactId> + <version>${egiz.eaaf.version}</version> </dependency> <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_pvp2_core</artifactId> + <version>${egiz.eaaf.version}</version> + </dependency> + <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_pvp2_idp</artifactId> + <version>${egiz.eaaf.version}</version> + </dependency> + <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_pvp2_sp</artifactId> + <version>${egiz.eaaf.version}</version> + </dependency> + <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf-springboot-utils</artifactId> + <version>${egiz.eaaf.version}</version> + </dependency> + + + <dependency> <groupId>at.gv.egiz.components</groupId> <artifactId>eventlog-api</artifactId> <version>${at.gv.egiz.components.eventlog-api.version}</version> @@ -207,7 +302,7 @@ <dependency> - <groupId>MOA.spss.server</groupId> + <groupId>moaSig</groupId> <artifactId>moa-sig-lib</artifactId> <version>${MOA.spss.server.moa-sig-lib.version}</version> <exclusions> @@ -222,13 +317,13 @@ </exclusions> </dependency> <dependency> - <groupId>MOA.spss</groupId> + <groupId>moaSig</groupId> <artifactId>common</artifactId> <version>${MOA.spss.server.moa-sig-lib.version}</version> </dependency> <dependency> - <groupId>MOA.spss</groupId> - <artifactId>tsl_lib</artifactId> + <groupId>at.gv.egovernment.moa.sig</groupId> + <artifactId>tsl-lib</artifactId> <version>${MOA.spss.tsl_lib.version}</version> </dependency> @@ -333,11 +428,36 @@ <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> <artifactId>commons-collections4</artifactId> <version>${org.apache.commons-collections4}</version> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <version>${spring-boot-starter-web.version}</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-configuration-processor</artifactId> + <version>${spring-boot-starter-web.version}</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + <version>${spring-boot-starter-web.version}</version> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> <version>${org.springframework.version}</version> @@ -353,6 +473,16 @@ <version>${org.slf4j.version}</version> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-access</artifactId> + <version>${ch.qos.logback-access.version}</version> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>${commons-codec.version}</version> @@ -398,9 +528,21 @@ <version>${org.apache.santuario.xmlsec.version}</version> </dependency> <dependency> + <!-- Set newer version, because 1.1.3 from openSAML dependency has + an CVE-2020-7226 --> + <groupId>org.cryptacular</groupId> + <artifactId>cryptacular</artifactId> + <version>${org.cryptacular.version}</version> + </dependency> + <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>${org.bouncycastle.bcprov-jdk15on.version}</version> + <artifactId>bcprov-jdk15to18</artifactId> + <version>${org.bouncycastle.bcprov-jdk15to18.version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bctls-jdk15to18</artifactId> + <version>${org.bouncycastle.bctls-jdk15to18.version}</version> </dependency> <dependency> @@ -442,6 +584,12 @@ </dependency> <dependency> + <groupId>org.owasp.encoder</groupId> + <artifactId>encoder</artifactId> + <version>${org.owasp.encoder.version}</version> + </dependency> + + <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>${joda-time.version}</version> @@ -466,12 +614,6 @@ <!-- Testing --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <version>${org.springframework.version}</version> @@ -488,7 +630,7 @@ <artifactId>okhttp-tls</artifactId> <version>${com.squareup.okhttp3.version}</version> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_core_utils</artifactId> @@ -510,10 +652,34 @@ <scope>test</scope> <type>test-jar</type> </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>${org.powermock.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito2</artifactId> + <version>${org.powermock.version}</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> <dependencies> <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit-jupiter-api.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-migrationsupport</artifactId> + <version>${junit-jupiter-api.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <version>${org.projectlombok.lombok.version}</version> @@ -526,15 +692,59 @@ <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh</artifactId> - <version>3.3.3</version> + <version>${wagon-ssh.version}</version> </extension> </extensions> - + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> - <version>2.7</version> + <version>${versions-maven-plugin.version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin.version}</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin.version}</version> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${maven-source-plugin.version}</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> </plugin> <plugin> @@ -542,6 +752,8 @@ <version>${surefire.version}</version> <configuration> <threadCount>1</threadCount> + <!-- Sets the VM argument line used when unit tests are run. --> + <argLine>${surefireArgLine}</argLine> </configuration> <dependencies> <dependency> @@ -594,6 +806,9 @@ <goals> <goal>prepare-agent</goal> </goals> + <configuration> + <propertyName>surefireArgLine</propertyName> + </configuration> </execution> <execution> <id>post-unit-report</id> @@ -604,7 +819,7 @@ <configuration> <outputDirectory>target/jacoco-report</outputDirectory> </configuration> - </execution> + </execution> <execution> <id>post-unit-check</id> <phase>test</phase> @@ -631,7 +846,7 @@ </rule> </rules> </configuration> - </execution> + </execution> </executions> </plugin> @@ -677,6 +892,13 @@ </executions> <configuration> <failOnError>true</failOnError> + <plugins> + <plugin> + <groupId>com.h3xstream.findsecbugs</groupId> + <artifactId>findsecbugs-plugin</artifactId> + <version>${findsecbugs-plugin.version}</version> + </plugin> + </plugins> </configuration> </plugin> @@ -685,18 +907,20 @@ </build> <reporting> - <plugins> + <plugins> <plugin> <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - <report>report</report> - </reports> - </reportSet> - </reportSets> + <artifactId>jacoco-maven-plugin</artifactId> + <configuration> + <title>Maven Multimodule Coverage Demo: Coverage of Unit Tests</title> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-aggregate-ut</outputDirectory> + <dataFileExcludes> + <!-- exclude coverage data of integration tests --> + <dataFileExclude>**/target/jacoco-it.exec</dataFileExclude> + </dataFileExcludes> + </configuration> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> @@ -705,4 +929,4 @@ </plugins> </reporting> -</project>
\ No newline at end of file +</project> |