You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/03/07 08:12:18 UTC
svn commit: r383810 - in
/incubator/jackrabbit/trunk/jackrabbit/modules/commons: maven.xml
project.properties project.xml
Author: jukka
Date: Mon Mar 6 23:12:16 2006
New Revision: 383810
URL: http://svn.apache.org/viewcvs?rev=383810&view=rev
Log:
JCR-330: Refactored the jackrabbit-commons build setup to include the .txt files in META-INF of the generated jar file.
Removed:
incubator/jackrabbit/trunk/jackrabbit/modules/commons/project.properties
Modified:
incubator/jackrabbit/trunk/jackrabbit/modules/commons/maven.xml
incubator/jackrabbit/trunk/jackrabbit/modules/commons/project.xml
Modified: incubator/jackrabbit/trunk/jackrabbit/modules/commons/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/modules/commons/maven.xml?rev=383810&r1=383809&r2=383810&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/modules/commons/maven.xml (original)
+++ incubator/jackrabbit/trunk/jackrabbit/modules/commons/maven.xml Mon Mar 6 23:12:16 2006
@@ -14,10 +14,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project default="jar:install">
+<project default="jar:install" xmlns:ant="jelly:ant">
<!--
override compile goal, since we just need the jar from the
compiled classes of jackrabbit
-->
- <goal name="java:compile" />
+ <goal name="java:compile">
+ <ant:copy todir="${maven.build.dest}">
+ <ant:fileset dir="${basedir}/../../target/classes">
+ <ant:exclude name="META-INF/**"/>
+ <ant:exclude name="org/apache/jackrabbit/core/**"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:copy todir="${maven.build.dest}/META-INF">
+ <ant:fileset dir="${basedir}/../..">
+ <ant:include name="README.txt"/>
+ <ant:include name="NOTICE.txt"/>
+ <ant:include name="LICENSE.txt"/>
+ </ant:fileset>
+ </ant:copy>
+ </goal>
</project>
Modified: incubator/jackrabbit/trunk/jackrabbit/modules/commons/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/modules/commons/project.xml?rev=383810&r1=383809&r2=383810&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/modules/commons/project.xml (original)
+++ incubator/jackrabbit/trunk/jackrabbit/modules/commons/project.xml Mon Mar 6 23:12:16 2006
@@ -24,39 +24,6 @@
<pomVersion>3</pomVersion>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-commons</artifactId>
- <name>Jackrabbit</name>
<currentVersion>1.0-SNAPSHOT</currentVersion>
<name>Jackrabbit Commons</name>
-
- <!-- ====================================================================== -->
- <!-- B U I L D D E S C R I P T I O N -->
- <!-- ====================================================================== -->
- <build>
- <sourceDirectory>${basedir}/../../src/java</sourceDirectory>
- <sourceModifications>
- <sourceModification>
- <className>dummy</className>
- <directory>${basedir}/../../src/java</directory>
- <excludes>
- <exclude>org/apache/jackrabbit/core/**</exclude>
- </excludes>
- </sourceModification>
- </sourceModifications>
-
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
- <resources>
- <resource>
- <directory>${basedir}/../../src/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- <excludes>
- <exclude>org/apache/jackrabbit/core/**</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
</project>