Prepare the Felix 1.2 release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@690798 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/NOTICE b/framework/NOTICE
index f57eb88..b5cd7ad 100644
--- a/framework/NOTICE
+++ b/framework/NOTICE
@@ -10,7 +10,7 @@
This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
@@ -18,7 +18,7 @@
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
diff --git a/framework/doc/changelog.txt b/framework/doc/changelog.txt
index 6e40e4f..038d42c 100644
--- a/framework/doc/changelog.txt
+++ b/framework/doc/changelog.txt
@@ -1,3 +1,31 @@
+Changes from 1.0.4 to 1.2.0
+---------------------------
+
+* [2008-08-29] Support JAR-wide manifest package metadata. (FELIX-682)
+* [2008-08-29] Throw an exception when installing a fragment that uses
+ features that we do not support.
+* [2008-08-20] Improve error reporting when loading bundle classes using
+ Bundle.loadClass.
+* [2008-08-16] Fix attribute checking when resolving dynamic imports.
+ (FELIX-676)
+* [2008-08-08] Implement singleton bundle support. (FELIX-102)
+* [2008-08-06] Default to current security policy if no security extension is
+ installed in order to make Subject.doAs work. (FELIX-654)
+* [2008-08-04] Return Bundle.getLastModified() for bundle URLs
+ lastModified(). (FELIX-582)
+* [2008-08-04] Improve handling of improper resource URLs. (FELIX-577)
+* [2008-08-01] Add necessary stub methods to implement new R4.1 methods.
+ (FELIX-595)
+* [2008-08-01] Applied patch to properly return symbolic name when it has
+ parameters. (FELIX-650)
+* [2008-07-25] Fix some rollback issues after a bundle update throws an
+ exception. (FELIX-647)
+* [2008-07-23] Modified manifest parser to be more lenient. (FELIX-641)
+* [2008-07-07] Add support for the standard symbolic name for the system
+ bundle. (FELIX-602)
+* [2008-06-01] Add initial fragment support for extending the host bundle
+ class path. (FELIX-29, FELIX-656)
+
Changes from 1.0.3 to 1.0.4
___________________________
diff --git a/framework/pom.xml b/framework/pom.xml
index 06dbc55..13b7590 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -32,12 +32,12 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
</dependencies>
<build>
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>