diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 362 |
1 files changed, 254 insertions, 108 deletions
@@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?><!-- ass<?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"> @@ -6,7 +6,7 @@ <groupId>MOA</groupId> <artifactId>MOA</artifactId> <packaging>pom</packaging> - <version>4.1.5</version> + <version>4.2.0</version> <name>MOA</name> <properties> @@ -14,68 +14,92 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- Project Version --> - <moa-id-version>4.1.5</moa-id-version> + <moa-id-version>4.2.0</moa-id-version> - <moa-id-version-final>4.1.5</moa-id-version-final> - <moa-id-version-edu>4.1.5</moa-id-version-edu> + + + <moa-id-version-final>4.2.0</moa-id-version-final> + <moa-id-version-edu>4.2.0</moa-id-version-edu> <moa-id-proxy-version>2.0.1</moa-id-proxy-version> - <configtool-version>3.0.6</configtool-version> - <demo-oa-version>2.0.8</demo-oa-version> + <configtool-version>3.1.0</configtool-version> + <demo-oa-version>2.1.0</demo-oa-version> <moa-id-module-elga_mandate_client>1.3.2</moa-id-module-elga_mandate_client> - + + <moa-id-dummy-auth.version>4.1.5.2</moa-id-dummy-auth.version> + <moa-id-ehvd_integration.version>4.1.5.3</moa-id-ehvd_integration.version> + <!-- =================================================================================== --> <egiz-spring-api.version>0.3</egiz-spring-api.version> <egiz.eaaf.version>1.0.15</egiz.eaaf.version> - <org.springframework.version>5.2.11.RELEASE</org.springframework.version> - <org.springframework.data.spring-data-jpa>2.3.5.RELEASE</org.springframework.data.spring-data-jpa> - <org.springframework.data.spring-data-redis>2.3.5.RELEASE</org.springframework.data.spring-data-redis> + <org.springframework.version>5.3.13</org.springframework.version> + <org.springframework.data.spring-data-jpa>2.6.0</org.springframework.data.spring-data-jpa> + <org.springframework.data.spring-data-redis>2.6.0</org.springframework.data.spring-data-redis> <surefire.version>2.22.0</surefire.version> <jaxb.version>2.3.1</jaxb.version> <jaxb-core.version>2.3.0.1</jaxb-core.version> - <guava.version>30.0-jre</guava.version> + <guava.version>31.0.1-jre</guava.version> <opensaml.version>2.6.6</opensaml.version> <!-- update to v3 (v2 is end-of-life in june 2016) --> <org.opensaml.openws.version>1.5.6</org.opensaml.openws.version> <xmltooling.version>1.4.6</xmltooling.version> - <xmlsec.version>2.1.5</xmlsec.version> + <xmlsec.version>2.3.0</xmlsec.version> <jaxws-api.version>2.3.1</jaxws-api.version> <jws-api.version>1.1</jws-api.version> - <hibernate.version>5.4.25.Final</hibernate.version> - <org.apache.commons.commons.dbcp2>2.8.0</org.apache.commons.commons.dbcp2> + <hibernate.version>5.6.2.Final</hibernate.version> + <org.apache.commons.commons.dbcp2>2.9.0</org.apache.commons.commons.dbcp2> - <cxf.version>3.3.8</cxf.version> - <struts.version>2.5.26</struts.version> <!-- 2.5.10.1 --> + <cxf.version>3.3.12</cxf.version> + <struts.version>2.5.28</struts.version> <!-- 2.5.10.1 --> <egovutils.version>2.0.0</egovutils.version> <slf4j.version>1.7.30</slf4j.version> + <log4j.version>2.17.0</log4j.version> + <logback.version>1.2.9</logback.version> <httpclient.version>4.5.13</httpclient.version> - <httpcore.version>4.4.14</httpcore.version> + <httpcore.version>4.4.15</httpcore.version> <!-- Maybe problems with Hibernate 5.0.10 --> - <mysql-connector.java>8.0.22</mysql-connector.java> + <mysql-connector.java>8.0.27</mysql-connector.java> <!-- <mysql-connector.java>5.1.40</mysql-connector.java> --> - <junit.version>4.12</junit.version> - <org.apache.commons.io.version>2.8.0</org.apache.commons.io.version> - <org.apache.commons.lang3.version>3.11</org.apache.commons.lang3.version> + <junit.version>4.13.2</junit.version> + <org.apache.commons.io.version>2.11.0</org.apache.commons.io.version> + <org.apache.commons.lang3.version>3.12.0</org.apache.commons.lang3.version> <org.apache.commons.collections4.version>4.4</org.apache.commons.collections4.version> <org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version> <org.apache.commons-text.version>1.9</org.apache.commons-text.version> - <jodatime.version>2.10.8</jodatime.version> + <commons-beanutils.version>1.9.4</commons-beanutils.version> + <joda-time.version>2.10.13</joda-time.version> - <jackson-version>2.12.0</jackson-version> + <jackson-version>2.13.0</jackson-version> <apache-cli-version>1.4</apache-cli-version> <spring-orm-version>${org.springframework.version}</spring-orm-version> + + <org.projectlombok.lombok.version>1.18.22</org.projectlombok.lombok.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> + <findsecbugs-plugin.version>1.11.0</findsecbugs-plugin.version> + + <pmw_rules_location>https://apps.egiz.gv.at/checkstyle/egiz_pmd_checks.xml</pmw_rules_location> + </properties> + <modules> + <module>id</module> + <module>assembly</module> + </modules> + <profiles> <profile> <id>default</id> @@ -85,58 +109,40 @@ <name>default</name> </property> </activation> - <modules> - <module>id</module> - </modules> - <repositories> - <repository> - <id>moaid_local</id> - <name>local</name> - <url>file:${basedir}/../../../repository</url> - </repository> - <repository> - <id>shibboleth.internet2.edu</id> - <name>Internet2</name> - <url>https://build.shibboleth.net/nexus/content/groups/public/</url> - </repository> - <repository> - <id>jboss</id> - <url>https://repository.jboss.org/nexus/content/repositories/central/</url> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>egiz-commons</id> - <url>https://apps.egiz.gv.at/maven/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>egiz-commons-snapshot</id> - <url>https://apps.egiz.gv.at/maven-snapshot/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> + </profile> + <profile> + <id>jenkinsDeploy</id> + <distributionManagement> <repository> - <id>MOA_web</id> - <name>MOA Dependencies weblocation</name> - <releases> - <enabled>true</enabled> - <checksumPolicy>ignore</checksumPolicy> - </releases> - <layout>default</layout> - <url>https://git.egiz.gv.at/EAAF-Components/plain/eaaf_modules/eaaf_module_moa-sig/repository</url> + <id>egizMaven</id> + <url>sftp://apps.egiz.gv.at/maven</url> </repository> - </repositories> + <snapshotRepository> + <id>egizMaven</id> + <url>sftp://apps.egiz.gv.at/maven-snapshot</url> + </snapshotRepository> + </distributionManagement> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> + <configuration> + <deployAtEnd>true</deployAtEnd> + </configuration> + <executions> + <execution> + <id>default-deploy</id> + <phase>deploy</phase> + <goals> + <goal>deploy</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </profile> </profiles> @@ -147,6 +153,14 @@ </resource> </resources> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh</artifactId> + <version>3.4.3</version> + </extension> + </extensions> + <pluginManagement> <plugins> <plugin> @@ -244,24 +258,57 @@ </configuration> </plugin> <plugin> - <inherited>false</inherited> - <artifactId>maven-assembly-plugin</artifactId> - <!-- <version>2.2-beta-1</version> --> - <version>2.2.2</version> - <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS --> - <configuration> - <finalName>moa</finalName> - <encoding>UTF-8</encoding> - <descriptors> - <descriptor>id/assembly-auth-final.xml</descriptor> - <descriptor>id/assembly-auth-edu.xml</descriptor> - <descriptor>id/assembly-proxy.xml</descriptor> - - <!-- <descriptor>spss/assembly.xml</descriptor> <descriptor>spss/assembly-lib.xml</descriptor> --> - </descriptors> - </configuration> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>${jacoco-maven-plugin.version}</version> + <executions> + <execution> + <id>pre-unit-test</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>post-unit-report</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <outputDirectory>target/jacoco-report</outputDirectory> + </configuration> + </execution> + <execution> + <id>post-unit-check</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <haltOnFailure>false</haltOnFailure> + <rules> + <rule> + <element>BUNDLE</element> + <limits> + <limit> + <counter>INSTRUCTION</counter> + <value>COVEREDRATIO</value> + <minimum>0.70</minimum> + </limit> + <limit> + <counter>BRANCH</counter> + <value>COVEREDRATIO</value> + <minimum>0.70</minimum> + </limit> + </limits> + </rule> + </rules> + </configuration> + </execution> + </executions> </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> @@ -294,6 +341,12 @@ <dependencies> <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>${joda-time.version}</version> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-dbcp2</artifactId> <version>${org.apache.commons.commons.dbcp2}</version> @@ -347,6 +400,16 @@ <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + <version>${cxf.version}</version> + </dependency> <dependency> <groupId>commons-collections</groupId> @@ -355,12 +418,24 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>${org.apache.commons.collections4.version}</version> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> <version>${org.apache.commons-text.version}</version> </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons-beanutils.version}</version> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts.version}</version> @@ -399,9 +474,19 @@ <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${log4j.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-classic</artifactId> + <version>${logback.version}</version> </dependency> <dependency> @@ -417,12 +502,6 @@ </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.13.3</version> - </dependency> - - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>${httpclient.version}</version> @@ -467,12 +546,6 @@ <version>JSSE-1.0</version> <scope>compile</scope> </dependency> - <!-- <dependency> <groupId>regexp</groupId> <artifactId>regexp</artifactId> - <version>1.3</version> </dependency> --> - - - <!-- <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk16</artifactId> - <version>1.46</version> </dependency> --> <dependency> <groupId>at.gv.egiz.eaaf</groupId> @@ -626,6 +699,19 @@ <version>${moa-id-version}</version> </dependency> + <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-dummy-authenticatiuon</artifactId> + <version>${moa-id-dummy-auth.version}</version> + </dependency> + + <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-ehvd_integration</artifactId> + <version>${moa-id-ehvd_integration.version}</version> + </dependency> + + <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-module-sl20_authentication</artifactId> @@ -688,7 +774,7 @@ <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_jce_full</artifactId> - <version>5.61_moa</version> + <version>5.62_moa</version> </dependency> <dependency> @@ -767,7 +853,7 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.11.0</version> + <version>2.12.1</version> <scope>compile</scope> </dependency> <!-- The xmlParserAPIs.jar of the official xalan distribution and the @@ -804,6 +890,12 @@ </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${org.springframework.version}</version> + </dependency> + + <dependency> <groupId>org.springframework.data</groupId> <artifactId>spring-data-redis</artifactId> <version>${org.springframework.data.spring-data-redis}</version> @@ -909,15 +1001,69 @@ <version>${org.apache.commons.io.version}</version> </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${org.projectlombok.lombok.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> <repositories> <repository> + <id>shibboleth.internet2.edu</id> + <name>Internet2</name> + <url>https://build.shibboleth.net/nexus/content/groups/public/</url> + </repository> + <repository> + <id>jboss</id> + <url>https://repository.jboss.org/nexus/content/repositories/central/</url> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>egiz-commons</id> + <url>https://apps.egiz.gv.at/maven/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>egiz-commons-snapshot</id> + <url>https://apps.egiz.gv.at/maven-snapshot/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>MOA_web</id> + <name>MOA Dependencies weblocation</name> + <releases> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </releases> + <layout>default</layout> + <url>https://git.egiz.gv.at/EAAF-Components/plain/eaaf_modules/eaaf_module_moa-sig/repository</url> + </repository> + + <repository> <id>MOA</id> <name>MOA Dependencies</name> - <!--releases> <enabled>false</enabled> </releases --> <layout>default</layout> <url>file://${repositoryPath}</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>ignore</checksumPolicy> + </releases> </repository> + </repositories> </project> |