[jbpm-commits] JBoss JBPM SVN: r6649 - in jbpm3/branches/jbpm-3.2-soa: modules/core and 5 other directories.

Author: alex.guizar(a)jboss.com Date: 2010-09-03 00:49:46 -0400 (Fri, 03 Sep 2010) New Revision: 6649 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/enterprise/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/modules/simulation/pom.xml jbpm3/branches/jbpm-3.2-soa/pom.xml Log: exclude xml-apis and xerces versions as transitive deps; declare xerces dep only under 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-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -27,12 +27,9 @@ <dependencies> <!-- Compile Dependencies --> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> - <dependency> <groupId>bsh</groupId> <artifactId>bsh</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -41,12 +38,6 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -55,14 +46,16 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> + <optional>true</optional> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <!-- Provided Dependencies --> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> <scope>provided</scope> @@ -82,12 +75,17 @@ <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>provided</scope> + </dependency> <!-- Test Dependencies --> <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>hsqldb</groupId> @@ -189,13 +187,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> 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-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/examples/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -120,13 +120,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -38,16 +38,6 @@ <artifactId>jboss-j2ee</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <scope>provided</scope> - </dependency> <!-- Test Dependencies --> <dependency> @@ -55,7 +45,6 @@ <artifactId>cactus.core.framework.uberjar.javaEE.14</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.jboss.client</groupId> <artifactId>jbossall-client</artifactId> @@ -179,13 +168,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -52,6 +52,11 @@ <!-- Test Dependencies --> <dependency> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> <scope>test</scope> @@ -62,11 +67,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -131,13 +131,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -52,6 +52,11 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + <scope>test</scope> + </dependency> </dependencies> <!-- Plugins --> @@ -91,13 +96,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -37,13 +37,8 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </profile> @@ -68,26 +63,17 @@ <artifactId>desmoj</artifactId> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - </dependency> - <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> - <exclusions> - <exclusion> - <groupId>eclipse</groupId> - <artifactId>jdtcore</artifactId> - </exclusion> - </exclusions> </dependency> <!-- Test Dependencies --> <dependency> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-02 23:20:21 UTC (rev 6648) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-09-03 04:49:46 UTC (rev 6649) @@ -145,6 +145,12 @@ <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.drools</groupId> @@ -152,12 +158,12 @@ <version>4.0.7</version> <exclusions> <exclusion> + <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <groupId>xerces</groupId> </exclusion> <exclusion> + <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> </exclusion> </exclusions> </dependency> @@ -207,16 +213,46 @@ <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> <version>1.4.5</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> <version>3.5.3</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>eclipse</groupId> + <artifactId>jdtcore</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <version>1.1.1</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.client</groupId> @@ -367,6 +403,14 @@ </plugin> <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <source>1.4</source> + <quiet>true</quiet> + </configuration> + </plugin> + + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args}</argLine> @@ -463,11 +507,9 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - </configuration> <executions> <execution> + <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> @@ -500,11 +542,9 @@ <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - </configuration> <executions> <execution> + <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> @@ -535,19 +575,9 @@ <dependencies> <dependency> <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <version>${xerces.version}</version> - </dependency> - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>${xerces.version}</version> + <version>2.8.1</version> </dependency> - <dependency> - <groupId>org.mvel</groupId> - <artifactId>mvel</artifactId> - <version>${mvel.version}</version> - </dependency> </dependencies> </dependencyManagement> </profile>