FELIX-4922: changelog file is now centralized in release/resource/changelog.txt
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1684992 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
index 29aeb39..a790f08 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
@@ -27,7 +27,7 @@
Include-Resource: META-INF/=resources/LICENSE,\
META-INF/=resources/NOTICE,\
META-INF/=resources/DEPENDENCIES,\
- META-INF/=resources/changelog.txt
+ META-INF/=${workspace}/release/resources/changelog.txt
Bundle-Name: Apache Felix Dependency Manager Annotations
Bundle-Description: Annotations for Apache Felix Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/changelog.txt
deleted file mode 100644
index 36c7dcb..0000000
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/changelog.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Release org.apache.felix.dependencymanager.r3:
----------------------------------------------
-
-** Improvement
- * [FELIX-4876] - DM Annotations bnd plugin compatibility with Bndtools 2.4.1 / 3.0.0 versions
- * [FELIX-4877] - DM Annotations should detect service type using more method signatures.
-
-Release org.apache.felix.dependencymanager.r2:
----------------------------------------------
-
-FELIX-4833: Revisit some javadocs in the DM annotations.
-
-Release org.apache.felix.dependencymanager.r1:
----------------------------------------------
-
-FELIX-4805: Deprecate DM annotation metatypes
-FELIX-4777: Dynamic initialization time configuration of @ConfigurationDependency
-FELIX-4676: Add Provide-Capability for DependencyManager Runtime bundle
-FELIX-4600: Cherrypicking of propagated properties
-FELIX-4684: Replace DependencyManager Runtime "factorySet" by a cleaner API
-FELIX-4816: bndtools-ify Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
index 21d2bfd..13900c9 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
@@ -31,7 +31,7 @@
Include-Resource: META-INF/=resources/LICENSE,\
META-INF/=resources/NOTICE,\
META-INF/=resources/DEPENDENCIES,\
- META-INF/=resources/changelog.txt
+ META-INF/=${workspace}/release/resources/changelog.txt
Bundle-Name: Apache Felix Dependency Manager Runtime
Bundle-Description: Loads Apache Felix Dependency Manager component descriptors from active \
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/changelog.txt
deleted file mode 100644
index 5574237..0000000
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/changelog.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Release org.apache.felix.dependencymanager.r1:
----------------------------------------------
-
-FELIX-4777: Dynamic initialization time configuration of @ConfigurationDependency
-FELIX-4676: Add Provide-Capability for DependencyManager Runtime bundle
-FELIX-4600: Cherrypicking of propagated properties
-FELIX-4684: Replace DependencyManager Runtime "factorySet" by a cleaner API
-FELIX-4709: Incorrect Named Dependencies are binded to the Service Instance
-FELIX-4816: bndtools-ify Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
index 078a8a2..2031465 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
@@ -60,7 +60,7 @@
Include-Resource: META-INF/=resources/LICENSE,\
META-INF/=resources/NOTICE,\
META-INF/=resources/DEPENDENCIES,\
- META-INF/=resources/changelog.txt
+ META-INF/=${workspace}/release/resources/changelog.txt
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-DocURL: http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html
Bundle-Vendor: The Apache Software Foundation
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/changelog.txt
deleted file mode 100644
index 9637538..0000000
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/resources/changelog.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Release org.apache.felix.dependencymanager.r1:
----------------------------------------------
-
-FELIX-4816: bndtools-ify Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
index 8cd1ea1..34687ea 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
@@ -32,7 +32,7 @@
Include-Resource: META-INF/=resources/LICENSE,\
META-INF/=resources/NOTICE,\
META-INF/=resources/DEPENDENCIES,\
- META-INF/=resources/changelog.txt
+ META-INF/=${workspace}/release/resources/changelog.txt
Import-Package: !org.junit,!org.mockito.*,*
Bundle-Activator: org.apache.felix.dm.impl.Activator
Bundle-Version: 4.1.1
diff --git a/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
deleted file mode 100644
index 3b3bd52..0000000
--- a/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-Release org.apache.felix.dependencymanager.r3:
----------------------------------------------
-
-** Bug
- * [FELIX-4858] - DependencyManager: missing createCopy method in timed service dependency
- * [FELIX-4869] - Callbacks not invoked for dependencies that are added after the component is initialized
-
-** Improvement
- * [FELIX-4614] - Factory create() method should have access to the component definition
- * [FELIX-4878] - Support more signatures for Dependency callbacks
- * [FELIX-4880] - Missing callback instance support for some adapters
- * [FELIX-4873] - Enhance DM API to get missing and circular dependencies
-
-** Wish
- * [FELIX-4875] - Update DM integration test with latest ConfigAdmin
-
-Release org.apache.felix.dependencymanager.r2:
----------------------------------------------
-
-FELIX-4832: ClassCastException with autoconfig Iterable fields.
-
-Release org.apache.felix.dependencymanager.r1:
----------------------------------------------
-
-FELIX-2706: Support callback delegation for Configuration Dependencies
-FELIX-3914: Log unsuccessful field injections
-FELIX-4158: ComponentDeclaration should give access to component information
-FELIX-4304: DependencyManager ComponentImpl should not assume all service properties are stored in a Hashtable
-FELIX-4394: Race problems in DependencyManager Configuration Dependency
-FELIX-4426: Allow DM to manage collections of services
-FELIX-4588: createCopy method ConfigurationDependency produces a malfunctioning clone
-FELIX-4594: Propagation from dependencies overwrites service properties
-FELIX-4598: BundleDependency can effectively track only one bundle
-FELIX-4600: Cherrypicking of propagated properties
-FELIX-4602: TemporalServiceDependency does not properly propagate RuntimeExceptions
-FELIX-4667: "top" command for the Dependency Manager Shell
-FELIX-4672: Allow callbacks to third party instance for adapters
-FELIX-4673: Log any error thrown when trying to create a null object
-FELIX-4680: Add more DM ServiceDependency callback signatures
-FELIX-4807: New thread model for Dependency Manager
-FELIX-4816: bndtools-ify Dependency Manager
-
-Release 3.2.0:
---------------
-
-FELIX-3910: Race conditions in DependencyManager
-FELIX-4334: ServiceDependency properties change callback issue
-FELIX-4285: Remove abstract modifier from DependencyActivatorBase.destroy()
-FELIX-4294: Dependency Manager Shell improvements
-FELIX-4305: DependencyMananer Adapters - service properties propagation
-FELIX-4002: ComponentStateListener.started is invoked twice when the listener is added in the start method.
-FELIX-4395: DependencyManager Configuration Dependency does not clone some class fields.
-FELIX-4014: handleAspectAwareRemoved in ServiceDependencyImpl can cause a possible deadlock
-FELIX-4097: Allow debug logging for specific instances of service dependencies to debug wiring issues.
-FELIX-4098: Aspect swap sometimes invokes the callbacks in the wrong order in a multithreaded application.
-FELIX-4099: Add support for negations in the multi property filter index.
-FELIX-4186: NPE in DependencyManager Logger
-FELIX-4226: Add option to have the dependency manager log against a single BundleContext's LogService.
-FELIX-4361: Possible ConcurrentModificationException in DependencyManager.getComponents()
-
-Release 3.1.0
--------------
-
-FELIX-303 - Support for compositions
-FELIX-1201 - Issue with DM and CM
-FELIX-1278 - DM/ AutoConfig is active event if setCallbacks method has been invoked
-FELIX-1464 - issue when using a negation in ldap service dependency filter
-FELIX-1546 - DM/Temporal Dependency/Bound Service Replacement features
-FELIX-2078 - Not all callbacks invoked when declaring a service as required and starting it after dependencies
-FELIX-2344 - DM / callback method is not invoked when an extra dependency is defined within an "init" component method.
-FELIX-2348 - DM/ ResourceAdapter NPE
-FELIX-2369 - DM/ Service start method is invoked even if an extra required dependency is unavailable
-FELIX-2816 - dependency manager calls init() twice
-FELIX-2947 - Filter indices must use service trackers that track all services and aspects.
-FELIX-2953 - Make the cache that InvocationUtil uses configurable.
-FELIX-2954 - DM/ annotated component factory does not allow to provide a component instance explicitly
-FELIX-2955 - IllegalStateException when doing a 'dm notavail' shell command.
-FELIX-2956 - DM/ json should be embedded in the annotation scanner plugin
-FELIX-2964 - DM/ NPE on some dependency manager adapters, when "auto-configuration" mode is disabled.
-FELIX-2970 - DM/ Factory Configuration Adapter Service does not copy adapter dependencies
-FELIX-2976 - InvocationUtil cache is not used properly for determining that methods do not exist in a class
-FELIX-2987 - DependencyManager ConfigurationDependency update isn't propagated to super classes
-FELIX-3008 - NPE in ServiceRegistryCache when dependency manager bundle is not started first
-FELIX-3042 - [PATCH] Add a convenience clear() method on DependencyManager
-FELIX-3057 - getServiceReferences() should not return an empty array
-FELIX-3186 - Adapter services do not get their adapted services transparently replaced when an aspect is added to them.
-FELIX-3201 - Offer more functional callback methods for services that have aspects on them.
-FELIX-3218 - ServiceTracker performance is not optimal with a service dependency that results in n-thousands of injected services.
-FELIX-3264 - Dependency manager shell should not print the state of optional dependencies when not all required ones are available
-FELIX-3292 - Allow passing of resource properties to a resource handler for use with resource adapters.
-FELIX-3337 - DependencyManager/Updated configuration dependency does not propagate to provided service properties
-FELIX-3402 - DependencyManager stop can trigger IndexOutOfBoundsException
-FELIX-3423 - AdapterImpl copies the DependencyManager.ASPECT service property when adapting an aspect.
-FELIX-3424 - Add support for changed callbacks on Aspect services.
-FELIX-3425 - Provide a filter index for adapter services.
-FELIX-3475 - DependencyManager compatibility bundle - ServiceDependencyImpl does not override toString
-FELIX-3564 - Memory leak in Filterindex / ServiceRegistryCache
-FELIX-3592 - ServiceDependencyImpl does not copy the swapped callback in it's constructor.
-FELIX-3617 - Missing toString methods in DependencyManager compat bundle
-FELIX-3682 - Dependency Manager Annotation-3.0.0 module doesn't expose OSGI meta information in MANIFEST.MF
-FELIX-3828 - Aspect and Adapter filter indices to not handle components that have been bound with multiple interfaces correctly.
-
-
-Release 3.0.0
--------------
-
-Major, backward incompatible release. Start of recorded changes.