[seam-commits] Seam SVN: r14543 - in branches/enterprise/WFK_2_0_PRE: distribution/src/main/assembly and 25 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Tue Apr 10 08:55:41 EDT 2012
Author: manaRH
Date: 2012-04-10 08:55:37 -0400 (Tue, 10 Apr 2012)
New Revision: 14543
Modified:
branches/enterprise/WFK_2_0_PRE/build/settings.xml
branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ear/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ejb/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-tests/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ejb/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ejb/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ejb/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ejb/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ear/pom.xml
branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ejb/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-debug/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-excel/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-flex/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedEntityManagerFactory.java
branches/enterprise/WFK_2_0_PRE/jboss-seam-mail/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-parent/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-pdf/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-remoting/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-resteasy/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam-ui/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam/pom.xml
branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java
branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java
branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java
branches/enterprise/WFK_2_0_PRE/seam-integration-tests/pom.xml
Log:
attached jboss-parent to seam parent and aligned dependencies
Modified: branches/enterprise/WFK_2_0_PRE/build/settings.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/build/settings.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/build/settings.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -1,73 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<!--
- | This is the configuration file for Maven. It can be specified at two levels:
- |
- | 1. User Level. This settings.xml file provides configuration for a single user,
- | and is normally provided in ${user.home}/.m2/settings.xml.
- |
- | NOTE: This location can be overridden with the CLI option:
- |
- | -s /path/to/user/settings.xml
- |
- | 2. Global Level. This settings.xml file provides configuration for all Maven
- | users on a machine (assuming they're all using the same Maven
- | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
- |
- | NOTE: This location can be overridden with the CLI option:
- |
- | -gs /path/to/global/settings.xml
- |
- | The sections in this sample file are intended to give you a running start at
- | getting the most out of your Maven installation. Where appropriate, the default
- | values (values used when the setting is not specified) are provided.
- |
- |-->
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+
+
<!-- localRepository
| The path to the local repository maven will use to store artifacts.
- |
+ ld|
| Default: ~/.m2/repository
- <localRepository>/path/to/local/repo</localRepository>
-->
+ <localRepository>/home/mnovotny/.m2/repository-jb-wfk-2-rhel-6-build</localRepository>
-
- <!-- interactiveMode
- | This will determine whether maven prompts you when it needs input. If set to false,
- | maven will use a sensible default value, perhaps based on some other setting, for
- | the parameter in question.
- |
- | Default: true
- <interactiveMode>true</interactiveMode>
- -->
-
-
<!-- offline
| Determines whether maven should attempt to connect to the network when executing a build.
| This will have an effect on artifact downloads, artifact deployment, and others.
@@ -76,74 +20,6 @@
<offline>false</offline>
-->
-
- <!-- pluginGroups
- | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
- | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
- | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
- |-->
- <pluginGroups>
- <!-- pluginGroup
- | Specifies a further group identifier to use for plugin lookup.
- <pluginGroup>com.your.plugins</pluginGroup>
- -->
- <pluginGroup>org.jboss.maven.plugins</pluginGroup>
- </pluginGroups>
-
-
- <!-- proxies
- | This is a list of proxies which can be used on this machine to connect to the network.
- | Unless otherwise specified (by system property or command-line switch), the first proxy
- | specification in this list marked as active will be used.
- |-->
- <proxies>
- <!-- proxy
- | Specification for one proxy, to be used in connecting to the network.
- |
- <proxy>
- <id>optional</id>
- <active>true</active>
- <protocol>http</protocol>
- <username>proxyuser</username>
- <password>proxypass</password>
- <host>proxy.host.net</host>
- <port>80</port>
- <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
- </proxy>
- -->
- </proxies>
-
-
- <!-- servers
- | This is a list of authentication profiles, keyed by the server-id used within the system.
- | Authentication profiles can be used whenever maven must make a connection to a remote server.
- |-->
- <servers>
- <!-- server
- | Specifies the authentication information to use when connecting to a particular server, identified by
- | a unique name within the system (referred to by the 'id' attribute below).
- |
- | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
- | used together.
- |
- <server>
- <id>deploymentRepo</id>
- <username>repouser</username>
- <password>repopwd</password>
- </server>
- -->
-
-
- <!-- Another sample, using keys to authenticate.
- <server>
- <id>siteServer</id>
- <privateKey>/path/to/private/key</privateKey>
- <passphrase>optional; leave empty if not used.</passphrase>
- </server>
- -->
- </servers>
-
-
<!-- mirrors
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
|
@@ -160,121 +36,56 @@
| Specifies a repository mirror site to use instead of a given repository. The repository that
| this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
| for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
- |
- <mirror>
- <id>mirrorId</id>
- <mirrorOf>repositoryId</mirrorOf>
- <name>Human Readable Name for this Mirror.</name>
- <url>http://my.repository.com/repo/path</url>
- </mirror>
- -->
+ |-->
+ <!-- <mirror>
+ <id>Mead</id>
+ <mirrorOf>Central</mirrorOf>
+ <name>Mead enviroment repository</name>
+ <url>http://download.devel.redhat.com/brewroot/repos/jb-wfk-2-rhel-6-build/latest/maven</url>
+ </mirror> -->
</mirrors>
-
- <!-- profiles
- | This is a list of profiles which can be activated in a variety of ways, and which can modify
- | the build process. Profiles provided in the settings.xml are intended to provide local machine-
- | specific paths and repository locations which allow the build to work in the local environment.
- |
- | For example, if you have an integration testing plugin - like cactus - that needs to know where
- | your Tomcat instance is installed, you can provide a variable here such that the variable is
- | dereferenced during the build process to configure the cactus plugin.
- |
- | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
- | section of this document (settings.xml) - will be discussed later. Another way essentially
- | relies on the detection of a system property, either matching a particular value for the property,
- | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
- | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
- | Finally, the list of active profiles can be specified directly from the command line.
- |
- | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
- | repositories, plugin repositories, and free-form properties to be used as configuration
- | variables for plugins in the POM.
- |
- |-->
<profiles>
<profile>
- <id>jboss-public-repository</id>
+ <id>jboss-wfk2-repository</id>
<repositories>
<repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <id>jboss-wfk2-repository</id>
+ <name>JBoss WFK2 internal Maven Repository</name>
+ <url>http://download.devel.redhat.com/brewroot/repos/jb-wfk-2-rhel-6-build/latest/maven</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <pluginRepository>
+ <id>jboss-wfk2-repository</id>
+ <name>JBoss WFK2 internal Maven Repository</name>
+ <url>http://download.devel.redhat.com/brewroot/repos/jb-wfk-2-rhel-6-build/latest/maven</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
- </pluginRepository>
+ </pluginRepository>
</pluginRepositories>
</profile>
- <profile>
- <id>jboss-deprecated-repository</id>
- <repositories>
- <repository>
- <id>jboss-deprecated-repository</id>
- <name>JBoss Deprecated Maven Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
- </profile>
-
-
- <profile>
- <id>jboss-staging-repository</id>
- <repositories>
- <repository>
- <id>jboss-staging-repository</id>
- <name>JBoss Staging Maven Repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/staging/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
- </profile>
</profiles>
<activeProfiles>
- <activeProfile>jboss-public-repository</activeProfile>
- <!-- <activeProfile>jboss-staging-repository</activeProfile> -->
+ <activeProfile>jboss-wfk2-repository</activeProfile>
</activeProfiles>
-
</settings>
Modified: branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -20,7 +20,7 @@
<exclude>examples-ee6/</exclude>
</excludes>
</fileSet>
-
+
<!-- Distribution related files -->
<fileSet>
<directory>src/main/assembly</directory>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ear/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ear/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ear/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -23,22 +23,6 @@
<groupId>org.jboss.seam.examples-ee6.booking</groupId>
<artifactId>booking-ejb</artifactId>
<type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -87,15 +71,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>provided</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ejb/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ejb/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -16,16 +16,19 @@
<dependencies>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -33,17 +36,20 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-tests/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-tests/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-tests/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -31,8 +31,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -82,6 +86,10 @@
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ejb/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ejb/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -21,8 +21,8 @@
<type>ejb</type>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -31,12 +31,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<!--
<dependency>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ejb/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ejb/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -29,13 +29,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ejb/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ejb/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -18,10 +18,11 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -30,8 +31,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -64,7 +64,7 @@
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.1.0.Final</version>
+ <version>7.1.1.Final</version>
<executions>
<execution>
<phase></phase>
@@ -94,9 +94,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>1.0.1.Final-redhat-1</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
@@ -138,26 +138,27 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.2</version>
+ <version>1.4.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>6.0</version>
- <scope>provided</scope>
+ <scope>import</scope>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>4.0.1.Final</version>
+ <version>4.1.1.Final-redhat-1</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>4.2.0.Final</version>
+ <version>4.2.0.Final-redhat-1</version>
</dependency>
<!-- common test scope dependencies -->
@@ -960,10 +961,8 @@
<properties>
<!-- artifact versions -->
- <hibernate.version>3.3.2.GA</hibernate.version>
- <hibernate-em.version>3.4.0.GA</hibernate-em.version>
- <richfaces.version>4.1.0.Final</richfaces.version>
- <slf4j.version>1.5.8</slf4j.version>
+ <richfaces.version>4.2.0.Final-redhat-1</richfaces.version>
+ <slf4j.version>1.6.1</slf4j.version>
<java.version>1.5</java.version>
<!-- Excluded TestNG groups (ex: slow annotated tests won't run during
the test phase) -->
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ejb/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ejb/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -50,8 +50,8 @@
<type>ejb</type>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -65,22 +65,32 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ear/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ear/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ear/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -29,33 +29,23 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ejb/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ejb/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ejb/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -23,19 +23,19 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
- <version>1.0.1.Final</version>
+ <version>1.0.1.Final-redhat-1</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -161,18 +161,26 @@
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>javax.xml.soap</groupId>
@@ -189,15 +197,15 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -215,8 +223,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -318,6 +326,16 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -377,8 +395,8 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java 2012-04-10 12:55:37 UTC (rev 14543)
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import javax.ejb.EJBException;
import javax.ejb.NoSuchObjectLocalException;
+import javax.ejb.ScheduleExpression;
import javax.ejb.Stateless;
import javax.ejb.Timeout;
import javax.ejb.Timer;
@@ -185,6 +186,24 @@
}
});
}
+
+ @Override
+ public ScheduleExpression getSchedule() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+ {
+ return null;
+ }
+
+ @Override
+ public boolean isCalendarTimer() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isPersistent() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+ {
+ return false;
+ }
}
static class TimerHandleProxy
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java 2012-04-10 12:55:37 UTC (rev 14543)
@@ -17,4 +17,9 @@
super(context, type, userInterceptors, interceptors);
}
+ public Object getTimer()
+ {
+ return null;
+ }
+
}
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java 2012-04-10 12:55:37 UTC (rev 14543)
@@ -48,4 +48,9 @@
{
context.setParameters(params);
}
+
+ public Object getTimer()
+ {
+ return context.getTimer();
+ }
}
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-debug/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-debug/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-debug/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -18,8 +18,8 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -36,8 +36,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-excel/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-excel/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-excel/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -25,8 +25,8 @@
<type>ejb</type>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
@@ -51,8 +51,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-flex/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-flex/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-flex/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -41,8 +41,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -30,15 +30,15 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedEntityManagerFactory.java
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedEntityManagerFactory.java 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedEntityManagerFactory.java 2012-04-10 12:55:37 UTC (rev 14543)
@@ -7,8 +7,12 @@
import java.lang.reflect.Proxy;
import java.util.Map;
+import javax.persistence.Cache;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnitUtil;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.metamodel.Metamodel;
import org.jboss.seam.Component;
import org.jboss.seam.log.LogProvider;
@@ -147,4 +151,34 @@
}
}
}
+
+ public Cache getCache()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public CriteriaBuilder getCriteriaBuilder()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Metamodel getMetamodel()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public PersistenceUnitUtil getPersistenceUnitUtil()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Map<String, Object> getProperties()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-mail/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-mail/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-mail/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -22,8 +22,8 @@
<artifactId>jboss-seam-ui</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
@@ -49,8 +49,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-parent/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-parent/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-parent/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -1,6 +1,12 @@
<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">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>8-redhat-1</version>
+ </parent>
+
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-parent</artifactId>
<name>Seam Parent</name>
@@ -40,7 +46,7 @@
<!-- Version string properties -->
<version.arquillian_core>1.0.0.CR7</version.arquillian_core>
- <version.richfaces>4.1.0.Final</version.richfaces>
+ <version.richfaces>4.2.0.Final-redhat-1</version.richfaces>
<version.drools>5.2.1.BRMS</version.drools>
<version.testng>5.14.10-redhat-1</version.testng>
<version.resteasy>2.3.2.Final-redhat-1</version.resteasy>
@@ -48,7 +54,7 @@
<version.jbossembedded>beta3.SP15</version.jbossembedded>
<version.jbossas7>7.1.1.Final-redhat-1</version.jbossas7>
<version.emma>2.0.5312</version.emma>
- <version.jsf2>2.1.5</version.jsf2>
+ <version.jsf2>2.1.7-redhat-1</version.jsf2>
<version.junit>4.8.2</version.junit>
<version.hibernatevalidator>4.2.0.Final-redhat-1</version.hibernatevalidator>
<version.hibernatesearch>4.1.0.CR1-redhat-1</version.hibernatesearch>
@@ -174,9 +180,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ <version>1.0.0.Final-redhat-1</version>
</dependency>
<dependency>
@@ -258,7 +264,7 @@
<dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>2.4.1</version>
+ <version>2.6.20.Final</version>
</dependency>
<dependency>
@@ -369,9 +375,9 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <version>1.0.0.Final-redhat-1</version>
</dependency>
<dependency>
@@ -427,58 +433,58 @@
</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>
+ <version>1.0.1.Final-redhat-1</version>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>1.0.0.CR8</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-slide</groupId>
- <artifactId>webdavlib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </exclusion>
- <exclusion>
- <groupId>wutka-dtdparser</groupId>
- <artifactId>dtdparser121</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>jboss</groupId> -->
+<!-- <artifactId>jbossxb</artifactId> -->
+<!-- <version>1.0.0.CR8</version> -->
+<!-- <exclusions> -->
+<!-- <exclusion> -->
+<!-- <groupId>jboss</groupId> -->
+<!-- <artifactId>jboss-logging-spi</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>jboss</groupId> -->
+<!-- <artifactId>jboss-common-core</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>apache-xerces</groupId> -->
+<!-- <artifactId>xml-apis</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>apache-httpclient</groupId> -->
+<!-- <artifactId>commons-httpclient</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>apache-slide</groupId> -->
+<!-- <artifactId>webdavlib</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>oswego-concurrent</groupId> -->
+<!-- <artifactId>concurrent</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>wutka-dtdparser</groupId> -->
+<!-- <artifactId>dtdparser121</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>apache-xerces</groupId> -->
+<!-- <artifactId>xercesImpl</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>javax.activation</groupId> -->
+<!-- <artifactId>activation</artifactId> -->
+<!-- </exclusion> -->
+<!-- <exclusion> -->
+<!-- <groupId>sun-jaf</groupId> -->
+<!-- <artifactId>activation</artifactId> -->
+<!-- </exclusion> -->
+<!-- </exclusions> -->
+<!-- </dependency> -->
<!-- Excel export module dependency -->
<dependency>
@@ -533,7 +539,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
@@ -543,11 +549,18 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>1.0.1.Final-redhat-1</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ <version>1.0.0.Final-redhat-1</version>
+ </dependency>
+
+
<dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
@@ -573,15 +586,15 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <version>1.0.0.Final-redhat-1</version>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <version>1.0.0.Final-redhat-1</version>
</dependency>
<!-- <dependency> -->
@@ -830,11 +843,11 @@
<!-- </exclusions> -->
<!-- </dependency> -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- <version>2.0.4.GA</version>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>jboss</groupId> -->
+<!-- <artifactId>jboss-common-logging-spi</artifactId> -->
+<!-- <version>2.0.4.GA</version> -->
+<!-- </dependency> -->
<dependency>
<groupId>jboss</groupId>
@@ -1252,9 +1265,9 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.jsf2}</version>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <version>2.0.1.Final-redhat-1</version>
</dependency>
<dependency>
@@ -1266,7 +1279,7 @@
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Final</version>
+ <version>3.0.0.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -1326,135 +1339,6 @@
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
- </plugin>
-
- <!-- Building -->
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${java.compiler.version}</source>
- <target>${java.compiler.version}</target>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.6</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Seam-Version>${project.version}</Seam-Version>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- <inherited>true</inherited>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <warName>${project.build.finalName}</warName>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>enforce</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>seam-build-req</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <inherited>true</inherited>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.5.0</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.0.0,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Packaging -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Seam-Version>${project.version}</Seam-Version>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
<!-- just for jboss-seam core as it is EJB type not jar -->
<plugin>
<artifactId>maven-ejb-plugin</artifactId>
@@ -1476,8 +1360,34 @@
</pluginManagement>
<plugins>
+ <!-- Packaging -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Seam-Version>${project.version}</Seam-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Seam-Version>${project.version}</Seam-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
<executions>
<execution>
<id>attach-sources</id>
@@ -1659,26 +1569,6 @@
</pluginManagement>
</build>
</profile>
-<!-- <profile> -->
-<!-- <id>release</id> -->
-<!-- <build> -->
-<!-- <plugins> -->
-<!-- <plugin> -->
-<!-- <artifactId>maven-release-plugin</artifactId> -->
-<!-- <version>2.2.1</version> -->
-<!-- <configuration> -->
-<!-- <tagBase>https://svn.jboss.org/repos/seam/tags</tagBase> -->
-<!-- <stagingRepository>https://repository.jboss.org/nexus/content/groups/staging</stagingRepository> -->
-<!-- <tagNameFormat>JBoss_Seam_@{project.version}</tagNameFormat> -->
-<!-- <autoVersionSubmodules>true</autoVersionSubmodules> -->
-<!-- </configuration> -->
-<!-- </plugin> -->
-<!-- </plugins> -->
-<!-- </build> -->
-<!-- <modules> -->
-<!-- <module>../seam-reference-guide</module> -->
-<!-- </modules> -->
-<!-- </profile> -->
</profiles>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-pdf/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-pdf/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-pdf/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -40,8 +40,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -50,8 +50,8 @@
<artifactId>jboss-seam-ui</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
</dependencies>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-remoting/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-remoting/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-remoting/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -73,8 +73,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<type>jar</type>
<scope>test</scope>
</dependency>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-resteasy/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-resteasy/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-resteasy/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -44,8 +44,8 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-ui/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/jboss-seam-ui/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/jboss-seam-ui/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -58,8 +58,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -103,17 +103,15 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
-<!-- <version>2.1.5</version> -->
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<scope>provided</scope>
-<!-- <version>2.1.5</version> -->
</dependency>
@@ -126,6 +124,14 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -136,8 +142,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/enterprise/WFK_2_0_PRE/seam-integration-tests/pom.xml
===================================================================
--- branches/enterprise/WFK_2_0_PRE/seam-integration-tests/pom.xml 2012-04-10 12:16:23 UTC (rev 14542)
+++ branches/enterprise/WFK_2_0_PRE/seam-integration-tests/pom.xml 2012-04-10 12:55:37 UTC (rev 14543)
@@ -65,6 +65,16 @@
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
More information about the seam-commits
mailing list