You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2021/01/19 22:29:52 UTC
[felix-dev] branch master updated: FELIX-6278: Update Dependency
Manager with latest bndtools version
This is an automated email from the ASF dual-hosted git repository.
pderop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new a0af23b FELIX-6278: Update Dependency Manager with latest bndtools version
a0af23b is described below
commit a0af23b92286d49d69044b31a4efd7498903a4a0
Author: Pierre De Rop <pi...@gmail.com>
AuthorDate: Tue Jan 19 23:27:38 2021 +0100
FELIX-6278: Update Dependency Manager with latest bndtools version
---
.../.gradle-wrapper/gradle-wrapper.properties | 2 +-
dependencymanager/changelog.txt | 287 ---------------------
dependencymanager/cnf/ext/libraries.bnd | 2 +-
dependencymanager/cnf/repository.mvn | 4 +-
dependencymanager/gradle.properties | 4 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 28 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../changelog.txt | 13 +
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
.../changelog.txt | 13 +-
.../resources/DEPENDENCIES | 2 +-
.../resources/NOTICE | 2 +-
dependencymanager/release/README.release | 9 +-
22 files changed, 105 insertions(+), 316 deletions(-)
diff --git a/dependencymanager/.gradle-wrapper/gradle-wrapper.properties b/dependencymanager/.gradle-wrapper/gradle-wrapper.properties
index d110595..e65df49 100644
--- a/dependencymanager/.gradle-wrapper/gradle-wrapper.properties
+++ b/dependencymanager/.gradle-wrapper/gradle-wrapper.properties
@@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
diff --git a/dependencymanager/changelog.txt b/dependencymanager/changelog.txt
deleted file mode 100644
index 6bd3550..0000000
--- a/dependencymanager/changelog.txt
+++ /dev/null
@@ -1,287 +0,0 @@
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r15
-======================================================================
-
-** List of bundles being part of the release:
- * org.apache.felix.dependencymanager; version=4.6.0
- * org.apache.felix.dependencymanager.shell; version=4.0.8
- * org.apache.felix.dependencymanager.runtime; version=4.0.7
- * org.apache.felix.dependencymanager.annotation; version=5.0.1
- * org.apache.felix.dependencymanager.lambda; version=1.2.1
-
-** Task
- * [FELIX-5996] - Remove generic parameter in DM Component interface
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r14
-======================================================================
-
-** List of bundles being part of the release:
- * org.apache.felix.dependencymanager; version=4.5.1
- * org.apache.felix.dependencymanager.shell; version=4.0.7
- * org.apache.felix.dependencymanager.runtime; version=4.0.6
- * org.apache.felix.dependencymanager.annotation; version=5.0.1
- * org.apache.felix.dependencymanager.lambda; version=1.2.0
-
-** Bug
- * [FELIX-5990] - DM ServiceTracker memory leak
-
-** Wish
- * [FELIX-5991] - DM annotation scanner debug messages are logged in warn
-
-** Task
- * [FELIX-5992 - Do not use a global changelog for all dm modules
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r13
-======================================================================
-
-** List of bundles being part of the release:
- * org.apache.felix.dependencymanager; version=4.5.0
- * org.apache.felix.dependencymanager.shell; version=4.0.7
- * org.apache.felix.dependencymanager.runtime; version=4.0.6
- * org.apache.felix.dependencymanager.annotation; version=5.0.0
- * org.apache.felix.dependencymanager.lambda; version=1.2.0
-
-
-** Bug
- * [FELIX-5683] - getServiceProperties returns null instead of empty dictionary
- * [FELIX-5716] - Dead Lock in DM
- * [FELIX-5768] - DM Lambda stop callback not being called
- * [FELIX-5955] - Move changelog.txt to toplevel project dir
- * [FELIX-5956] - NPE when invoking a lifecycle runnable method from init method
-
-** New Feature
- * [FELIX-5336] - Add support for prototype scope services in DM4
-
-
-** Improvement
- * [FELIX-5967] - DM does not support java9+
- * [FELIX-5937] - Refactor DM bndtools/gradle project
- * [FELIX-5939] - DM annotations enhancements
- * [FELIX-5941] - DM APi enhancements
- * [FELIX-5957] - Check if a default implementation is used only on optional dependencies
-
-
-** Task
- * [FELIX-5960] - Do not supply MD5 checksum
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r11
-======================================================================
-
-** List of bundles being part of the release:
- * org.apache.felix.dependencymanager; version=4.4.1
- * org.apache.felix.dependencymanager.shell; version=4.0.6
- * org.apache.felix.dependencymanager.runtime; version=4.0.5
- * org.apache.felix.dependencymanager.annotation; version=4.2.1
- * org.apache.felix.dependencymanager.lambda; version=1.1.1
-
-** Bug
- * [FELIX-5630] - NullObject is created for a required dependency if the component is removed and added again to the dependency manager
- * [FELIX-5636] - Component of aspect service does not have any service properties anymore
- * [FELIX-5657] - DM released sources can't be rebuilt
-
-** Improvement
- * [FELIX-5619] - MultiProperyFilterIndex memory consumption
- * [FELIX-5623] - Improve performance of ComponentImpl.getName method
- * [FELIX-5650] - Support latest version of Gogo
- * [FELIX-5653] - Simplify DM-Lambda samples
- * [FELIX-5658] - Include poms in dm artifacts
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r9
-======================================================================
-
-** List of bundles being part of the release:
- * org.apache.felix.dependencymanager; version=4.4.0
- * org.apache.felix.dependencymanager.shell; version=4.0.5
- * org.apache.felix.dependencymanager.runtime; version=4.0.4
- * org.apache.felix.dependencymanager.annotation; version=4.2.0
- * org.apache.felix.dependencymanager.lambda; version=1.1.0
-
-** Bug
- * [FELIX-5236] - Single @Property annotation on a type doesn't work
- * [FELIX-5242] - Configuration updates may be missed when the component is restarting
- * [FELIX-5244] - Can't inject service using a method ref on a parent class method.
- * [FELIX-5245] - Typo in error logged when a component callback is not found.
- * [FELIX-5268] - Service not unregistered while bundle is starting
- * [FELIX-5273] - Wrong log when a callback is not found from component instance(s)
- * [FELIX-5274] - remove callback fails after manually removing dynamic dependencies
- * [FELIX-5399] - Unable to define default map or list config types
- * [FELIX-5400] - Can't override default configuration type list value using an empty list
- * [FELIX-5401] - Can't override default configuration type map value using an empty map
- * [FELIX-5402] - Factory configuration adapter ignores factory method
- * [FELIX-5411] - When you stop a component, the service references are not ungotten.
- * [FELIX-5426] - Remove callbacks aren't called for optional dependencies in a "circular" dependency scenario
- * [FELIX-5428] - Dependency events set not cleared when component is removed
- * [FELIX-5429] - Aspect swap callback sometimes not called on optional dependencies
- * [FELIX-5469] - Methodcache system size property is not used
- * [FELIX-5471] - Ensure that unbound services are always handled synchronously
- * [FELIX-5517] - @Inject annotation ignored when applied on ServiceRegistration
- * [FELIX-5519] - services are not ungotten when swapped by an aspect
- * [FELIX-5523] - required dependencies added to a started adapter (or aspect) are not injected
-
-
-
-
-** Improvement
- * [FELIX-5228] - Upgrade DM With latest release of BndTools
- * [FELIX-5237] - Configurable invocation handler should use default method values
- * [FELIX-5346] - Start annotation not propagated to sub classes
- * [FELIX-5355] - Allow to use properties having dots with configuration proxies
- * [FELIX-5403] - Improve the Javadoc for org.apache.felix.dm.ComponentStateListener
- * [FELIX-5405] - Do not have org.apache.felix.dm.Logger invoke toString() of message parameters when enabled log level is not high enough
- * [FELIX-5406] - DM lambda fluent service properties don't support dots
- * [FELIX-5407] - DM annotation plugin generates temp log files even if logging is disabled
- * [FELIX-5408] - Parallel DM should not stop components asynchronously
- * [FELIX-5467] - MultiPropertyFilterIndex is unusable when a service reference contains a lot of values for one key
- * [FELIX-5499] - Remove usage of json.org from dependency manager
- * [FELIX-5515] - Upgrade DM to OSGi R6 API
- * [FELIX-5516] - Allow to not dereference services internally
- * [FELIX-5518] - Remove all eclipse warnings in DM code
- * [FELIX-5520] - ComponentStateListener not supported in DM lambda
- * [FELIX-5521] - add more callback method signature in DM lambda service dependency callbacks
- * [FELIX-5522] - Refactor aspect service implementation
- * [FELIX-5524] - add more signatures for aspect swap callbacks
- * [FELIX-5526] - Allow to use generic custom DM dependencies when using dm lambda.
- * [FELIX-5531] - Document dependency callback signatures
- * [FELIX-5532] - Swap callback is missing in @ServiceDependency annotation
-
-
-
-** Task
- * [FELIX-5533] - Fix a semantic versioning issue when releasing dependency manager
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r8
-======================================================================
-
-** Bug
- * [FELIX-5146] - Service adapters turn on autoconf even if callbacks are used
- * [FELIX-5147] - Bundle Adapter auto configures class fields even if callbacks are used
- * [FELIX-5153] - DM4 calls stop before ungetService() on ServiceFactory components
- * [FELIX-5155] - Adapter/Aspect extra service dependencies injected twice if using callback instance
- * [FELIX-5178] - Make some component parameters as volatile
- * [FELIX-5181] - Only log info/debug if dm annotation log parameter is enabled
- * [FELIX-5187] - No errog log when configuration dependency callback is not found
- * [FELIX-5188] - No error log when a factory pid adapter update callback is not found
- * [FELIX-5192] - ConfigurationDependency race condition when component is stopped
- * [FELIX-5193] - Factory Pid Adapter race condition when component is stopped
- * [FELIX-5200] - Factory configuration adapter not restarted
-
-
-** New Feature
- * [FELIX-4689] - Create a more fluent syntax for the dependency manager builder
-
-
-** Improvement
- * [FELIX-5126] - Build DM using Java 8
- * [FELIX-5164] - Add support for callback instance in Aspects
- * [FELIX-5177] - Support injecting configuration proxies
- * [FELIX-5180] - Support for Java8 Repeatable Properties in DM annotations.
- * [FELIX-5182] - Cleanup DM samples
- * [FELIX-5201] - Improve how components are displayed with gogo shell
-
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r6
-======================================================================
-
-** Bug
- * [FELIX-4974] - DM filter indices not enabled if the dependencymanager bundle is started first
- * [FELIX-5045] - DM Optional callbacks may sometimes be invoked before start callback
- * [FELIX-5046] - Gradle wrapper is not included in DM source release
-
-
-
-
-** Improvement
- * [FELIX-4921] - Ensure binary equality of the same bundle between successive DM releases
- * [FELIX-4922] - Simplify DM changelog management
- * [FELIX-5054] - Clean-up instance bound dependencies when component is destroyed
- * [FELIX-5055] - Upgrade DM to BndTools 3.0.0
- * [FELIX-5104] - Call a conf dependency callback Instance with an instantiated component
- * [FELIX-5113] - Remove useless wrong test in ConfigurationDependencyImpl
- * [FELIX-5114] - Schedule configuration update in Component executor synchronously
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r5:
-======================================================================
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r5
-
-
-
-** Bug
- * [FELIX-4907] - ConfigurationDependency calls updated(null) when component is stopped.
- * [FELIX-4910] - ComponentExecutorFactory does not allow to return null from getExecutorFor method.
- * [FELIX-4913] - DM Optional callbacks may sometimes be invoked twice
-
-
-
-
-** 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.
- * [FELIX-4915] - Skip unecessary manifest headers in DM bnd file
-
-Release Notes - Felix - Version 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-4873] - Enhance DM API to get missing and circular dependencies
- * [FELIX-4878] - Support more signatures for Dependency callbacks
- * [FELIX-4880] - Missing callback instance support for some adapters
- * [FELIX-4889] - Refactor dm shell command to use the org.apache.dm.diagnostics api
-
-
-** Wish
- * [FELIX-4875] - Update DM integration test with latest ConfigAdmin
-
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r2:
-=====================================================================
-
-** Bug
- * [FELIX-4832] - ClassCastException with autoconfig Iterable fields
- * [FELIX-4833] - Revisit some javadocs in the DM annotations.
-
-Release Notes - Felix - Version org.apache.felix.dependencymanager-r1:
-======================================================================
-
-** Bug
- * [FELIX-4304] - DependencyManager ComponentImpl should not assume all service properties are stored in a Hashtable
- * [FELIX-4394] - Race problems in DependencyManager Configuration Dependency
- * [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-4602] - TemporalServiceDependency does not properly propagate RuntimeExceptions
- * [FELIX-4709] - Incorrect Named Dependencies are binded to the Service Instance
-
-
-** New Feature
- * [FELIX-4426] - Allow DM to manage collections of services
- * [FELIX-4807] - New thread model for Dependency Manager
-
-
-** Improvement
- * [FELIX-3914] - Log unsuccessful field injections
- * [FELIX-4158] - ComponentDeclaration should give access to component information
- * [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-4777] - Dynamic initialization time configuration of @ConfigurationDependency
- * [FELIX-4805] - Deprecate DM annotation metatypes
-
-
-** Wish
- * [FELIX-2706] - Support callback delegation for Configuration Dependecies
- * [FELIX-4600] - Cherrypicking of propagated properties
- * [FELIX-4676] - Add Provide-Capability for DependencyManager Runtime bundle
- * [FELIX-4680] - Add more DM ServiceDependency callback signatures
- * [FELIX-4683] - Allow to configure the DependencyManager shell scope
- * [FELIX-4684] - Replace DependencyManager Runtime "factorySet" by a cleaner API
- * [FELIX-4816] - bndtools-ify Dependency Manager
- * [FELIX-4818] - New release process for Dependency Manager
-
diff --git a/dependencymanager/cnf/ext/libraries.bnd b/dependencymanager/cnf/ext/libraries.bnd
index dc86ca7..9148780 100644
--- a/dependencymanager/cnf/ext/libraries.bnd
+++ b/dependencymanager/cnf/ext/libraries.bnd
@@ -53,7 +53,7 @@ webconsole=\
##
# bndlib
-bndlib=biz.aQute.bndlib;version=5.0.1
+bndlib=biz.aQute.bndlib;version=5.2.0
##
# mockito
diff --git a/dependencymanager/cnf/repository.mvn b/dependencymanager/cnf/repository.mvn
index e003e74..ae9ec0b 100644
--- a/dependencymanager/cnf/repository.mvn
+++ b/dependencymanager/cnf/repository.mvn
@@ -16,8 +16,8 @@
#
ant:ant:1.5
-biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.1
-biz.aQute.bnd:biz.aQute.bndlib:5.0.1
+biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0
+biz.aQute.bnd:biz.aQute.bndlib:5.2.0
org.apache.felix:org.apache.felix.framework:5.6.10
org.apache.felix:org.apache.felix.eventadmin:1.4.4
org.apache.felix:org.apache.felix.gogo.command:1.0.2
diff --git a/dependencymanager/gradle.properties b/dependencymanager/gradle.properties
index 701550b..35354fb 100644
--- a/dependencymanager/gradle.properties
+++ b/dependencymanager/gradle.properties
@@ -17,9 +17,9 @@
* under the License.
*/
-bnd_version=5.0.1
+bnd_version=5.2.0
# bnd_plugin is the dependency declaration for the bnd gradle plugin
-bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:5.0.1
+bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0
org.gradle.jvmargs=-Xmx2g
diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.annotation/changelog.txt
index 0857a40..0dfd0db 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/changelog.txt
@@ -1,3 +1,16 @@
+Release Notes - Felix - Version org.apache.felix.dependencymanager-r16
+======================================================================
+
+** List of bundles being part of the release:
+ * org.apache.felix.dependencymanager; version=4.6.1
+ * org.apache.felix.dependencymanager.shell; version=4.0.9
+ * org.apache.felix.dependencymanager.runtime; version=4.0.8
+ * org.apache.felix.dependencymanager.annotation; version=5.0.2
+ * org.apache.felix.dependencymanager.lambda; version=1.2.2
+
+** Improvement
+ * [FELIX-6278] - Update Dependency Manager with latest bndtools version
+
Release Notes - Felix - Version org.apache.felix.dependencymanager-r14
======================================================================
diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/DEPENDENCIES b/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/DEPENDENCIES
index 4a8833f..95f26f5 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/DEPENDENCIES
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/DEPENDENCIES
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager Annotation
-Copyright 2011-2017 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/NOTICE b/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/NOTICE
index 3bbc09a..f844568 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/NOTICE
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/NOTICE
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager Annotation
-Copyright 2011-2017 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.lambda/changelog.txt
index f1c45b1..7072771 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.lambda/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/changelog.txt
@@ -1,3 +1,16 @@
+Release Notes - Felix - Version org.apache.felix.dependencymanager-r16
+======================================================================
+
+** List of bundles being part of the release:
+ * org.apache.felix.dependencymanager; version=4.6.1
+ * org.apache.felix.dependencymanager.shell; version=4.0.9
+ * org.apache.felix.dependencymanager.runtime; version=4.0.8
+ * org.apache.felix.dependencymanager.annotation; version=5.0.2
+ * org.apache.felix.dependencymanager.lambda; version=1.2.2
+
+** Improvement
+ * [FELIX-6278] - Update Dependency Manager with latest bndtools version
+
Release Notes - Felix - Version org.apache.felix.dependencymanager-r15
======================================================================
diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/resources/DEPENDENCIES b/dependencymanager/org.apache.felix.dependencymanager.lambda/resources/DEPENDENCIES
index 9126cc8..b19819e 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.lambda/resources/DEPENDENCIES
+++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/resources/DEPENDENCIES
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager Lambda
-Copyright 2011-2017 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/resources/NOTICE b/dependencymanager/org.apache.felix.dependencymanager.lambda/resources/NOTICE
index 092e158..bf4172c 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.lambda/resources/NOTICE
+++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/resources/NOTICE
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager Lambda
-Copyright 2011-2017 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This product includes software developed at
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs b/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs
index c85c742..27da04a 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -8,20 +9,23 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
@@ -111,11 +115,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -146,6 +151,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -170,13 +177,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -224,6 +235,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -260,9 +273,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -298,9 +314,13 @@ org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.runtime/changelog.txt
index f1c45b1..7072771 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/changelog.txt
@@ -1,3 +1,16 @@
+Release Notes - Felix - Version org.apache.felix.dependencymanager-r16
+======================================================================
+
+** List of bundles being part of the release:
+ * org.apache.felix.dependencymanager; version=4.6.1
+ * org.apache.felix.dependencymanager.shell; version=4.0.9
+ * org.apache.felix.dependencymanager.runtime; version=4.0.8
+ * org.apache.felix.dependencymanager.annotation; version=5.0.2
+ * org.apache.felix.dependencymanager.lambda; version=1.2.2
+
+** Improvement
+ * [FELIX-6278] - Update Dependency Manager with latest bndtools version
+
Release Notes - Felix - Version org.apache.felix.dependencymanager-r15
======================================================================
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/DEPENDENCIES b/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/DEPENDENCIES
index aa7306b..22d92dc 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/DEPENDENCIES
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/DEPENDENCIES
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager Runtime
-Copyright 2011-2017 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/NOTICE b/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/NOTICE
index 42cae55..d7f248c 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/NOTICE
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/NOTICE
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager Runtime
-Copyright 2011-2017 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.shell/changelog.txt
index f1c45b1..7072771 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.shell/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager.shell/changelog.txt
@@ -1,3 +1,16 @@
+Release Notes - Felix - Version org.apache.felix.dependencymanager-r16
+======================================================================
+
+** List of bundles being part of the release:
+ * org.apache.felix.dependencymanager; version=4.6.1
+ * org.apache.felix.dependencymanager.shell; version=4.0.9
+ * org.apache.felix.dependencymanager.runtime; version=4.0.8
+ * org.apache.felix.dependencymanager.annotation; version=5.0.2
+ * org.apache.felix.dependencymanager.lambda; version=1.2.2
+
+** Improvement
+ * [FELIX-6278] - Update Dependency Manager with latest bndtools version
+
Release Notes - Felix - Version org.apache.felix.dependencymanager-r15
======================================================================
diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/resources/DEPENDENCIES b/dependencymanager/org.apache.felix.dependencymanager.shell/resources/DEPENDENCIES
index 9bd2fd9..8f36a23 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.shell/resources/DEPENDENCIES
+++ b/dependencymanager/org.apache.felix.dependencymanager.shell/resources/DEPENDENCIES
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager Shell
-Copyright 2011-2016 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/resources/NOTICE b/dependencymanager/org.apache.felix.dependencymanager.shell/resources/NOTICE
index 4946dbc..926fb56 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.shell/resources/NOTICE
+++ b/dependencymanager/org.apache.felix.dependencymanager.shell/resources/NOTICE
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager Shell
-Copyright 2011-2016 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This product includes software developed at
diff --git a/dependencymanager/org.apache.felix.dependencymanager/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager/changelog.txt
index 0d1d19a..79be51a 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager/changelog.txt
@@ -3,13 +3,16 @@ Release Notes - Felix - Version org.apache.felix.dependencymanager-r16
** List of bundles being part of the release:
* org.apache.felix.dependencymanager; version=4.6.1
- * org.apache.felix.dependencymanager.shell; version=4.0.8
- * org.apache.felix.dependencymanager.runtime; version=4.0.7
- * org.apache.felix.dependencymanager.annotation; version=5.0.1
- * org.apache.felix.dependencymanager.lambda; version=1.2.1
+ * org.apache.felix.dependencymanager.shell; version=4.0.9
+ * org.apache.felix.dependencymanager.runtime; version=4.0.8
+ * org.apache.felix.dependencymanager.annotation; version=5.0.2
+ * org.apache.felix.dependencymanager.lambda; version=1.2.2
** Bug
- * [FELIX-6180] Component initialization error message get's printed to sysout instead of logged to LogService
+ * [FELIX-6180] - Component initialization error message get's printed to sysout instead of logged to LogService
+
+** Improvement
+ * [FELIX-6278] - Update Dependency Manager with latest bndtools version
Release Notes - Felix - Version org.apache.felix.dependencymanager-r15
======================================================================
diff --git a/dependencymanager/org.apache.felix.dependencymanager/resources/DEPENDENCIES b/dependencymanager/org.apache.felix.dependencymanager/resources/DEPENDENCIES
index 9fdadf3..53294b8 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/resources/DEPENDENCIES
+++ b/dependencymanager/org.apache.felix.dependencymanager/resources/DEPENDENCIES
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager
-Copyright 2011-2017 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
diff --git a/dependencymanager/org.apache.felix.dependencymanager/resources/NOTICE b/dependencymanager/org.apache.felix.dependencymanager/resources/NOTICE
index 195d532..f8d1dc5 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/resources/NOTICE
+++ b/dependencymanager/org.apache.felix.dependencymanager/resources/NOTICE
@@ -1,5 +1,5 @@
Apache Felix Dependency Manager
-Copyright 2011-2017 The Apache Software Foundation
+Copyright 2011-2021 The Apache Software Foundation
This product includes software developed at
diff --git a/dependencymanager/release/README.release b/dependencymanager/release/README.release
index 2545e81..4cce38e 100644
--- a/dependencymanager/release/README.release
+++ b/dependencymanager/release/README.release
@@ -33,21 +33,22 @@ Create a tagged version
Creating a tagged version of the sources can be done directly through svn (replace r<n> by the actual release number, like "r1"):
-svn copy https://svn.apache.org/repos/asf/felix/trunk/dependencymanager https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.dependencymanager-r<n> -m "Release of Apache Felix Dependency Manager r<n>"
+git tag -a org.apache.felix.dependencymanager-r<n> -m "Release of Apache Felix Dependency Manager r<n>"
+git push origin org.apache.felix.dependencymanager-r<n>
Staging a release candidate
===========================
Staging a release starts by checking out a tagged version of the sources (replace r<n> by the actual release number, like "r1"):
-svn co https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.dependencymanager-r<n>
+git clone -–depth 1 -b org.apache.felix.dependencymanager-r<n> http://gitbox.apache.org/repos/asf/felix-dev.git felix-dev-org.apache.felix.dependencymanager-r<n>
The next step is to build/test the software and create the release/staging/ directory (where the source/jars will be packaged):
(replace r<n> by the actual release number, like "r1")
Use a Java8 JDK
-$ cd org.apache.felix.dependencymanager-r<n>
+$ cd felix-dev-org.apache.felix.dependencymanager-r<n>/dependencymanager
$ ./gradlew rat
$ ./gradlew org.apache.felix.dependencymanager.annotation:jar
$ ./gradlew jar
@@ -93,7 +94,7 @@ Staging repository:
https://dist.apache.org/repos/dist/dev/felix/apache-felix-dependencymanager-r<n>/
You can use this UNIX script to download the release and verify the signatures:
-http://svn.apache.org/repos/asf/felix/trunk/dependencymanager/release/check_staged_release.sh
+https://github.com/apache/felix-dev/blob/master/dependencymanager/release/check_staged_release.sh
Usage:
sh check_staged_release.sh r<n> /tmp/felix-staging