[jbpm-commits] JBoss JBPM SVN: r6418 - in jbpm4/trunk: modules/pvm and 1 other directory.

Author: alex.guizar(a)jboss.com Date: 2010-06-16 07:13:38 -0400 (Wed, 16 Jun 2010) New Revision: 6418 Modified: jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/pom.xml Log: JBPM-2800: split juel:juel dependency into juel:juel-api and juel:juel-impl upgrade to juel version 2.2.1 Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2010-06-15 15:50:38 UTC (rev 6417) +++ jbpm4/trunk/modules/pvm/pom.xml 2010-06-16 11:13:38 UTC (rev 6418) @@ -43,53 +43,47 @@ <artifactId>jbpm-test-base</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> </dependency> <dependency> - <groupId>juel</groupId> - <artifactId>juel</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> </dependency> <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> </dependency> <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - </dependency> - <dependency> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-core</artifactId> </dependency> <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-core</artifactId> - </dependency> - <dependency> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-hibernate</artifactId> <exclusions> @@ -128,41 +122,49 @@ </exclusions> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> + <groupId>jboss</groupId> + <artifactId>jboss-j2ee</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> + <groupId>juel</groupId> + <artifactId>juel-api</artifactId> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <scope>provided</scope> + <groupId>juel</groupId> + <artifactId>juel-impl</artifactId> </dependency> <dependency> + <groupId>juel</groupId> + <artifactId>juel-engine</artifactId> + </dependency> + <dependency> <groupId>org.livetribe</groupId> <artifactId>livetribe-jsr223</artifactId> </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> + </dependency><dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2010-06-15 15:50:38 UTC (rev 6417) +++ jbpm4/trunk/pom.xml 2010-06-16 11:13:38 UTC (rev 6418) @@ -45,19 +45,20 @@ <!-- Properties --> <properties> + <activation.version>1.1.1</activation.version> <apache.ant.version>1.7.0</apache.ant.version> + <aspectjrt.version>1.5.3</aspectjrt.version> <beanshell.version>2.0b5</beanshell.version> - <groovy.version>1.5.6</groovy.version> <cactus.version>1.8.1</cactus.version> + <cdi.version>1.0</cdi.version> <drools.version>5.0.1</drools.version> - <aspectjrt.version>1.5.3</aspectjrt.version> + <errai.version>1.1-M1</errai.version> <freemarker.version>2.3.15</freemarker.version> + <groovy.version>1.5.6</groovy.version> <gwt.console.version>2.1</gwt.console.version> - <errai.version>1.1-M1</errai.version> - <jbpm.gpd.version>4.3</jbpm.gpd.version> <hibernate.version>3.3.1.GA</hibernate.version> - <slf4j.version>1.5.2</slf4j.version> <hsqldb.version>1.8.0.7</hsqldb.version> + <jbpm.gpd.version>4.3</jbpm.gpd.version> <jboss.identity.version>1.0.0.Beta1</jboss.identity.version> <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version> <jboss.client.version>5.0.1.GA</jboss.client.version> @@ -70,16 +71,16 @@ <report.engine.version>2.3.2</report.engine.version> <servlet-api.version>2.5</servlet-api.version> <signavio.jbpmeditor.version>1.1</signavio.jbpmeditor.version> + <slf4j.version>1.5.2</slf4j.version> <spring.version>2.0.8</spring.version> <stax.api.version>1.0.1</stax.api.version> <wiser.version>1.2</wiser.version> <woodstox.version>3.2.6</woodstox.version> + + <jtds.version>1.2.2</jtds.version> <mysql.connector.version>5.0.8</mysql.connector.version> + <oracle.version>10.2.0.4</oracle.version> <postgresql.version>8.3-603.jdbc3</postgresql.version> - <jtds.version>1.2.2</jtds.version> - <oracle.version>10.2.0.4</oracle.version> - <cdi.version>1.0</cdi.version> - <activation.version>1.1.1</activation.version> </properties> <!-- DependencyManagement --> @@ -202,13 +203,28 @@ </dependency> <!-- External dependencies --> - <!-- Please sort by groupid --> + <!-- Please sort by artifactId --> <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${activation.version}</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${apache.ant.version}</version> + </dependency> + <dependency> <groupId>aspectj</groupId> <artifactId>aspectjrt</artifactId> <version>${aspectjrt.version}</version> </dependency> <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + <version>${beanshell.version}</version> + </dependency> + <dependency> <groupId>cactus</groupId> <artifactId>cactus.core</artifactId> <version>${cactus.version}</version> @@ -224,72 +240,11 @@ <version>${cactus.version}</version> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>${jboss.j2ee.version}</version> - </dependency> - <dependency> - <groupId>juel</groupId> - <artifactId>juel</artifactId> - <version>${juel.version}</version> - </dependency> - <dependency> - <!-- - The juel engine is the library from scripting.java.sun.com that exposes juel as a - jsr233 scripting engine. It's not part of the juel distribution. For some reason i - don't recall, we uploaded it as an juel-engine artifact in the group juel. And more - problematic, used the juel version (2.1.0) for it. That is not intuitive. - --> - <groupId>juel</groupId> - <artifactId>juel-engine</artifactId> - <version>${juel.engine.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet-api.version}</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>${activation.version}</version> - </dependency> - <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <version>${cdi.version}</version> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>${mail.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${apache.ant.version}</version> - </dependency> - <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>${beanshell.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${groovy.version}</version> - </dependency> - <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> <version>${drools.version}</version> @@ -300,32 +255,26 @@ <version>${drools.version}</version> </dependency> <dependency> - <groupId>org.eclipse.birt</groupId> - <artifactId>report-engine</artifactId> - <type>zip</type> - <version>${report.engine.version}</version> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-common</artifactId> + <version>${errai.version}</version> </dependency> <dependency> + <groupId>org.jboss.errai</groupId> + <artifactId>errai-bus</artifactId> + <version>${errai.version}</version> + </dependency> + <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> <version>${freemarker.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernate.version}</version> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${groovy.version}</version> </dependency> <dependency> - <groupId>org.jboss.identity.idm</groupId> - <artifactId>idm-core</artifactId> - <version>${jboss.identity.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.identity.idm</groupId> - <artifactId>idm-hibernate</artifactId> - <version>${jboss.identity.version}</version> - </dependency> - <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console</artifactId> <version>${gwt.console.version}</version> @@ -351,16 +300,21 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.errai</groupId> - <artifactId>errai-common</artifactId> - <version>${errai.version}</version> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.version}</version> </dependency> <dependency> - <groupId>org.jboss.errai</groupId> - <artifactId>errai-bus</artifactId> - <version>${errai.version}</version> + <groupId>org.jboss.identity.idm</groupId> + <artifactId>idm-core</artifactId> + <version>${jboss.identity.version}</version> </dependency> <dependency> + <groupId>org.jboss.identity.idm</groupId> + <artifactId>idm-hibernate</artifactId> + <version>${jboss.identity.version}</version> + </dependency> + <dependency> <groupId>org.jboss.javaee</groupId> <artifactId>jboss-javaee</artifactId> <version>${jboss.client.version}</version> @@ -372,11 +326,61 @@ <type>pom</type> </dependency> <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-j2ee</artifactId> + <version>${jboss.j2ee.version}</version> + </dependency> + <dependency> + <groupId>juel</groupId> + <artifactId>juel-api</artifactId> + <version>${juel.version}</version> + </dependency> + <dependency> + <groupId>juel</groupId> + <artifactId>juel-impl</artifactId> + <version>${juel.version}</version> + </dependency> + <dependency> + <!-- + The juel engine is the library from scripting.java.sun.com that exposes juel as a + jsr233 scripting engine. It's not part of the juel distribution. For some reason i + don't recall, we uploaded it as an juel-engine artifact in the group juel. And more + problematic, used the juel version (2.1.0) for it. That is not intuitive. + --> + <groupId>juel</groupId> + <artifactId>juel-engine</artifactId> + <version>${juel.engine.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + <dependency> <groupId>org.livetribe</groupId> <artifactId>livetribe-jsr223</artifactId> <version>${jsr233.version}</version> + </dependency><dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> </dependency> <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${mail.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>report-engine</artifactId> + <type>zip</type> + <version>${report.engine.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servlet-api.version}</version> + </dependency><dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> @@ -419,6 +423,11 @@ <version>${hsqldb.version}</version> </dependency> <dependency> + <groupId>net.sourceforge.jtds</groupId> + <artifactId>jtds</artifactId> + <version>${jtds.version}</version> + </dependency> + <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>${mysql.connector.version}</version> @@ -428,11 +437,6 @@ <artifactId>postgresql</artifactId> <version>${postgresql.version}</version> </dependency> - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>${jtds.version}</version> - </dependency> </dependencies> </dependencyManagement>