You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2009/10/15 09:31:38 UTC
svn commit: r825421 - in /cocoon/cocoon3/trunk: cocoon-optional/pom.xml
parent/pom.xml
Author: reinhard
Date: Thu Oct 15 07:31:38 2009
New Revision: 825421
URL: http://svn.apache.org/viewvc?rev=825421&view=rev
Log:
Make Solr dependencies optional
Solr dependencies come with org.apache.commons:commons-io dependency -> exclude it because this conflicts with commons-io:commons-io
define versions in parent POM only
Prepare cocoon-serializers-charsets dependencies
Modified:
cocoon/cocoon3/trunk/cocoon-optional/pom.xml
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-optional/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/pom.xml?rev=825421&r1=825420&r2=825421&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/pom.xml Thu Oct 15 07:31:38 2009
@@ -49,10 +49,15 @@
<artifactId>cocoon-sax</artifactId>
</dependency>
<!-- Other libraries -->
- <dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.servlet</groupId>
+ <artifactId>cocoon-servlet</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>commons-betwixt</groupId>
<artifactId>commons-betwixt</artifactId>
- <optional>true</optional>
+ <optional>true</optional>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -79,21 +84,24 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-serializers-charsets</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>1.3.0</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>1.3.0</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>test</scope>
- </dependency>
<!-- Test libraries -->
<dependency>
<groupId>junit</groupId>
@@ -106,4 +114,30 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>data/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=825421&r1=825420&r2=825421&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Thu Oct 15 07:31:38 2009
@@ -166,8 +166,13 @@
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
- </dependency>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-serializers-charsets</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
<!-- Spring (+ AOP support)-->
<dependency>
<groupId>org.springframework</groupId>
@@ -307,6 +312,28 @@
<version>3.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>1.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>1.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.7</version>