portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r674290 - in /portals/jetspeed-2/portal/trunk/applications: ./ jetspeed-dependencies/ jetspeed-dependencies/pom.xml
Date Sun, 06 Jul 2008 12:35:05 GMT
Author: ate
Date: Sun Jul  6 05:35:05 2008
New Revision: 674290

URL: http://svn.apache.org/viewvc?rev=674290&view=rev
Log:
- fix incorrectly pulled in dependencies for servlet-api and portals-bridges-common
- add target folders to svn:ignore

Modified:
    portals/jetspeed-2/portal/trunk/applications/   (props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/   (props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml

Propchange: portals/jetspeed-2/portal/trunk/applications/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul  6 05:35:05 2008
@@ -1,3 +1,5 @@
 bin
 
 .project
+
+target

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul  6 05:35:05 2008
@@ -0,0 +1 @@
+target

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml?rev=674290&r1=674289&r2=674290&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml Sun Jul  6
05:35:05 2008
@@ -47,6 +47,16 @@
           <groupId>dom4j</groupId>
           <artifactId>dom4j</artifactId>
         </exclusion>
+        <!-- brought in by commons-configuration -->
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <!-- commons-configuration pulls in old xerces:xerces 2.0.2 -->
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xerces</artifactId>          
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -135,6 +145,15 @@
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed-portal</artifactId>
+      <exclusions>
+        <!-- brought in by portals-bridges-velocity (1.0.3) 
+             TODO: we should fix this for bridges 1.0.4
+         -->
+        <exclusion>
+          <groupId>org.apache.portals.bridges</groupId>
+          <artifactId>portals-bridges-common</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -151,12 +170,18 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-
+    
   </dependencies>
 
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message