Update version, NOTICE files.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@687807 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 48 insertions, 5 deletions

diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac
index 5e478c68cf..a17cdf25ac 100644
--- a/qpid/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
@@ -8,7 +8,7 @@ dnl This program is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT([qpidc], [0.2], [qpid-dev@incubator.apache.org])
+AC_INIT([qpidc], [incubating-M3], [qpid-dev@incubator.apache.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
 
diff --git a/qpid/dotnet/NOTICE.txt b/qpid/dotnet/NOTICE.txt
index 910974b01c..0b22ed3ab2 100644
--- a/qpid/dotnet/NOTICE.txt
+++ b/qpid/dotnet/NOTICE.txt
@@ -23,4 +23,10 @@ This product also includes software developed by:
 
   - The Mentalis Security Library, Copyright © 2002-2006, , The Mentalis.org Team
     under tterms based on the BSD license (http://www.mentalis.org/site/license.qpx).
-    Available from http://www.mentalis.org/soft/projects/seclib/
\ No newline at end of file
+    Available from http://www.mentalis.org/soft/projects/seclib/
+
+This product includes software, Apache Log4Net
+(http://logging.apache.org/log4net)
+License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
+
+
diff --git a/qpid/dotnet/default.build b/qpid/dotnet/default.build
index 52a67ff638..f719d82c80 100644
--- a/qpid/dotnet/default.build
+++ b/qpid/dotnet/default.build
@@ -8,8 +8,8 @@
     <property name="build.config" value="debug" />

 

     <!-- Sets build properties consistently accross all assemblies in the project. -->

-    <property name="build.version.major" value="2"/>

-    <property name="build.version.minor" value="1"/>

+    <property name="build.version.major" value="0"/>

+    <property name="build.version.minor" value="3"/>

     <property name="build.version.build" value="0"/>

     <property name="build.version.revision" value="0"/>

     <property name="build.company" value="Apache Software Foundation"/>

diff --git a/qpid/java/resources/NOTICE b/qpid/java/resources/NOTICE
index f62ec14896..79768ab677 100644
--- a/qpid/java/resources/NOTICE
+++ b/qpid/java/resources/NOTICE
@@ -4,7 +4,7 @@
 // ------------------------------------------------------------------
 
 Apache Qpid
-Copyright 2006-2007 Apache Software Foundation
+Copyright 2006-2008 Apache Software Foundation
 
 This product includes software developed at
 Apache Software Foundation (http://www.apache.org/)
@@ -103,3 +103,40 @@ This product includes/uses software, Saxon - saxpath:saxpath:jar:1.0-FCS
 developed by Michael Kay (http://saxon.sourceforge.net/)
 License: Mozilla Public License v1.0, (http://www.opensource.org/licenses/mozilla1.0.php)
 
+This product includes/uses software, Felix (http://felix.apache.org)
+developed by Apache Software Foundation  (http://www.apache.org)
+License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
+
+This product uses/references the following software from Eclipse.
+License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html)
+(Note: the versions are ommited and only the name is specified.)
+org.eclipse.jface
+org.eclipse.core.*
+org.eclipse.equinox.* 
+org.eclipse.osgi
+org.eclipse.swt
+Source available from : http://archive.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/index.php
+
+This product includes/uses software, ICU4J - ICU4J 3.4.4
+developed by the ICU Project (http://icu-project.org/)
+License: http://source.icu-project.org/repos/icu/icu/trunk/license.html
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 The OSGi Alliance.
+Licensed under the Apache License 2.0.
+
+This product includes/uses software, Javacc - javacc.jar
+License: BSD License (https://javacc.dev.java.net/)
+
+This product includes/uses software, SLF4J API Module (http://www.slf4j.org),
+developed by QOS.ch  (http://www.qos.ch)
+Source included with binary builds at : http://slf4j.org/dist
+License: MIT License (http://www.slf4j.org/license.html)
+
+This product includes/uses software, JUnit Toolkit (http://sourceforge.net/projects/junit-toolkit/)
+License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
+
+This product includes/uses software, Apache Log4j (http://logging.apache.org/log4j/1.2)
+License: Apache 2.0 License  (http://www.apache.org/licenses/LICENSE-2.0)
+