Author: rwinston
Date: Sun Nov 8 23:17:55 2009
New Revision: 833942
URL: http://svn.apache.org/viewvc?rev=833942&view=rev
Log:
Update for rel vote
Modified:
commons/proper/net/branches/NET_2_0/NOTICE.txt
commons/proper/net/branches/NET_2_0/pom.xml
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
Modified: commons/proper/net/branches/NET_2_0/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/NOTICE.txt?rev=833942&r1=833941&r2=833942&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/NOTICE.txt (original)
+++ commons/proper/net/branches/NET_2_0/NOTICE.txt Sun Nov 8 23:17:55 2009
@@ -1,5 +1,5 @@
Apache Commons Net
-Copyright 2001-2008 The Apache Software Foundation
+Copyright 2001-2009 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
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=833942&r1=833941&r2=833942&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/pom.xml (original)
+++ commons/proper/net/branches/NET_2_0/pom.xml Sun Nov 8 23:17:55 2009
@@ -16,18 +16,16 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>11</version>
+ <version>12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<name>Commons Net</name>
<description>
A collection of network utilities and protocol implementations.
@@ -37,11 +35,11 @@
<system>jira</system>
<url>http://issues.apache.org/jira/browse/NET</url>
</issueManagement>
- <inceptionYear>1997</inceptionYear>
+ <inceptionYear>2001</inceptionYear>
<scm>
-
<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>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/net/tags/commons-net-2.1</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/net/tags/commons-net-2.1</developerConnection>
+
<url>http://svn.apache.org/viewvc/commons/proper/net/tags/commons-net-2.1</url>
</scm>
<distributionManagement>
@@ -84,7 +82,7 @@
<name>Rory Winston</name>
<id>rwinston</id>
<email>rwins...@apache.org</email>
- <organization></organization>
+ <organization />
</developer>
</developers>
@@ -126,7 +124,7 @@
<maven.compile.target>1.5</maven.compile.target>
<commons.componentid>net</commons.componentid>
<commons.release.version>2.0</commons.release.version>
- <commons.binary.suffix></commons.binary.suffix>
+ <commons.binary.suffix />
<commons.jira.id>NET</commons.jira.id>
<commons.jira.pid>12310487</commons.jira.pid>
</properties>
@@ -175,19 +173,18 @@
<configuration>
<tasks>
<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="target/classes"
includes="org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*"
/>
-
<metainf dir="${basedir}" includes="NOTICE.txt,LICENSE.txt"/>
+
<metainf dir="${basedir}" includes="NOTICE.txt,LICENSE.txt" />
<manifest>
-
<attribute name="Extension-Name" value="org.apache.commons.net"/>
-
<attribute name="Specification-Title" value="${project.name}"/>
-
<attribute name="Implementation-Title" value="${project.name}"/>
-
<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
-
<attribute name="Implementation-Version" value="${version}"/>
-
<attribute name="Implementation-Vendor-Id" value="org.apache"/>
-
<attribute name="X-Compile-Source-JDK" value="${maven.compile.source}"/>
-
<attribute name="X-Compile-Target-JDK" value="${maven.compile.target}"/>
+
<attribute name="Extension-Name" value="org.apache.commons.net" />
+
<attribute name="Specification-Title" value="${project.name}" />
+
<attribute name="Implementation-Title" value="${project.name}" />
+
<attribute name="Implementation-Vendor" value="${project.organization.name}" />
+
<attribute name="Implementation-Version" value="${version}" />
+
<attribute name="Implementation-Vendor-Id" value="org.apache" />
+
<attribute name="X-Compile-Source-JDK" value="${maven.compile.source}" />
+
<attribute name="X-Compile-Target-JDK" value="${maven.compile.target}" />
</manifest>
</jar>
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java?rev=833942&r1=833941&r2=833942&view=diff
==============================================================================
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
Sun Nov 8 23:17:55 2009
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
package org.apache.commons.net.nntp;
/**
