commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r632887 - in /commons/proper/vfs/trunk: core/pom.xml examples/pom.xml pom.xml sandbox/pom.xml src/assembly/ src/assembly/bin.xml src/assembly/src.xml
Date Mon, 03 Mar 2008 00:04:30 GMT
Author: niallp
Date: Sun Mar  2 16:04:29 2008
New Revision: 632887

URL: http://svn.apache.org/viewvc?rev=632887&view=rev
Log:
Improve m2 build:
- Prefix module names with "Commons VFS" (these are used in the jar manifests)
- remove organization and license info (redundant since this is in commons-parent)
- remove maven-compiler-plugin configuration (redundant since this is in commons-parent)
- add testResources to "core" pom so that LICENSE/NOTICE is included in the test jar
- add source and binary assembly descriptors

Added:
    commons/proper/vfs/trunk/src/assembly/
    commons/proper/vfs/trunk/src/assembly/bin.xml   (with props)
    commons/proper/vfs/trunk/src/assembly/src.xml   (with props)
Modified:
    commons/proper/vfs/trunk/core/pom.xml
    commons/proper/vfs/trunk/examples/pom.xml
    commons/proper/vfs/trunk/pom.xml
    commons/proper/vfs/trunk/sandbox/pom.xml

Modified: commons/proper/vfs/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/pom.xml?rev=632887&r1=632886&r2=632887&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/pom.xml (original)
+++ commons/proper/vfs/trunk/core/pom.xml Sun Mar  2 16:04:29 2008
@@ -23,7 +23,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>
 
-	<name>core</name>
+	<name>Commons VFS Core</name>
 	<groupId>org.apache.commons</groupId>
 	<artifactId>commons-vfs</artifactId>
 	<version>1.1-SNAPSHOT</version>
@@ -35,19 +35,6 @@
 		<version>1.1-SNAPSHOT</version>
 	</parent>
 
-
-	<organization>
-		<name>Apache Software Foundation</name>
-		<url>http://www.apache.org/</url>
-	</organization>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
 	<dependencies>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -134,22 +121,31 @@
 			</resource>
 			<resource>
 				<directory>..</directory>
+				<targetPath>META-INF</targetPath>
 				<includes>
 					<include>LICENSE.txt</include>
 				</includes>
 			</resource>
 		</resources>
 
-		<plugins>
+		<!-- include NOTICE/LICENSE in generated test jar -->
+		<testResources>
+			<testResource>
+				<directory>..</directory>
+				<targetPath>META-INF</targetPath>
+				<includes>
+					<include>NOTICE.txt</include>
+				</includes>
+			</testResource>
+			<testResource>
+				<directory>..</directory>
+				<includes>
+					<include>LICENSE.txt</include>
+				</includes>
+			</testResource>
+		</testResources>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<target>1.3</target>
-					<source>1.3</source>
-				</configuration>
-			</plugin>
+		<plugins>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

Modified: commons/proper/vfs/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/examples/pom.xml?rev=632887&r1=632886&r2=632887&view=diff
==============================================================================
--- commons/proper/vfs/trunk/examples/pom.xml (original)
+++ commons/proper/vfs/trunk/examples/pom.xml Sun Mar  2 16:04:29 2008
@@ -23,7 +23,7 @@
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
 
-  <name>examples</name>
+  <name>Commons VFS Examples</name>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-vfs-examples</artifactId>
   <version>1.1-SNAPSHOT</version>
@@ -35,18 +35,6 @@
     <version>1.1-SNAPSHOT</version>
   </parent>
 
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -104,16 +92,22 @@
   </properties> 
 
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <target>1.3</target>
-          <source>1.3</source>
-        </configuration>
-      </plugin>
-    </plugins>
+    <resources>
+      <resource>
+        <directory>..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE.txt</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 
 </project>

Modified: commons/proper/vfs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=632887&r1=632886&r2=632887&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Sun Mar  2 16:04:29 2008
@@ -50,7 +50,7 @@
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/vfs/trunk</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/vfs/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc</url> 
+    <url>http://svn.apache.org/viewvc/commons/proper/vfs/trunk/</url> 
   </scm>
 
   <developers>
@@ -110,6 +110,16 @@
         <artifactId>commons-build-plugin</artifactId>
         <configuration>
             <commons.release.name>commons-${commons.componentid}-${commons.release.version}</commons.release.name>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/bin.xml</descriptor>
+            <descriptor>src/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
       </plugin>
     </plugins>

Modified: commons/proper/vfs/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/pom.xml?rev=632887&r1=632886&r2=632887&view=diff
==============================================================================
--- commons/proper/vfs/trunk/sandbox/pom.xml (original)
+++ commons/proper/vfs/trunk/sandbox/pom.xml Sun Mar  2 16:04:29 2008
@@ -23,7 +23,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>
 
-	<name>sandbox</name>
+	<name>Commons VFS Sandbox</name>
 	<groupId>org.apache.commons</groupId>
 	<artifactId>commons-vfs-sandbox</artifactId>
 	<version>1.1-SNAPSHOT</version>
@@ -35,18 +35,6 @@
 		<version>1.1-SNAPSHOT</version>
 	</parent>
 
-	<organization>
-		<name>Apache Software Foundation</name>
-		<url>http://www.apache.org/</url>
-	</organization>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
 	<dependencies>
                 <dependency>
                         <groupId>commons-logging</groupId>
@@ -120,22 +108,12 @@
 			</resource>
 			<resource>
 				<directory>..</directory>
+				<targetPath>META-INF</targetPath>
 				<includes>
 					<include>LICENSE.txt</include>
 				</includes>
 			</resource>
 		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<target>1.3</target>
-					<source>1.3</source>
-				</configuration>
-			</plugin>
-		</plugins>
 	</build>
 
 </project>

Added: commons/proper/vfs/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/assembly/bin.xml?rev=632887&view=auto
==============================================================================
--- commons/proper/vfs/trunk/src/assembly/bin.xml (added)
+++ commons/proper/vfs/trunk/src/assembly/bin.xml Sun Mar  2 16:04:29 2008
@@ -0,0 +1,58 @@
+<!--
+ 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.
+-->
+<assembly>
+    <id>bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <includeSiteDirectory>false</includeSiteDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>RELEASE_NOTES.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>core/target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>examples/target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>sandbox/target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: commons/proper/vfs/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/vfs/trunk/src/assembly/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: commons/proper/vfs/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/assembly/src.xml?rev=632887&view=auto
==============================================================================
--- commons/proper/vfs/trunk/src/assembly/src.xml (added)
+++ commons/proper/vfs/trunk/src/assembly/src.xml Sun Mar  2 16:04:29 2008
@@ -0,0 +1,66 @@
+<!--
+ 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.
+-->
+<assembly>
+    <id>src</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>build.xml</include>
+                <include>checkstyle.properties</include>
+                <include>LICENSE.txt</include>
+                <include>maven.xml</include>
+                <include>NOTICE.txt</include>
+                <include>pom.xml</include>
+                <include>project.properties</include>
+                <include>project.xml</include>
+                <include>RELEASE_NOTES.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>core</directory>
+            <includes>
+                <include>src/**</include>
+                <include>pom.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>examples</directory>
+            <includes>
+                <include>src/**</include>
+                <include>pom.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>sandbox</directory>
+            <includes>
+                <include>src/**</include>
+                <include>pom.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+        <fileSet>
+            <directory>xdocs</directory>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: commons/proper/vfs/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/vfs/trunk/src/assembly/src.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



Mime
View raw message