2:40 p.m.
Author: pete.muir(a)jboss.org
Date: 2010-06-02 15:40:03 -0400 (Wed, 02 Jun 2010)
New Revision: 12986
Modified:
modules/security/trunk/api/pom.xml
modules/security/trunk/docs/pom.xml
modules/security/trunk/examples/seamspace/pom.xml
modules/security/trunk/impl/pom.xml
modules/security/trunk/pom.xml
Log:
new build, unchecked as seam-security doesn't compile
Modified: modules/security/trunk/api/pom.xml
===================================================================
--- modules/security/trunk/api/pom.xml 2010-06-02 19:19:30 UTC (rev 12985)
+++ modules/security/trunk/api/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
@@ -5,6 +5,7 @@
<groupId>org.jboss.seam.security</groupId>
<artifactId>seam-security-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.security</groupId>
@@ -24,7 +25,6 @@
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-api</artifactId>
- <version>1.1.2.CR01</version>
</dependency>
</dependencies>
Modified: modules/security/trunk/docs/pom.xml
===================================================================
--- modules/security/trunk/docs/pom.xml 2010-06-02 19:19:30 UTC (rev 12985)
+++ modules/security/trunk/docs/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
@@ -2,9 +2,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>9</version>
+ <groupId>org.jboss.seam.security</groupId>
+ <artifactId>seam-security-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.security</groupId>
Modified: modules/security/trunk/examples/seamspace/pom.xml
===================================================================
--- modules/security/trunk/examples/seamspace/pom.xml 2010-06-02 19:19:30 UTC (rev 12985)
+++ modules/security/trunk/examples/seamspace/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
@@ -1,11 +1,13 @@
<?xml version="1.0"?>
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.jboss.seam.security</groupId>
<artifactId>seam-security-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.security</groupId>
@@ -13,33 +15,29 @@
<packaging>war</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Seam Security SeamSpace Example</name>
-
+
<dependencies>
- <!--dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency-->
-
+ <!--
+ dependency> <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId> <scope>test</scope>
+ <classifier>jdk15</classifier> </dependency
+ -->
+
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-FCS</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>4.0.0.GA</version>
<scope>provided</scope>
</dependency>
@@ -58,35 +56,31 @@
<dependency>
<groupId>org.jboss.seam.xml</groupId>
- <artifactId>seam-xml-bean-config</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>seam-xml-config</artifactId>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <!-- Required until the Servlet 3.0 API can be resolved in Central -->
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -94,16 +88,15 @@
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
<scope>runtime</scope>
- <version>2.1.2-b04</version>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
</dependencies>
-
+
</project>
Modified: modules/security/trunk/impl/pom.xml
===================================================================
--- modules/security/trunk/impl/pom.xml 2010-06-02 19:19:30 UTC (rev 12985)
+++ modules/security/trunk/impl/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
@@ -1,19 +1,22 @@
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.seam.security</groupId>
- <artifactId>seam-security-parent</artifactId>
+ <artifactId>seam-security-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam.security</groupId>
<artifactId>seam-security-impl</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
<name>Seam Security Implementation</name>
-
+
<dependencies>
+
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -32,9 +35,13 @@
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -44,8 +51,8 @@
</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>
@@ -54,11 +61,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-persistence</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam.security</groupId>
<artifactId>seam-security-api</artifactId>
<version>${project.version}</version>
@@ -67,9 +69,8 @@
<dependency>
<groupId>org.picketlink.idm</groupId>
<artifactId>picketlink-idm-core</artifactId>
- <version>1.1.2.CR01</version>
</dependency>
-
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
Modified: modules/security/trunk/pom.xml
===================================================================
--- modules/security/trunk/pom.xml 2010-06-02 19:19:30 UTC (rev 12985)
+++ modules/security/trunk/pom.xml 2010-06-02 19:40:03 UTC (rev 12986)
@@ -1,12 +1,11 @@
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
- <artifactId>weld-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>10</version>
+ <artifactId>seam-parent</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ <version>1</version>
</parent>
<groupId>org.jboss.seam.security</groupId>
@@ -22,72 +21,53 @@
<module>examples/seamspace</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencyManagement>
+ <properties>
+ <seam.version>3.0.0.b01</seam.version>
+ <!-- Use snapshot WeldX -->
+ <weld.extensions.version>1.0.0-SNAPSHOT</weld.extensions.version>
+ <!-- Seam-Drools is not yet released -->
+ <seam.drools.version>3.0.0-SNAPSHOT</seam.drools.version>
+ </properties>
+
+ <dependencyManagement>
<dependencies>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam</artifactId>
+ <version>${seam.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
-
+
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-extensions</artifactId>
+ <version>${weld.extensions.version}</version>
</dependency>
-
+
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam.drools</groupId>
<artifactId>seam-drools-core</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${seam.drools.version}</version>
</dependency>
+ <!-- Override sub-module versions from org.jboss.seam:seam -->
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-persistence</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <groupId>org.jboss.seam.security</groupId>
+ <artifactId>seam-security-api</artifactId>
+ <version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.0-SP1</version>
- </dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
- <scope>provided</scope>
+ <groupId>org.jboss.seam.security</groupId>
+ <artifactId>seam-security-impl</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
-
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/securit...
<developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/s...