Author: manaRH Date: 2012-05-30 06:31:06 -0400 (Wed, 30 May 2012) New Revision: 14813 Modified: branches/enterprise/WFK-2_0/bom/pom.xml branches/enterprise/WFK-2_0/jboss-seam/pom.xml branches/enterprise/WFK-2_0/pom.xml Log: customization for MEAD enviroment and EAP 6 dependencies Modified: branches/enterprise/WFK-2_0/bom/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/bom/pom.xml 2012-05-30 10:30:58 UTC (rev 14812) +++ branches/enterprise/WFK-2_0/bom/pom.xml 2012-05-30 10:31:06 UTC (rev 14813) @@ -33,7 +33,7 @@ <!-- Version string properties --> <version.seam>2.3.0.Beta2-redhat-1</version.seam> <version.drools>5.2.2.BRMS</version.drools> - <version.resteasy>2.0.1.GA</version.resteasy> + <version.resteasy>2.3.3.Final-redhat-1</version.resteasy> <version.spring>3.1.1.RELEASE</version.spring> <version.jbossas7>7.1.2.Final-redhat-1</version.jbossas7> <version.jsf2>2.1.7-redhat-1</version.jsf2> @@ -42,7 +42,8 @@ <version.junit>4.8.2</version.junit> <version.testng>5.14.10</version.testng> <version.richfaces>4.2.2.Final-redhat-1</version.richfaces> - <version.arquillian_core>1.0.0.Final</version.arquillian_core> + <version.org.jboss.bom>1.0.0.M11-redhat-1</version.org.jboss.bom> + <version.org.hibernate.search>4.1.1.Final-redhat-1</version.org.hibernate.search> <!-- ***************** --> @@ -60,17 +61,37 @@ <dependencies> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-analyzers</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-engine</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-orm</artifactId> + <version>${version.org.hibernate.search}</version> + </dependency> + <dependency> <groupId>org.jboss.bom</groupId> <artifactId>jboss-javaee-6.0-with-hibernate</artifactId> - <version>1.0.0.M11-redhat-1</version> + <version>${version.org.jboss.bom}</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-bom</artifactId> - <version>${version.arquillian_core}</version> + <groupId>org.jboss.bom</groupId> + <artifactId>jboss-wfk-arquillian</artifactId> + <version>${version.org.jboss.bom}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -176,12 +197,6 @@ </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-cache</artifactId> - <version>1.4.1.SP9</version> - </dependency> - - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> <version>1.2.3</version> @@ -304,7 +319,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.3</version> + <version>2.4</version> </dependency> <dependency> @@ -319,54 +334,6 @@ <version>3.1-jbossorg-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> --> - <!-- Excel export module dependency --> <dependency> <groupId>net.sourceforge.jexcelapi</groupId> @@ -563,12 +530,6 @@ </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-api</artifactId> - <version>${version.drools}</version> - </dependency> <dependency> <groupId>org.drools</groupId> @@ -614,74 +575,74 @@ <groupId>org.opensymphony.quartz</groupId> <artifactId>quartz</artifactId> <version>1.6.5</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${version.spring}</version> </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${version.spring}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${version.spring}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${version.spring}</version> + </dependency> + <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice</artifactId> <version>1.0</version> @@ -771,6 +732,13 @@ </exclusions> </dependency> + <!-- rewriting version in openid pom --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.0.2</version> + </dependency> + <dependency> <groupId>org.openid4java</groupId> <artifactId>openid4java-consumer</artifactId> Modified: branches/enterprise/WFK-2_0/jboss-seam/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/jboss-seam/pom.xml 2012-05-30 10:30:58 UTC (rev 14812) +++ branches/enterprise/WFK-2_0/jboss-seam/pom.xml 2012-05-30 10:31:06 UTC (rev 14813) @@ -136,6 +136,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-search-orm</artifactId> <optional>true</optional> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -338,10 +344,16 @@ <artifactId>urlrewritefilter</artifactId> <optional>true</optional> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>concurrent</groupId> + <groupId>oswego-concurrent</groupId> <artifactId>concurrent</artifactId> <optional>true</optional> </dependency> Modified: branches/enterprise/WFK-2_0/pom.xml =================================================================== --- branches/enterprise/WFK-2_0/pom.xml 2012-05-30 10:30:58 UTC (rev 14812) +++ branches/enterprise/WFK-2_0/pom.xml 2012-05-30 10:31:06 UTC (rev 14813) @@ -44,15 +44,10 @@ <pdf.name>${project.artifactId}.pdf</pdf.name> <!-- Version string properties --> - <version.arquillian_core>1.0.0.Final</version.arquillian_core> - <version.drools>5.2.1.BRMS</version.drools> <version.testng>5.14.10</version.testng> - <version.resteasy>2.0.1.GA</version.resteasy> - <version.jbossas7>7.1.2.Final-redhat-1</version.jbossas7> + <version.richfaces>4.2.2.Final-redhat-1</version.richfaces> <version.emma>2.0.5312</version.emma> - <version.jsf2>2.1.7-redhat-1</version.jsf2> <version.junit>4.8.2</version.junit> - <version.richfaces>4.2.2.Final-redhat-1</version.richfaces> <!-- ***************** --> <!-- Repository Deployment URLs --> @@ -129,7 +124,7 @@ </dependency> <dependency> - <groupId>concurrent</groupId> + <groupId>oswego-concurrent</groupId> <artifactId>concurrent</artifactId> <version>1.3.4</version> </dependency>