Author: pskopek(a)redhat.com Date: 2012-02-15 07:39:15 -0500 (Wed, 15 Feb 2012) New Revision: 1392 Modified: product/branches/Branch_6_plus/parent/pom.xml product/branches/Branch_6_plus/picketlink-core/pom.xml Log: JBPAPP-7553: PickeLink Core deps. aligned with EAP6 Modified: product/branches/Branch_6_plus/parent/pom.xml =================================================================== --- product/branches/Branch_6_plus/parent/pom.xml 2012-02-14 21:51:15 UTC (rev 1391) +++ product/branches/Branch_6_plus/parent/pom.xml 2012-02-15 12:39:15 UTC (rev 1392) @@ -102,7 +102,7 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.2</version> </dependency> <dependency> <groupId>junit</groupId> @@ -117,7 +117,7 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.apache</groupId> + <groupId>org.apache.santuario</groupId> <artifactId>xmlsec</artifactId> <version>1.4.3</version> <optional>true</optional> @@ -128,16 +128,22 @@ <version>1.0.3</version> <optional>true</optional> </dependency> - <dependency> + <!-- dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> - <version>1.0</version> + <version>2.0</version> <optional>true</optional> + </dependency --> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.0.0.Final</version> + <optional>true</optional> </dependency> <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbossxacml</artifactId> - <version>2.0.4</version> + <version>2.0.6.Final</version> </dependency> </dependencies> </dependencyManagement> Modified: product/branches/Branch_6_plus/picketlink-core/pom.xml =================================================================== --- product/branches/Branch_6_plus/picketlink-core/pom.xml 2012-02-14 21:51:15 UTC (rev 1391) +++ product/branches/Branch_6_plus/picketlink-core/pom.xml 2012-02-15 12:39:15 UTC (rev 1392) @@ -57,8 +57,14 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.apache</groupId> + <groupId>org.apache.santuario</groupId> <artifactId>xmlsec</artifactId> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -87,8 +93,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> </dependency> <dependency> <groupId>org.jboss.spec.javax.security.jacc</groupId> @@ -107,21 +113,21 @@ <scope>test</scope> </dependency> <dependency> - <groupId>apache-xalan</groupId> + <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <version>2.7.1.patch01-brew</version> + <version>2.7.1</version> <scope>test</scope> </dependency> <dependency> - <groupId>apache-xalan</groupId> + <groupId>xalan</groupId> <artifactId>serializer</artifactId> - <version>2.7.1.patch01-brew</version> + <version>2.7.1</version> <scope>test</scope> </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.1.3</version> <scope>test</scope> </dependency> <dependency> @@ -165,6 +171,14 @@ <encoding>UTF-8</encoding> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> </plugins> </reporting> </project>