You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/08/16 22:27:27 UTC
svn commit: r566830 - in /portals/jetspeed-2/trunk/components: ./
jetspeed-cm/pom.xml jetspeed-portal/pom.xml jetspeed-serializer/pom.xml
jetspeed-utils/pom.xml
Author: ate
Date: Thu Aug 16 13:27:26 2007
New Revision: 566830
URL: http://svn.apache.org/viewvc?view=rev&rev=566830
Log:
JS2-770: Provide a new maven-2 (only) build environment and restructure the source tree according to the maven-2 conventions
See: http://issues.apache.org/jira/browse/JS2-770
Fixing to be excluded transitive dependencies (pulled in by commons-configuration & commons-logging)
Modified:
portals/jetspeed-2/trunk/components/ (props changed)
portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-serializer/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml
Propchange: portals/jetspeed-2/trunk/components/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 16 13:27:26 2007
@@ -1,2 +1,2 @@
-target
+target
surefire*.properties
Modified: portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml?view=diff&rev=566830&r1=566829&r2=566830
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-cm/pom.xml Thu Aug 16 13:27:26 2007
@@ -127,7 +127,20 @@
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
- </dependency>
+ </dependency>
+
+ <!-- defining optional dependencies which are included transitively so their exclusions (defined in the root pom) are honored -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+
</dependencies>
<!-- Build Configuration -->
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml?view=diff&rev=566830&r1=566829&r2=566830
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/pom.xml Thu Aug 16 13:27:26 2007
@@ -190,6 +190,19 @@
<artifactId>activation</artifactId>
<scope>runtime</scope>
</dependency>
+
+ <!-- defining optional dependencies which are included transitively so their exclusions (defined in the root pom) are honored -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+
</dependencies>
</project>
Modified: portals/jetspeed-2/trunk/components/jetspeed-serializer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-serializer/pom.xml?view=diff&rev=566830&r1=566829&r2=566830
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-serializer/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-serializer/pom.xml Thu Aug 16 13:27:26 2007
@@ -95,6 +95,14 @@
<artifactId>xercesImpl</artifactId>
<scope>runtime</scope>
</dependency>
+
+ <!-- defining optional dependencies which are included transitively so their exclusions (defined in the root pom) are honored -->
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+
</dependencies>
</project>
Modified: portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml?view=diff&rev=566830&r1=566829&r2=566830
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml Thu Aug 16 13:27:26 2007
@@ -53,6 +53,19 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+
+ <!-- defining optional dependencies which are included transitively so their exclusions (defined in the root pom) are honored -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org