wip

cnf/.settings/org.eclipse.jdt.ui.prefs

@@ -6,15 +6,17 @@ cleanup.add_missing_methods=false
 cleanup.add_missing_nls_tags=false
 cleanup.add_missing_override_annotations=true
 cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
+cleanup.add_serial_version_id=true
 cleanup.always_use_blocks=true
 cleanup.always_use_parentheses_in_expressions=false
 cleanup.always_use_this_for_non_static_field_access=false
 cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=true
 cleanup.convert_to_enhanced_for_loop=false
 cleanup.correct_indentation=false
 cleanup.format_source_code=false
 cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
 cleanup.make_local_variable_final=true
 cleanup.make_parameters_final=false
 cleanup.make_private_fields_final=true
@@ -29,44 +31,56 @@ cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=tru
 cleanup.qualify_static_member_accesses_with_declaring_class=true
 cleanup.qualify_static_method_accesses_with_declaring_class=false
 cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=false
+cleanup.remove_redundant_modifiers=true
+cleanup.remove_redundant_semicolons=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
 cleanup.remove_trailing_whitespaces_all=true
 cleanup.remove_trailing_whitespaces_ignore_empty=false
 cleanup.remove_unnecessary_casts=true
 cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
 cleanup.remove_unused_local_variables=false
 cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_members=true
 cleanup.remove_unused_private_methods=true
 cleanup.remove_unused_private_types=true
 cleanup.sort_members=false
 cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
 cleanup.use_blocks=false
 cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
 cleanup.use_parentheses_in_expressions=false
 cleanup.use_this_for_non_static_field_access=false
 cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 cleanup.use_this_for_non_static_method_access=false
 cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
+cleanup.use_type_arguments=false
+cleanup_profile=_bnd
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_bnd(tools)
-formatter_settings_version=12
+formatter_profile=_bnd
+formatter_settings_version=16
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=false
+sp_cleanup.add_missing_annotations=true
 sp_cleanup.add_missing_deprecated_annotations=true
 sp_cleanup.add_missing_methods=false
 sp_cleanup.add_missing_nls_tags=false
 sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_missing_override_annotations_interface_methods=true
 sp_cleanup.add_serial_version_id=false
 sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
@@ -89,17 +103,19 @@ sp_cleanup.on_save_use_additional_actions=true
 sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
 sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
 sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
@@ -110,7 +126,7 @@ sp_cleanup.sort_members_all=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=false
 sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
+sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true

cnf/ext/build.mvn

@@ -1,13 +1,11 @@
 # OSGi R7
 
-biz.aQute.bnd:biz.aQute.bndlib:4.3.0
-biz.aQute.bnd:aQute.libg:4.3.0
-biz.aQute.bnd:biz.aQute.launchpad:4.3.0
-biz.aQute.bnd:biz.aQute.bnd.runtime.snapshot:4.3.0
+biz.aQute.bnd:biz.aQute.bndlib:4.3.1
+biz.aQute.bnd:aQute.libg:4.3.1
+biz.aQute.bnd:biz.aQute.launchpad:4.3.1
+biz.aQute.bnd:biz.aQute.bnd.runtime.snapshot:4.3.1
 
-net.sourceforge.htmlunit:htmlunit:2.35.0
-
-org.hamcrest:hamcrest-all:1.3
+net.sourceforge.htmlunit:htmlunit:2.36.0
 
 org.osgi:osgi.annotation:7.0.0
 org.osgi:org.osgi.dto:1.1.0
@@ -46,7 +44,7 @@ org.osgi:org.osgi.service.rest:1.0.0
 org.osgi:org.osgi.service.serviceloader:1.0.0
 org.osgi:org.osgi.service.url:1.0.0
 org.osgi:org.osgi.service.useradmin:1.1.0
-org.osgi:org.osgi.util.converter:1.0.0
+org.osgi:org.osgi.util.converter:1.0.1
 org.osgi:org.osgi.util.function:1.1.0
 org.osgi:org.osgi.util.promise:1.1.1
 org.osgi:org.osgi.util.pushstream:1.0.1
@@ -55,11 +53,11 @@ org.osgi:org.osgi.util.xml:1.0.1
 
 org.apache.felix:org.apache.felix.http.servlet-api:1.1.2
 
-org.slf4j:slf4j-api:1.7.25
+org.slf4j:slf4j-api:1.7.29
 
 org.mockito:mockito-all:1.10.19
-org.easymock:easymock:2.5.1
-org.assertj:assertj-core:3.12.1
+org.easymock:easymock:4.1
+org.assertj:assertj-core:3.14.0
 
 junit:junit:4.12
 junit:junit:jar:sources:4.12

cnf/ext/runtime.mvn

@@ -1,14 +1,14 @@
-org.apache.felix:org.apache.felix.framework:6.0.2
+org.apache.felix:org.apache.felix.framework:6.0.3
 org.apache.felix:org.apache.felix.framework.security:2.6.1
 
-org.apache.felix:org.apache.felix.configadmin:1.9.12
-org.apache.felix:org.apache.felix.configurator:1.0.8
+org.apache.felix:org.apache.felix.configadmin:1.9.16
+org.apache.felix:org.apache.felix.configurator:1.0.10
 org.apache.felix:org.apache.felix.coordinator:1.0.2
 org.apache.felix:org.apache.felix.eventadmin:1.5.0
 org.apache.felix:org.apache.felix.fileinstall:3.6.4
 org.apache.felix:org.apache.felix.http.servlet-api:1.1.2
-org.apache.felix:org.apache.felix.http.jetty:4.0.8
-org.apache.felix:org.apache.felix.inventory:1.0.4
+org.apache.felix:org.apache.felix.http.jetty:4.0.14
+org.apache.felix:org.apache.felix.inventory:1.0.6
 org.apache.felix:org.apache.felix.log:1.2.2
 org.apache.felix:org.apache.felix.log.extension:1.0.0
 org.eclipse.platform:org.eclipse.equinox.log.stream:1.0.100
@@ -21,13 +21,13 @@ org.apache.felix:org.apache.felix.gogo.command:1.1.0
 org.apache.felix:org.apache.felix.gogo.runtime:1.1.2
 org.apache.felix:org.apache.felix.gogo.shell:1.1.2
 org.apache.felix:org.apache.felix.gogo.jline:1.1.4
-org.apache.felix:org.apache.felix.shell.remote:1.1.2
+org.apache.felix:org.apache.felix.shell.remote:1.2.0
 
 org.apache.felix:org.apache.felix.threaddump:1.0.0
-org.apache.felix:org.apache.felix.converter:1.0.4
+org.apache.felix:org.apache.felix.converter:1.0.12
 
 org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.1.0
-org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.6
+org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.10
 org.apache.felix:org.apache.felix.webconsole.plugins.scriptconsole:1.0.2
 org.apache.felix:org.apache.felix.webconsole.plugins.useradmin:1.0.2
 org.apache.felix:org.apache.felix.webconsole.plugins.event:1.1.8
@@ -36,18 +36,18 @@ org.apache.felix:org.apache.felix.webconsole:4.3.16
 
 
 org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-io:1.4_3
-commons-fileupload:commons-fileupload:1.3.2
+commons-fileupload:commons-fileupload:1.4
 
 org.osgi:org.knopflerfish.bundle.useradmin:4.1.1
 org.eclipse.concierge:org.eclipse.concierge.service.clusterinfo:1.0.0
 
 org.apache.aries.async:org.apache.aries.async:1.0.1
 org.osgi:org.osgi.service.async:1.0.0
 
-com.h2database:h2:1.4.198
+com.h2database:h2:1.4.200
 
-org.slf4j:slf4j-nop:1.7.25
-org.slf4j:slf4j-simple:1.7.25
+org.slf4j:slf4j-nop:1.7.29
+org.slf4j:slf4j-simple:1.7.29
 
 org.osgi:org.osgi.util.function:1.1.0
 org.osgi:org.osgi.util.measurement:1.0.2
@@ -57,41 +57,41 @@ org.osgi:org.osgi.util.pushstream:1.0.1
 org.osgi:org.osgi.util.tracker:1.5.2
 org.osgi:org.osgi.util.xml:1.0.1
 
-org.apache.zookeeper:zookeeper:3.4.9
-org.eclipse.platform:org.eclipse.core.jobs:3.9.3
-org.eclipse.platform:org.eclipse.equinox.common:3.9.0
-org.eclipse.platform:org.eclipse.equinox.concurrent:1.1.0
-org.eclipse.platform:org.eclipse.equinox.supplement:1.7.0
-org.eclipse.ecf:org.eclipse.ecf.identity:3.9.1
-org.eclipse.ecf:org.eclipse.ecf:3.9.2
-org.eclipse.ecf:org.eclipse.ecf.sharedobject:2.6.0
-org.eclipse.ecf:org.eclipse.ecf.discovery:5.0.300
-org.eclipse.ecf:org.eclipse.ecf.remoteservice.asyncproxy:2.1.0
-org.eclipse.ecf:org.eclipse.ecf.remoteservice:8.13.1
-org.eclipse.ecf:org.eclipse.ecf.console:1.1.0
-org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin.console:1.0.0
+org.apache.zookeeper:zookeeper:3.5.6
+org.eclipse.platform:org.eclipse.core.jobs:3.10.500
+org.eclipse.platform:org.eclipse.equinox.common:3.10.500
+org.eclipse.platform:org.eclipse.equinox.concurrent:1.1.400
+org.eclipse.platform:org.eclipse.equinox.supplement:1.9.0
+org.eclipse.ecf:org.eclipse.ecf.identity:3.9.300
+org.eclipse.ecf:org.eclipse.ecf:3.9.4
+org.eclipse.ecf:org.eclipse.ecf.sharedobject:2.6.1
+org.eclipse.ecf:org.eclipse.ecf.discovery:5.0.301
+org.eclipse.ecf:org.eclipse.ecf.remoteservice.asyncproxy:2.1.2
+org.eclipse.ecf:org.eclipse.ecf.remoteservice:8.13.2
+org.eclipse.ecf:org.eclipse.ecf.console:1.3.1
+org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin.console:1.2.1
 org.eclipse.ecf:org.eclipse.osgi.services.remoteserviceadmin:1.6.200
-org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy:1.0.100
-org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin:4.6.800
-org.eclipse.ecf:org.eclipse.ecf.osgi.services.distribution:2.1.200
-org.eclipse.ecf:org.eclipse.ecf.provider:4.8.0
-org.eclipse.ecf:org.eclipse.ecf.provider.remoteservice:4.4.100
-org.eclipse.ecf:ch.ethz.iks.r_osgi.remote:1.2.200
-org.eclipse.ecf:org.eclipse.ecf.provider.r_osgi:3.6.200
+org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy:1.0.101
+org.eclipse.ecf:org.eclipse.ecf.osgi.services.remoteserviceadmin:4.6.1102
+org.eclipse.ecf:org.eclipse.ecf.osgi.services.distribution:2.1.400
+org.eclipse.ecf:org.eclipse.ecf.provider:4.8.200
+org.eclipse.ecf:org.eclipse.ecf.provider.remoteservice:4.4.101
+org.eclipse.ecf:ch.ethz.iks.r_osgi.remote:1.2.201
+org.eclipse.ecf:org.eclipse.ecf.provider.r_osgi:3.6.201
 org.eclipse.ecf:org.objectweb.asm:5.0.1.v201404251740
 org.eclipse.ecf:org.apache.commons.codec:1.9.0.v20170208-1614
 org.eclipse.ecf:org.apache.commons.logging:1.1.1.v201101211721
 org.eclipse.ecf:org.apache.log4j:1.2.15.v201012070815
 org.eclipse.ecf:org.apache.httpcomponents.httpclient:4.5.2.v20170210-0925
 org.eclipse.ecf:org.apache.httpcomponents.httpcore:4.4.6.v20170210-0925
 org.eclipse.ecf:org.json:1.0.0.v201011060100
-org.eclipse.ecf:org.eclipse.ecf.remoteservice.rest:2.7.100
-org.eclipse.ecf:org.eclipse.ecf.remoteservice.eventadmin:1.3.0
-org.eclipse.ecf:org.eclipse.ecf.remoteservice.servlet:1.0.100
-org.eclipse.ecf:org.eclipse.ecf.server:2.1.200
-org.eclipse.ecf:org.eclipse.ecf.server.generic:8.0.100
-org.eclipse.ecf:org.eclipse.ecf.provider.zookeeper:1.2.200
+org.eclipse.ecf:org.eclipse.ecf.remoteservice.rest:2.7.201
+org.eclipse.ecf:org.eclipse.ecf.remoteservice.eventadmin:1.3.1
+org.eclipse.ecf:org.eclipse.ecf.remoteservice.servlet:1.0.101
+org.eclipse.ecf:org.eclipse.ecf.server:2.1.201
+org.eclipse.ecf:org.eclipse.ecf.server.generic:8.0.101
+org.eclipse.ecf:org.eclipse.ecf.provider.zookeeper:1.2.201
 org.eclipse.ecf:org.apache.hadoop.zookeeper:3.3.3.v201105210832
 org.eclipse.ecf:org.eclipse.ecf.provider.jmdns:4.3.200
-org.eclipse.ecf:org.eclipse.ecf.provider.jslp:3.2.200
+org.eclipse.ecf:org.eclipse.ecf.provider.jslp:3.2.202
 org.eclipse.ecf:ch.ethz.iks.slp:1.3.1

osgi.enroute.authenticator.github.provider/.settings/org.eclipse.core.resources.prefs

@@ -1,7 +1,2 @@
 eclipse.preferences.version=1
-encoding/.classpath=UTF-8
-encoding/.gitignore=UTF-8
-encoding/.project=UTF-8
-encoding//.settings/org.eclipse.jdt.core.prefs=UTF-8
-encoding//test/.gitignore=UTF-8
-encoding/bnd.bnd=UTF-8
+encoding/<project>=UTF-8

osgi.enroute.authenticator.github.provider/.settings/org.eclipse.core.runtime.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n