You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2005/09/15 18:26:39 UTC
svn commit: r289272 - in /incubator/jackrabbit/trunk: maven.xml
modules/commons/maven.xml modules/commons/project.properties
modules/commons/project.xml
Author: tripod
Date: Thu Sep 15 09:26:27 2005
New Revision: 289272
URL: http://svn.apache.org/viewcvs?rev=289272&view=rev
Log:
- error while building jackrabbit
Added:
incubator/jackrabbit/trunk/modules/commons/project.properties (with props)
Modified:
incubator/jackrabbit/trunk/maven.xml
incubator/jackrabbit/trunk/modules/commons/maven.xml
incubator/jackrabbit/trunk/modules/commons/project.xml
Modified: incubator/jackrabbit/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/maven.xml?rev=289272&r1=289271&r2=289272&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/maven.xml (original)
+++ incubator/jackrabbit/trunk/maven.xml Thu Sep 15 09:26:27 2005
@@ -44,6 +44,7 @@
<!-- Additionally cleans the test data created -->
<postGoal name="clean">
<attainGoal name="test:clean"/>
+ <attainGoal name="jackrabbit:modules-clean"/>
</postGoal>
<!-- deletes the test data -->
@@ -213,6 +214,16 @@
includes="*/project.xml"
goals="jar:install"
banner="Installing Module"
+ ignoreFailures="false"
+ />
+ </goal>
+
+ <goal name="jackrabbit:modules-clean">
+ <maven:reactor
+ basedir="${basedir}/modules"
+ includes="*/project.xml"
+ goals="clean"
+ banner="Cleaning Module"
ignoreFailures="false"
/>
</goal>
Modified: incubator/jackrabbit/trunk/modules/commons/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/modules/commons/maven.xml?rev=289272&r1=289271&r2=289272&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/modules/commons/maven.xml (original)
+++ incubator/jackrabbit/trunk/modules/commons/maven.xml Thu Sep 15 09:26:27 2005
@@ -14,23 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<project
- default="jar:jar"
- xmlns:deploy="deploy"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven">
-
- <!-- overwrite goals from jackrabbit -->
- <goal name="jackrabbit:post-javadoc" />
- <goal name="test:clean" />
- <goal name="jackrabbit:generate-sql-parser" />
- <goal name="jackrabbit:generate-xpath-parser" />
- <goal name="copy-deps" />
- <goal name="jackrabbit:test-stub" />
- <goal name="jackrabbit:test-init" />
- <goal name="jackrabbit:modules-jar" />
- <goal name="jackrabbit:modules-install" />
-
+<project default="jar:jar">
+ <!--
+ override compile goal, since we just need the jar from the
+ compiled classes of jackrabbit
+ -->
+ <goal name="java:compile" />
</project>
Added: incubator/jackrabbit/trunk/modules/commons/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/modules/commons/project.properties?rev=289272&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/modules/commons/project.properties (added)
+++ incubator/jackrabbit/trunk/modules/commons/project.properties Thu Sep 15 09:26:27 2005
@@ -0,0 +1,2 @@
+maven.build.dest=../../target/classes
+maven.jar.excludes=org/apache/jackrabbit/core/**,META-INF/**
\ No newline at end of file
Propchange: incubator/jackrabbit/trunk/modules/commons/project.properties
------------------------------------------------------------------------------
svn =
Propchange: incubator/jackrabbit/trunk/modules/commons/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/jackrabbit/trunk/modules/commons/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/modules/commons/project.xml?rev=289272&r1=289271&r2=289272&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/modules/commons/project.xml (original)
+++ incubator/jackrabbit/trunk/modules/commons/project.xml Thu Sep 15 09:26:27 2005
@@ -21,81 +21,14 @@
<!-- ====================================================================== -->
<!-- P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
- <extend>${basedir}/../../project.xml</extend>
+ <pomVersion>3</pomVersion>
<groupId>jackrabbit</groupId>
<artifactId>jackrabbit-commons</artifactId>
+ <name>Jackrabbit</name>
+ <currentVersion>1.0-SNAPSHOT</currentVersion>
<name>Jackrabbit Commons</name>
<!-- ====================================================================== -->
- <!-- D E P E N D E N C I E S -->
- <!-- ====================================================================== -->
-<!--
- <dependencies>
- <dependency>
- <id>concurrent</id>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <id>junit</id>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <id>commons-collections</id>
- <version>3.1</version>
- </dependency>
- <dependency>
- <id>javacc</id>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0-M1</version>
- </dependency>
- <dependency>
- <groupId>jsr170</groupId>
- <artifactId>jcr</artifactId>
- <version>1.0</version>
- <url>http://jcp.org/en/jsr/detail?id=170</url>
- </dependency>
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>lucene</groupId>
- <artifactId>lucene</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.0.2</version>
- </dependency>
- <dependency>
- <groupId>cqfs</groupId>
- <artifactId>cqfs-jackrabbit</artifactId>
- <version>3.5.6-SNAPSHOT</version>
- <url>http://www.day.com/maven/cqfs/jars/cqfs-jackrabbit-3.5.6-SNAPSHOT.jar</url>
- </dependency>
- <dependency>
- <groupId>cqfs</groupId>
- <artifactId>cqfs</artifactId>
- <version>3.5.6-SNAPSHOT</version>
- <url>http://www.day.com/maven/cqfs/jars/cqfs-3.5.6-SNAPSHOT.jar</url>
- </dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0</version>
- </dependency>
- </dependencies>
--->
- <!-- ====================================================================== -->
<!-- B U I L D D E S C R I P T I O N -->
<!-- ====================================================================== -->
<build>
@@ -114,11 +47,10 @@
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
- <directory>src/java</directory>
+ <directory>${basedir}/../../src/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
- <include>**/*.TextFilterService</include>
</includes>
<excludes>
<exclude>org/apache/jackrabbit/core/**</exclude>