[maven-release-plugin] copy for tag org.apache.felix.ipojo.annotations-1.6.0
git-svn-id: https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.annotations-1.6.0@934912 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE b/NOTICE
index 116de41..c20d6f7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Felix iPOJO Annotations
-Copyright 2008-2009 The Apache Software Foundation
+Copyright 2008-2010 The Apache Software Foundation
I. Included Software
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 6dbbdb9..361277a 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,3 +1,19 @@
+Changes from the 1.4.0 to 1.6.0
+-------------------------------
+** Bug
+ * [FELIX-1557] - Cosmetic change of the Bundle-Name and Bundle-SymbolicName in iPOJO annotations.
+
+** Improvement
+ * [FELIX-1426] - Service injection with Dynamic Proxies
+ * [FELIX-1427] - Service injection with Smart Proxies
+ * [FELIX-1906] - Allow calling a method when service properties of an already injected service are modified
+
+** New Feature
+ * [FELIX-2132] - Provides a way to control service exposition from the implementation class
+
+** Wish
+ * [FELIX-1940] - Add @Instance annotation to declare instances without metadata.xml
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug
diff --git a/pom.xml b/pom.xml
index 770d4be..dcff2fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0</version>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Annotations</name>
@@ -99,4 +99,10 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.annotations-1.6.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.annotations-1.6.0</developerConnection>
+ <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.ipojo.annotations-1.6.0</url>
+ </scm>
</project>
