jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r482427 - in /jackrabbit/trunk: ./ jackrabbit-api/ jackrabbit-core/ jackrabbit-index-filters/ jackrabbit-jca/ jackrabbit-jcr-commons/ jackrabbit-jcr-rmi/ jackrabbit-jcr-server/ jackrabbit-jcr-tests/ jackrabbit-webapp/ jackrabbit-webdav/
Date Tue, 05 Dec 2006 00:19:38 GMT
Author: jukka
Date: Mon Dec  4 16:19:36 2006
New Revision: 482427

URL: http://svn.apache.org/viewvc?view=rev&rev=482427
Log:
JCR-332: Use antrun instead of a resource definition to include project files in META-INF.
Also some other POM cleanups.

Modified:
    jackrabbit/trunk/jackrabbit-api/pom.xml
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-index-filters/pom.xml
    jackrabbit/trunk/jackrabbit-jca/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-server/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml
    jackrabbit/trunk/jackrabbit-webapp/pom.xml
    jackrabbit/trunk/jackrabbit-webdav/pom.xml
    jackrabbit/trunk/pom.xml

Modified: jackrabbit/trunk/jackrabbit-api/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-api/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-api/pom.xml Mon Dec  4 16:19:36 2006
@@ -46,21 +46,6 @@
     <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api</url>
   </scm>
 
-  <build>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>javax.jcr</groupId>

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Mon Dec  4 16:19:36 2006
@@ -48,15 +48,6 @@
           <include>**/*.cnd</include>
         </includes>
       </resource>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
     </resources>
     <testResources>
       <testResource>

Modified: jackrabbit/trunk/jackrabbit-index-filters/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-index-filters/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-index-filters/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-index-filters/pom.xml Mon Dec  4 16:19:36 2006
@@ -46,21 +46,6 @@
     <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-index-filters</url>
   </scm>
 
-  <build>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>

Modified: jackrabbit/trunk/jackrabbit-jca/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jca/pom.xml Mon Dec  4 16:19:36 2006
@@ -52,18 +52,6 @@
   </scm>
 
   <build>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-rar-plugin</artifactId>

Modified: jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml Mon Dec  4 16:19:36 2006
@@ -46,21 +46,6 @@
     <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons</url>
   </scm>
 
-  <build>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>javax.jcr</groupId>

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Mon Dec  4 16:19:36 2006
@@ -41,25 +41,6 @@
   <description>JCR-RMI is a transparent Remote Method Invocation (RMI) layer for the
Content Repository for Java Technology API (JCR). The layer makes it possible to remotely
access JCR content repositories. JCR-RMI is developed as a part of the Apache Jackrabbit project,
but the implementation is compatible with all JCR content repositories.</description>
 
   <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <testSourceDirectory>src/testjava/</testSourceDirectory>
-    <resources>
-      <!-- Does not work with eclipse. Maybe we can move README.txt to src/main/resources?
-->
-      <!-- resource>
-        <targetPath>META-INF</targetPath>
-        <directory>.</directory>
-        <includes>
-        <include>README.txt</include>
-        </includes>
-        </resource -->
-      <resource>
-        <targetPath>.</targetPath>
-        <directory>${basedir}src/main/resources</directory>
-        <includes>
-          <include>*</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <inherited>true</inherited>
@@ -102,19 +83,6 @@
           </dependency>
         </dependencies>
       </plugin>
-      <!-- plugin>
-        <inherited>true</inherited>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-        <execution>
-        <id>attach-javadocs</id>
-        <goals>
-        <goal>jar</goal>
-        </goals>
-        </execution>
-        </executions>
-        </plugin -->
     </plugins>
   </build>
 

Modified: jackrabbit/trunk/jackrabbit-jcr-server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/pom.xml Mon Dec  4 16:19:36 2006
@@ -49,16 +49,6 @@
   <build>
     <resources>
       <resource>
-        <targetPath>META-INF</targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
         <directory>${basedir}/src/main/java</directory>
         <includes>
           <include>**/*.properties</include>

Modified: jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/pom.xml Mon Dec  4 16:19:36 2006
@@ -46,28 +46,6 @@
     <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests</url>
   </scm>
 
-  <build>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <filtering>false</filtering>
-        <directory>.</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <filtering>false</filtering>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>org/apache/jackrabbit/test/api/nodetype/spec/*.txt</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>javax.jcr</groupId>

Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Mon Dec  4 16:19:36 2006
@@ -47,21 +47,6 @@
     <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp</url>
   </scm>
 
-  <build>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>

Modified: jackrabbit/trunk/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webdav/pom.xml Mon Dec  4 16:19:36 2006
@@ -49,16 +49,6 @@
   <build>
     <resources>
       <resource>
-        <targetPath>META-INF</targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>README.txt</include>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
         <directory>${basedir}/src/main/java</directory>
         <includes>
           <include>**/*.properties</include>

Modified: jackrabbit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/pom.xml?view=diff&rev=482427&r1=482426&r2=482427
==============================================================================
--- jackrabbit/trunk/pom.xml (original)
+++ jackrabbit/trunk/pom.xml Mon Dec  4 16:19:36 2006
@@ -84,10 +84,33 @@
           </execution>
         </executions>
       </plugin>
-      <!-- JCR-661: Plugin dependencies are inherited -->
       <plugin>
+        <inherited>true</inherited>
         <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <!-- Include the project metadata files in META-INF -->
+          <execution>
+            <id>add-project-files</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <echo message="foo"/>
+                <copy todir="${project.build.outputDirectory}/META-INF">
+                  <fileset dir="${basedir}">
+                    <include name="README.txt"/>
+                    <include name="NOTICE.txt"/>
+                    <include name="LICENSE.txt"/>
+                  </fileset>
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
         <dependencies>
+          <!-- JCR-661: Plugin dependencies are inherited -->
           <dependency>
             <groupId>sun</groupId>
             <artifactId>tools</artifactId>



Mime
View raw message