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 17:08:04 UTC
svn commit: r566744 [2/2] - in /portals/jetspeed-2/trunk: ./ components/
components/jetspeed-capability/ components/jetspeed-cm/
components/jetspeed-deploy-tools/ components/jetspeed-file-cache/
components/jetspeed-header-resource/ components/jetspeed-...
Added: portals/jetspeed-2/trunk/components/jetspeed-sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-sso/pom.xml?view=auto&rev=566744
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-sso/pom.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-sso/pom.xml Thu Aug 16 08:08:00 2007
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.7</maven>
+ </prerequisites>
+
+ <artifactId>jetspeed-sso</artifactId>
+ <name>Jetspeed-2 Single Sign On SSO Components</name>
+ <description>Jetspeed-2 Single Sign On SSO Components</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-rdbms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-sso/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-sso/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-sso/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: portals/jetspeed-2/trunk/components/jetspeed-statistics/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 16 08:08:00 2007
@@ -1,3 +1,9 @@
target
surefire*.properties
jcoverage.ser
+
+.classpath
+
+.project
+
+.settings
Added: portals/jetspeed-2/trunk/components/jetspeed-statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-statistics/pom.xml?view=auto&rev=566744
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-statistics/pom.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-statistics/pom.xml Thu Aug 16 08:08:00 2007
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.7</maven>
+ </prerequisites>
+
+ <artifactId>jetspeed-statistics</artifactId>
+ <name>Jetspeed-2 Portal Statistics Components</name>
+ <description>Jetspeed-2 Portal Statistics Components</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-rdbms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-registry</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-security</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockrunner</groupId>
+ <artifactId>mockrunner</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-statistics/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-statistics/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-statistics/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: portals/jetspeed-2/trunk/components/jetspeed-utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 16 08:08:00 2007
@@ -1,3 +1,9 @@
target
surefire*.properties
jcoverage.ser
+
+.project
+
+.classpath
+
+.settings
Added: 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=auto&rev=566744
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml Thu Aug 16 08:08:00 2007
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.7</maven>
+ </prerequisites>
+
+ <artifactId>jetspeed-components</artifactId>
+ <name>Jetspeed-2 Components</name>
+ <description>Jetspeed-2 Components</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-utils/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: portals/jetspeed-2/trunk/components/jetspeed-web-content/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 16 08:08:00 2007
@@ -1,3 +1,9 @@
target
surefire*.properties
jcoverage.ser
+
+.settings
+
+.project
+
+.classpath
Added: portals/jetspeed-2/trunk/components/jetspeed-web-content/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-web-content/pom.xml?view=auto&rev=566744
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-web-content/pom.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-web-content/pom.xml Thu Aug 16 08:08:00 2007
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.7</maven>
+ </prerequisites>
+
+ <artifactId>jetspeed-web-content</artifactId>
+ <name>Jetspeed-2 Web Content</name>
+ <description>Jetspeed-2 Web Content</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
+
+ <!-- Dependencies -->
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-rewriter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-velocity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-web-content/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-web-content/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-web-content/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: portals/jetspeed-2/trunk/components/jetspeed-webapp-logging/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 16 08:08:00 2007
@@ -1,3 +1,9 @@
target
surefire*.properties
jcoverage.ser
+
+.settings
+
+.classpath
+
+.project
Added: portals/jetspeed-2/trunk/components/jetspeed-webapp-logging/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-webapp-logging/pom.xml?view=auto&rev=566744
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-webapp-logging/pom.xml (added)
+++ portals/jetspeed-2/trunk/components/jetspeed-webapp-logging/pom.xml Thu Aug 16 08:08:00 2007
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.7</maven>
+ </prerequisites>
+
+ <artifactId>jetspeed-webapp-logging</artifactId>
+ <name>Jetspeed-2 WebApp Logging</name>
+ <description>
+ The Jetspeed-2 Web Application Logging Utils allow one to use jakarta commons-logging together with Log4J in a web application
+ isolated from other Log4J configurations of your App Server and/or other web applications.
+ </description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>components</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <packaging>jar</packaging>
+
+ <dependencies>
+
+ <!-- Build Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/jetspeed-webapp-logging/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/jetspeed-webapp-logging/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/jetspeed-webapp-logging/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/pom.xml?view=auto&rev=566744
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (added)
+++ portals/jetspeed-2/trunk/components/pom.xml Thu Aug 16 08:08:00 2007
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.7</maven>
+ </prerequisites>
+
+ <artifactId>components</artifactId>
+ <name>Jetspeed-2 Components</name>
+ <description>Jetspeed-2 Components</description>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <artifactId>jetspeed-2</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>jetspeed-capability</module>
+ <module>jetspeed-cm</module>
+ <module>jetspeed-deploy-tools</module>
+ <module>jetspeed-file-cache</module>
+ <module>jetspeed-header-resource</module>
+ <module>jetspeed-id-generator</module>
+ <module>jetspeed-locator</module>
+ <module>jetspeed-page-manager</module>
+ <module>jetspeed-portal</module>
+ <module>jetspeed-portal-site</module>
+ <module>jetspeed-portlet-factory</module>
+ <module>jetspeed-prefs</module>
+ <module>jetspeed-profiler</module>
+ <module>jetspeed-rdbms</module>
+ <module>jetspeed-registry</module>
+ <module>jetspeed-rewriter</module>
+ <module>jetspeed-search</module>
+ <module>jetspeed-security</module>
+ <module>jetspeed-serializer</module>
+ <module>jetspeed-sso</module>
+ <module>jetspeed-statistics</module>
+ <module>jetspeed-utils</module>
+ <module>jetspeed-web-content</module>
+ <module>jetspeed-webapp-logging</module>
+ </modules>
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/trunk/components/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/trunk/components/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?view=diff&rev=566744&r1=566743&r2=566744
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Thu Aug 16 08:08:00 2007
@@ -200,7 +200,7 @@
<repository>
<id>org.apache</id>
<name>Maven1 Apache</name>
- <url>http://www.ibiblio.org/maven2</url>
+ <url>http://repo1.maven.org/maven</url>
<layout>legacy</layout>
</repository>
</repositories>
@@ -227,11 +227,11 @@
<properties>
<!-- Default Build Properties -->
- <!--
+
<maven.test.skip>true</maven.test.skip>
- -->
+
<!-- Build Dependency Version Properties -->
- <ant.version>1.6.5</ant.version>
+ <ant.version>1.7</ant.version>
<jmock.version>1.0.1</jmock.version>
<junit.version>3.8.1</junit.version>
<mockrunner.version>0.3.8</mockrunner.version>
@@ -538,6 +538,12 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>${cglib.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
@@ -616,7 +622,7 @@
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>${regexp.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
@@ -631,6 +637,16 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -682,7 +698,31 @@
<artifactId>ehcache</artifactId>
<version>${ehcache.version}</version>
</dependency>
-
+
+ <!-- defining dom4j (which is included by commons-configuration) just to be able to exclude
+ isorelax, msv and relaxngDatatype
+ -->
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <optional>true</optional>
+ <version>[1.4,)</version>
+ <exclusions>
+ <exclusion>
+ <groupId>isorelax</groupId>
+ <artifactId>isorelax</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>msv</groupId>
+ <artifactId>msv</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>relaxngDatatype</groupId>
+ <artifactId>relaxngDatatype</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- Test -->
<dependency>
<groupId>junit</groupId>
@@ -992,47 +1032,6 @@
<scope>test</scope>
</dependency>
- <!-- Transitive Dependencies forced out -->
-<!-- Commented out for now as the eclipse:eclipse adds these to the eclipse classpath :(
- When the new m2 build evironment is working again these unneeded deps need to be tracked down and excluded from those dependencies which include them
-
- <dependency>
- <groupId>isorelax</groupId>
- <artifactId>isorelax</artifactId>
- <version>20020414</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>1.5.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>msv</groupId>
- <artifactId>msv</artifactId>
- <version>20020414</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>relaxngDatatype</groupId>
- <artifactId>relaxngDatatype</artifactId>
- <version>20020414</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.3</version>
- <scope>provided</scope>
- </dependency>
--->
</dependencies>
<!-- Global Build Configuration -->
@@ -1103,6 +1102,7 @@
<modules>
<module>jetspeed-api</module>
<module>jetspeed-commons</module>
+ <module>components</module>
</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org