JBoss JBPM SVN: r6292 - in jbpm3/branches/jbpm-3.2-soa/modules: examples and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-03 22:05:34 -0400 (Mon, 03 May 2010)
New Revision: 6292
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
Log:
add jdk14 profile and jboss public repository group to examples pom
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml 2010-05-04 01:55:40 UTC (rev 6291)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml 2010-05-04 02:05:34 UTC (rev 6292)
@@ -95,9 +95,42 @@
-->
<repositories>
<repository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
</repositories>
+ <!-- Profiles -->
+ <profiles>
+ <!--
+ Name: jdk14
+ Desc: dependencies specific to jdk 1.4
+ -->
+ <profile>
+ <id>jdk14</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-05-04 01:55:40 UTC (rev 6291)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-05-04 02:05:34 UTC (rev 6292)
@@ -121,14 +121,29 @@
</plugins>
</build>
- <!--
- Repositories
- [JBPM-2050] jBPM examples cannot be compiled
- -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
+ <!-- Profiles -->
+ <profiles>
+ <!--
+ Name: jdk14
+ Desc: dependencies specific to jdk 1.4
+ -->
+ <profile>
+ <id>jdk14</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
14 years
- 1
- 0
JBoss JBPM SVN: r6291 - in jbpm3/branches/jbpm-3.2-soa: modules/core and 2 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-03 21:55:40 -0400 (Mon, 03 May 2010)
New Revision: 6291
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
replace org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec with javax.transaction:jta and downgrade javax.servlet:servlet-api to 2.4 to preserve compatibility with jdk 1.4
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-05-03 23:04:11 UTC (rev 6290)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-05-04 01:55:40 UTC (rev 6291)
@@ -65,13 +65,13 @@
<!-- Provided Dependencies -->
<dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-05-03 23:04:11 UTC (rev 6290)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-05-04 01:55:40 UTC (rev 6291)
@@ -42,8 +42,8 @@
<!-- Provided Dependencies -->
<dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-05-03 23:04:11 UTC (rev 6290)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-05-04 01:55:40 UTC (rev 6291)
@@ -41,8 +41,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
<scope>provided</scope>
</dependency>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-05-03 23:04:11 UTC (rev 6290)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-05-04 01:55:40 UTC (rev 6291)
@@ -53,15 +53,15 @@
<javax.el.version>1.2</javax.el.version>
<javax.jcr.version>1.0</javax.jcr.version>
<javax.mail.version>1.4</javax.mail.version>
- <javax.servlet.version>2.5</javax.servlet.version>
+ <javax.servlet.version>2.4</javax.servlet.version>
<jaxen.version>1.1.1</jaxen.version>
<jboss.client.version>4.0.5.GA</jboss.client.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.j2ee.version>4.0.2</jboss.j2ee.version>
- <jboss.transaction.api.version>1.0.0.Beta1</jboss.transaction.api.version>
<jbpm.designer.version>3.1.7</jbpm.designer.version>
<jbpm.jsf-console.version>3.2.9</jbpm.jsf-console.version>
<jsf.facelets.version>1.1.15</jsf.facelets.version>
+ <jta.version>1.1</jta.version>
<junit.version>3.8.1</junit.version>
<log4j.version>1.2.14</log4j.version>
<mvel.version>1.3.1-java1.4</mvel.version>
@@ -229,16 +229,16 @@
<version>${jboss.j2ee.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
- <version>${jboss.transaction.api.version}</version>
- </dependency>
- <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>${javax.jcr.version}</version>
</dependency>
<dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>${jta.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>${jsf.facelets.version}</version>
14 years
- 1
- 0
JBoss JBPM SVN: r6290 - in jbpm4/trunk: modules/distro and 1 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-05-03 19:04:11 -0400 (Mon, 03 May 2010)
New Revision: 6290
Modified:
jbpm4/trunk/modules/distro/pom.xml
jbpm4/trunk/modules/test-db/pom.xml
jbpm4/trunk/pom.xml
Log:
remove duplicate dependencies
Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml 2010-04-30 23:02:00 UTC (rev 6289)
+++ jbpm4/trunk/modules/distro/pom.xml 2010-05-03 23:04:11 UTC (rev 6290)
@@ -158,10 +158,6 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </dependency>
<!-- Database Drivers -->
<dependency>
Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml 2010-04-30 23:02:00 UTC (rev 6289)
+++ jbpm4/trunk/modules/test-db/pom.xml 2010-05-03 23:04:11 UTC (rev 6290)
@@ -49,11 +49,6 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-test-base</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-console-reports</artifactId>
<scope>test</scope>
</dependency>
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2010-04-30 23:02:00 UTC (rev 6289)
+++ jbpm4/trunk/pom.xml 2010-05-03 23:04:11 UTC (rev 6290)
@@ -224,11 +224,6 @@
<version>${cactus.version}</version>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
<version>${jboss.j2ee.version}</version>
14 years
- 1
- 0