diff options
| -rw-r--r-- | id/moa-id-webgui/pom.xml | 173 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 4 | ||||
| -rw-r--r-- | id/server/moa-id-commons/pom.xml | 5 | ||||
| -rw-r--r-- | id/server/modules/moa-id-module-E-ID_connector/pom.xml | 8 | ||||
| -rw-r--r-- | pom.xml | 20 |
5 files changed, 125 insertions, 85 deletions
diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml index 7bc933703..8791ba3bb 100644 --- a/id/moa-id-webgui/pom.xml +++ b/id/moa-id-webgui/pom.xml @@ -1,92 +1,99 @@ -<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/xsd/maven-4.0.0.xsd"> - - <parent> - <groupId>MOA</groupId> - <artifactId>id</artifactId> - <version>4.1.6-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>MOA.id</groupId> - <artifactId>moa-id-webgui</artifactId> - <version>1.0</version> - <name>MOA-ID WebGUI Module</name> - - <properties> - <repositoryPath>${basedir}/../../repository</repositoryPath> - </properties> - - <repositories> +<?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/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>MOA</groupId> + <artifactId>id</artifactId> + <version>4.1.6-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>MOA.id</groupId> + <artifactId>moa-id-webgui</artifactId> + <version>1.0</version> + <name>MOA-ID WebGUI Module</name> + + <properties> + <repositoryPath>${basedir}/../../repository</repositoryPath> + </properties> + + <repositories> <repository> <id>shibboleth.internet2.edu</id> <name>Internet2</name> <url>https://apps.egiz.gv.at/shibboleth_nexus/</url> </repository> </repositories> - - <build> - <sourceDirectory>src/main/java</sourceDirectory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>at.gv.egiz.components</groupId> - <artifactId>egiz-configuration-meta-api</artifactId> - <version>0.3</version> - </dependency> - <dependency> - <groupId>at.gv.egiz.components</groupId> - <artifactId>egiz-spring-api</artifactId> - <version>0.1</version> - </dependency> - - <dependency> - <groupId>MOA.id.server</groupId> - <artifactId>moa-id-commons</artifactId> - <exclusions> - <exclusion> - <artifactId>hyperjaxb3-ejb-runtime</artifactId> - <groupId>org.jvnet.hyperjaxb3</groupId> - </exclusion> - </exclusions> - </dependency> - + + <build> + <sourceDirectory>src/main/java</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> + <groupId>at.gv.egiz.components</groupId> + <artifactId>egiz-configuration-meta-api</artifactId> + <version>0.3</version> </dependency> - - <dependency> - <groupId>org.opensaml</groupId> - <artifactId>opensaml</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.opensaml</groupId> - <artifactId>xmltooling</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - - + <dependency> + <groupId>at.gv.egiz.components</groupId> + <artifactId>egiz-spring-api</artifactId> + </dependency> + + <dependency> + <groupId>MOA.id.server</groupId> + <artifactId>moa-id-commons</artifactId> + <exclusions> + <exclusion> + <artifactId>hyperjaxb3-ejb-runtime</artifactId> + <groupId>org.jvnet.hyperjaxb3</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.opensaml</groupId> + <artifactId>xmltooling</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + + </project>
\ No newline at end of file diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 4314bd3fd..ebdb70782 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -228,6 +228,10 @@ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
<!-- <dependency>
<groupId>MOA</groupId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 2ab3b4c86..3381ddfec 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -186,6 +186,11 @@ </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernate.version}</version> diff --git a/id/server/modules/moa-id-module-E-ID_connector/pom.xml b/id/server/modules/moa-id-module-E-ID_connector/pom.xml index 3b583d69e..3b7c2efcc 100644 --- a/id/server/modules/moa-id-module-E-ID_connector/pom.xml +++ b/id/server/modules/moa-id-module-E-ID_connector/pom.xml @@ -50,7 +50,13 @@ <dependency> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_module_pvp2_core</artifactId> - </dependency> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_module_pvp2_sp</artifactId> @@ -74,8 +74,9 @@ <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> + <commons-beanutils.version>1.9.4</commons-beanutils.version> <joda-time.version>2.10.13</joda-time.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> @@ -406,12 +407,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> @@ -454,6 +467,11 @@ <artifactId>log4j-slf4j-impl</artifactId> <version>${log4j.version}</version> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${log4j.version}</version> + </dependency> <dependency> <groupId>jaxen</groupId> |