3 a.m.
Author: jeff.yuchang
Date: 2011-06-09 04:00:42 -0400 (Thu, 09 Jun 2011)
New Revision: 1377
Modified:
trunk/console/bpaf/pom.xml
trunk/console/integration/pom.xml
trunk/distribution/pom.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
trunk/runtime/clustering/pom.xml
trunk/runtime/engine/pom.xml
Log:
* remove the obsolete jars from deprecated jboss repo.
* fixing the maven3 warnning, mostly about the plugins' version.
Modified: trunk/console/bpaf/pom.xml
===================================================================
--- trunk/console/bpaf/pom.xml 2011-06-09 04:12:26 UTC (rev 1376)
+++ trunk/console/bpaf/pom.xml 2011-06-09 08:00:42 UTC (rev 1377)
@@ -51,14 +51,8 @@
</dependency>
<!-- RiftSaw -->
-
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-bpel-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-bpel-schemas</artifactId>
</dependency>
Modified: trunk/console/integration/pom.xml
===================================================================
--- trunk/console/integration/pom.xml 2011-06-09 04:12:26 UTC (rev 1376)
+++ trunk/console/integration/pom.xml 2011-06-09 08:00:42 UTC (rev 1377)
@@ -39,11 +39,6 @@
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
- <artifactId>riftsaw-bpel-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-bpel-schemas</artifactId>
</dependency>
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2011-06-09 04:12:26 UTC (rev 1376)
+++ trunk/distribution/pom.xml 2011-06-09 08:00:42 UTC (rev 1377)
@@ -172,10 +172,6 @@
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
</dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
<!--
BPM Console
@@ -184,19 +180,19 @@
<dependency>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>bpel2svg</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>integration</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>bpaf</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -208,7 +204,7 @@
<dependency>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>identity</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2011-06-09 04:12:26 UTC (rev 1376)
+++ trunk/integration-tests/pom.xml 2011-06-09 08:00:42 UTC (rev 1377)
@@ -18,6 +18,7 @@
<jboss.version>5.1.0.GA</jboss.version>
<test.delay>20000</test.delay>
<ws.stack>native</ws.stack>
+ <quartz.version>1.6.0</quartz.version>
</properties>
<dependencies>
<dependency>
@@ -44,6 +45,22 @@
<version>4.9</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-config-model</artifactId>
@@ -56,7 +73,7 @@
<version>${jbossts.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
<version>${jboss.version}</version>
@@ -80,7 +97,7 @@
<artifactId>jboss-jaxws</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-aspects</artifactId>
@@ -96,6 +113,38 @@
<groupId>sun-jaxws</groupId>
<artifactId>jsr181-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jacc</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>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -104,12 +153,80 @@
<version>${jboss.version}</version>
<classifier>jboss-aspect-library</classifier>
<scope>test</scope>
+ <exclusions>
+ <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>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-aspects</artifactId>
<version>${jboss.version}</version>
<scope>test</scope>
+ <exclusions>
+ <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>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-06-09 04:12:26 UTC (rev 1376)
+++ trunk/pom.xml 2011-06-09 08:00:42 UTC (rev 1377)
@@ -403,29 +403,26 @@
<build>
<!-- This section defines the default plugin settings inherited by child projects.
-->
<pluginManagement>
- <plugins>
- <!-- Fixes how test resources of a project can be used in projects dependent
on it -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
+ <!-- Fixes how test resources of a project can be used in projects dependent
on it -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
<!-- Specify the compiler options and settings -->
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!--version>2.0.2</version-->
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -434,11 +431,12 @@
<optimize>true</optimize>
<compilerArgument>-verbose</compilerArgument>
</configuration>
- </plugin>
- <!-- Produce source jars during the 'verify' phase -->
- <plugin>
+ </plugin>
+ <!-- Produce source jars during the 'verify' phase -->
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -448,22 +446,25 @@
</goals>
</execution>
</executions>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7.2</version>
<configuration>
<includes>
<include>**/*TestCase.java</include>
<include>**/*Test.java</include>
</includes>
</configuration>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<reporting>
@@ -471,6 +472,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.7.2</version>
</plugin>
<!--plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -501,12 +503,6 @@
</snapshots>
</repository>
- <repository>
- <id>riftsaw-ode-2.3.0-SNAPSHOT</id>
- <name>JBoss RiftSaw 2.3.0-SNAPSHOT</name>
- <url>https://repository.jboss.org/nexus/content/repositories/jboss_rele...
- </repository>
-
</repositories>
</project>
Modified: trunk/runtime/clustering/pom.xml
===================================================================
--- trunk/runtime/clustering/pom.xml 2011-06-09 04:12:26 UTC (rev 1376)
+++ trunk/runtime/clustering/pom.xml 2011-06-09 08:00:42 UTC (rev 1377)
@@ -24,6 +24,24 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-cluster</artifactId>
<version>${jboss.clustering.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jpl-pattern</groupId>
+ <artifactId>jpl-pattern</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jpl-util</groupId>
+ <artifactId>jpl-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2011-06-09 04:12:26 UTC (rev 1376)
+++ trunk/runtime/engine/pom.xml 2011-06-09 08:00:42 UTC (rev 1377)
@@ -100,14 +100,13 @@
<artifactId>jboss-as-system-jmx</artifactId>
<version>${jboss.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <version>${jboss.version}</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>