commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r595913 - in /commons/proper/net/branches/NET_2_0: assembly-src.xml pom.xml src/site/resources/ src/site/resources/images/ src/site/site.xml src/site/xdoc/images/
Date Sat, 17 Nov 2007 06:43:41 GMT
Author: niallp
Date: Fri Nov 16 22:43:40 2007
New Revision: 595913

URL: http://svn.apache.org/viewvc?rev=595913&view=rev
Log:
Improve NET_2_0 m2 build:
- upgrade to latest commons-parent pom (version 5)
- remove Jakarata references
- remove organization and license sections (inherited from commons-parent)
- change subversion links to point to NET_2_0 branch (rather than trunk)
- use properties to specify JDK source/target version and remove compiler plugin (specified
in commons-parent)
- improve commons-net-ftp jar's manifest
- remove javadoc plugin from reporting (in commons-parent)
- move images to default location and add banner right so site is generated with Net image

Added:
    commons/proper/net/branches/NET_2_0/src/site/resources/
    commons/proper/net/branches/NET_2_0/src/site/resources/images/
      - copied from r595911, commons/proper/net/branches/NET_2_0/src/site/xdoc/images/
Removed:
    commons/proper/net/branches/NET_2_0/src/site/xdoc/images/
Modified:
    commons/proper/net/branches/NET_2_0/assembly-src.xml
    commons/proper/net/branches/NET_2_0/pom.xml
    commons/proper/net/branches/NET_2_0/src/site/site.xml

Modified: commons/proper/net/branches/NET_2_0/assembly-src.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/assembly-src.xml?rev=595913&r1=595912&r2=595913&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/assembly-src.xml (original)
+++ commons/proper/net/branches/NET_2_0/assembly-src.xml Fri Nov 16 22:43:40 2007
@@ -21,6 +21,7 @@
     <format>tar.bz2</format>
     <format>zip</format>
   </formats>
+  <baseDirectory>${artifactId}-${version}-src</baseDirectory>
   <fileSets>
     <fileSet>
       <includes>

Modified: commons/proper/net/branches/NET_2_0/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/pom.xml?rev=595913&r1=595912&r2=595913&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/pom.xml (original)
+++ commons/proper/net/branches/NET_2_0/pom.xml Fri Nov 16 22:43:40 2007
@@ -18,17 +18,17 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 
-	<name>Jakarta Commons Net</name>
+	<name>Commons Net</name>
 	<groupId>commons-net</groupId>
 	<artifactId>commons-net</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
 	<inceptionYear>1997</inceptionYear>
-	<description>Jakarta Commons Net</description>
+	<description>Commons Net</description>
 
 	<parent>
 		<groupId>org.apache.commons</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>2-SNAPSHOT</version>
+		<version>5</version>
 	</parent>
 
 
@@ -41,19 +41,6 @@
 
 	<url>http://jakarta.apache.org/commons/net/</url>
 
-	<organization>
-		<name>The Apache Software Foundation</name>
-		<url>http://jakarta.apache.org</url>
-	</organization>
-
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>/LICENSE.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
 	<issueManagement>
 		<url>https://issues.apache.org/jira/browse/NET</url>
 	</issueManagement>
@@ -68,8 +55,8 @@
 
 	<repositories>
 		<repository>
-			<id>jakarta</id>
-			<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk</url>
+			<id>commons</id>
+			<url>http://svn.apache.org/repos/asf/commons/proper/net/trunk</url>
 		</repository>
 		<repository>
 			<id>maven-snapshots</id>
@@ -146,23 +133,19 @@
 	</contributors>
 
 	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk</connection>
-		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk</developerConnection>
-		<url>http://svn.apache.org/viewvc/jakarta/commons/proper/net/trunk</url>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0</connection>
+		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0</developerConnection>
+		<url>http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0</url>
 	</scm>
 
+	<properties>
+		<maven.compile.source>1.5</maven.compile.source>
+		<maven.compile.target>1.5</maven.compile.target>
+	</properties> 
+
 	<build>
 
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0</version>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -184,9 +167,7 @@
 						<descriptor>assembly-src.xml</descriptor>
 						<descriptor>assembly-bin.xml</descriptor>
 					</descriptors>
-					<finalName>commons-net-${version}</finalName>
-					<outputDirectory>target</outputDirectory>
-					<workDirectory>target/assembly</workDirectory>
+					<tarLongFileMode>gnu</tarLongFileMode>
 				</configuration>
 			</plugin>
 
@@ -201,14 +182,15 @@
 								<jar destfile="target/commons-net-ftp-${version}.jar">
 									<fileset dir="target/classes" 
 										includes="org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*"/>
+									<fileset dir="${basedir}" includes="NOTICE.txt"/>
 									<fileset dir="${basedir}" includes="LICENSE.txt"/>
 									<manifest>
 										<attribute name="Extension-Name" value="org.apache.commons.net"/>
-										<attribute name="Specification-Title" value="Jakarta Commons Net"/>
-										<attribute name="Implmentation-Title" value="Jakarta Commons Net"/>
+										<attribute name="Specification-Title" value="Commons Net"/>
+										<attribute name="Implmentation-Title" value="Commons Net"/>
 										<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-										<attribute name="Implementation-Version" value="2.0"/>
-										<attribute name="Implementation-Vendor-Id" value="Apache"/>
+										<attribute name="Implementation-Version" value="${version}"/>
+										<attribute name="Implementation-Vendor-Id" value="org.apache"/>
 
 
 
@@ -264,13 +246,6 @@
 						</reports>
 					</reportSet>
 				</reportSets>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-				</configuration>
 			</plugin>
 
 		</plugins>

Modified: commons/proper/net/branches/NET_2_0/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/site/site.xml?rev=595913&r1=595912&r2=595913&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/site/site.xml (original)
+++ commons/proper/net/branches/NET_2_0/src/site/site.xml Fri Nov 16 22:43:40 2007
@@ -14,7 +14,14 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="Jakarta Commons Net">
+<project name="Commons Net">
+
+  <bannerRight>
+    <name>Commons Net</name>
+    <src>/images/net-logo-white.png</src>
+    <href>/index.html</href>
+  </bannerRight>
+
   <body>
     <menu name="Documentation">
       <item name="Migration How-to"      href="/migration.html"/>



Mime
View raw message