versions streamlined. Except for the web resources and wrapped projec…

…ts all use a single version
dleangen · Jun 8, 2016 · d11d6d8 · d11d6d8
1 parent 7eedb9b
commit d11d6d8
Show file tree

Hide file tree

Showing 39 changed files with 35 additions and 44 deletions.
diff --git a/osgi.enroute.authenticator.github.provider/bnd.bnd b/osgi.enroute.authenticator.github.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-Bundle-Version:					1.0.1.REL
 Bundle-Description: 				\
 	OAuth2 tests
 
@@ -67,4 +66,4 @@ Conditional-Package: aQute.lib*
 	osgi.enroute.web.simple.provider;version='[1.3.3,1.3.4)',\
 	osgi.enroute.webconsole.xray.provider;version=snapshot,\
 	osgi.promise;version='[6.0.0,6.0.1)'
-Export-Package: osgi.enroute.oauth2.api
+Export-Package: osgi.enroute.oauth2.api
diff --git a/osgi.enroute.authenticator.simple.provider/bnd.bnd b/osgi.enroute.authenticator.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.0.2
 Bundle-Description: 				\
 	An implementation of the Authenticator API based on User Admin.
 

diff --git a/osgi.enroute.authorization.simple.provider/bnd.bnd b/osgi.enroute.authorization.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.1.0
 Bundle-Description: 				\
 	An implementation of the OSGi enRoute Authorization API based on the \
 	User Admin roles. For a user, the Authorization object is maintained and \

diff --git a/osgi.enroute.base.debug.provider/bnd.bnd b/osgi.enroute.base.debug.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.1.0
 Bundle-Description: 				\
 	Provides Gogo shell commands that are quite se
 

diff --git a/osgi.enroute.base.test/bnd.bnd b/osgi.enroute.base.test/bnd.bnd
@@ -2,7 +2,6 @@
 # OSGI ENROUTE BASE TEST OSGi TEST BUNDLE 
 #
 
-base.version: 1.0.2
 Bundle-Description: \
  	This bundle tests all the bundles for enRoute in this repository.
 

diff --git a/osgi.enroute.base.test/resources/webresources.bnd b/osgi.enroute.base.test/resources/webresources.bnd
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: 	test
-Bundle-Version: 		1.2.3
+
 -resourceonly:			true
 -includeresource:		\
 	static/test.html;literal='<html><head> \

diff --git a/osgi.enroute.command.enroute.provider/bnd.bnd b/osgi.enroute.command.enroute.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-Bundle-Version:					1.0.0.${tstamp}
 Bundle-Description: 				\
 	Provides a number of commands that are dearly needed in Gogo. There is \
 	special help support so type: `help` and you see all commands. Then type `help <cmd>` \

diff --git a/osgi.enroute.configurer.simple.provider/bnd.bnd b/osgi.enroute.configurer.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.2.2
 Bundle-Description: 		This component is an extender that reads the /configuration/configuration.json file \
  and installs the list of maps in there as configuration. The configurer supports a number of features \
  like profiles, macro expansion, binary resource handling, and configuration through system properties. \

diff --git a/osgi.enroute.dtos.bndlib.provider/bnd.bnd b/osgi.enroute.dtos.bndlib.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.0.0
 Bundle-Description: 				\
 	A provider of the DTOs service 
 Export-Package:  \

diff --git a/osgi.enroute.easse.simple.adapter/bnd.bnd b/osgi.enroute.easse.simple.adapter/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.3.2
 Bundle-Description: 				\
 	Provides a mapping from Event Admin events to Javascript Server Side Events (SSE). \
 	This bundle registers under /sse/1, the remaining path is treated as the topic. It \

diff --git a/osgi.enroute.equinox.log.adapter/bnd.bnd b/osgi.enroute.equinox.log.adapter/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.0.1
 Bundle-Description: 				\
 	This bundle must be placed on the run path or test path. It will then hide the Equinox Log Service \
 	while forwarding all events to all registered Log Services. If not running on \

diff --git a/osgi.enroute.executor.simple.provider/bnd.bnd b/osgi.enroute.executor.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.0.0
 Bundle-Description: 				\
 	This bundle provides an Executor service.
 Private-Package:  \

diff --git a/osgi.enroute.github.angular-ui.webresource/bnd.bnd b/osgi.enroute.github.angular-ui.webresource/bnd.bnd
@@ -17,7 +17,11 @@ Bundle-Description: 				\
 	dependencies (jQuery, bootstrap JS) required!
 
 Bundle-DocURL:			http://angular-ui.github.io/bootstrap/
-Bundle-SCM:				[email protected]:angular-ui/bootstrap.git
+Bundle-SCM:				\
+						url=https://github.com/angular-ui/bootstrap, \
+						connection=https://github.com/angular-ui/bootstrap.git, \
+                        developerConnection=scm:[email protected]:angular-ui/bootstrap.git
+
 Bundle-License:			http://opensource.org/licenses/MIT;link = "http://en.wikipedia.org/wiki/MIT_License";description = "MIT License"
 Bundle-Icon: 			https://2.gravatar.com/avatar/46d07086561c66caae16ce4d96bfd345?d=https%3A%2F%2Fidenticons.github.com%2F3902b30e7e55d0ffde5994d69bf8d4e6.png&s=64
 Export-Package: 		osgi.enroute.github.angular_ui.capabilities;-split-package:=first

diff --git a/osgi.enroute.gogo.shell.provider/bnd.bnd b/osgi.enroute.gogo.shell.provider/bnd.bnd
@@ -2,7 +2,6 @@
 # OSGi enRoute Gogo Shell
 #
 
-base.version: 1.0.0
 Bundle-Name: OSGi enRoute Gogo Shell
 Bundle-Description: \
 	An adaption of the famous Apache Felix Gogo shell that uses JLine to provide command \

diff --git a/osgi.enroute.google.angular.webresource/bnd.bnd b/osgi.enroute.google.angular.webresource/bnd.bnd
@@ -21,6 +21,11 @@ Bundle-Icon: 			angular.png
 Bundle-License:			http://opensource.org/licenses/MIT"
 Export-Package: 		osgi.enroute.google.angular.capabilities;-split-package:=first
 Bundle-Copyright:		Copyright (c) 2010-${tstamp;YYYY} Google, Inc. http://angularjs.org
+Bundle-SCM:				\
+						url=https://github.com/angular/angular.js, \
+						[email protected]:angular/angular.js.git, \
+                        developerConnection=scm:[email protected]:angular/angular.js.git
+
 Provide-Capability: \
 	osgi.enroute.webresource; \
 		osgi.enroute.webresource=${name}; \

diff --git a/osgi.enroute.hamcrest.wrapper/bnd.bnd b/osgi.enroute.hamcrest.wrapper/bnd.bnd
@@ -1,5 +1,4 @@
-base.version: 1.3.0
-
+base.version		1.3.0
 Export-Package: 	*;version=1.3.0
 Import-Package: 	*;resolution:=optional
 Bundle-License:		http://opensource.org/licenses/BSD-2-Clause

diff --git a/osgi.enroute.iot.circuit.application/bnd.bnd b/osgi.enroute.iot.circuit.application/bnd.bnd
@@ -2,7 +2,6 @@
 # OSGI ENROUTE IOT CIRCUIT APPLICATION APPLICATION
 #
 
-base.version: 1.0.2
 Bundle-Description: \
 	A GUI for the Circuit Admin. This application shows the registered ICs + wires \
 	and can wire ICs together.

diff --git a/osgi.enroute.iot.circuit/bnd.bnd b/osgi.enroute.iot.circuit/bnd.bnd
@@ -2,8 +2,6 @@
 # OSGI ENROUTE IOT CIRCUIT
 #
 
-base.version: 1.0.0
-
 Conditional-Package: aQute.lib*
 
 

diff --git a/osgi.enroute.iot.circuit/command.bnd b/osgi.enroute.iot.circuit/command.bnd
@@ -2,7 +2,6 @@
 # OSGI ENROUTE IOT CIRCUIT GOGO COMMAND BUNDLE (circuit) 
 #
 
-base.version: 1.0.1
 Bundle-Description: \
 	Commands for the Circuit Admin. These command can connect, disconnect, and \
 	and show information abou the current circuit board.

diff --git a/osgi.enroute.iot.circuit/provider.bnd b/osgi.enroute.iot.circuit/provider.bnd
@@ -2,7 +2,6 @@
 # OSGI ENROUTE IOT CIRCUIT	BUNDLE 
 #
 
-base.version: 2.0.1
 Bundle-Description: \
 	Implements a Circuit Board for ICs. ICs have inputs and outputs. The Circuit board \
 	can fire events to the ICs and ICs can fire events to the board. The board then dispatches \

diff --git a/osgi.enroute.iot.lego.adapter/bnd.bnd b/osgi.enroute.iot.lego.adapter/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.0.1
 Bundle-Description: 				\
 	This bundle implements an IC that takes as input the A & B motor controls from the \
 	Lego IR adapter. It translates these controls to an IR Wave that is compatbile with \

diff --git a/osgi.enroute.iot.pi/bnd.bnd b/osgi.enroute.iot.pi/bnd.bnd
@@ -2,7 +2,6 @@
 # OSGI ENROUTE IOT PI DEFAULTS
 #
 
-base.version: 1.1.0
 Bundle-Description: \
 	This bundle wraps Pi4j (http://pi4j.com) that wraps the native code Wiring Pi (http://wiringpi.com). \
 	It wraps these libraries to make them OSGi friendly and allow them to work together with the \

diff --git a/osgi.enroute.iot.pi/command.bnd b/osgi.enroute.iot.pi/command.bnd
@@ -11,4 +11,3 @@ Private-Package:  \
 
 
 -includeresource: {readme.md}
-base.version: 1.0.1
diff --git a/osgi.enroute.iot.pi/provider.bnd b/osgi.enroute.iot.pi/provider.bnd
@@ -2,7 +2,7 @@
 # OSGI ENROUTE IOT PI	BUNDLE 
 #
 
-	
+
 Export-Package: \
 	osgi.enroute.iot.pi.api,\
 	com.pi4j.io,\
@@ -12,12 +12,12 @@ Export-Package: \
 	com.pi4j.io.gpio.trigger,\
 	com.pi4j.system
 
-Private-Package: osgi.enroute.iot.pi.provider
+Private-Package: osgi.enroute.iot.pi.provider, com.pi4j.*, lib*
 
--includeresource: @jar/pi4j-core.jar, {readme.md}
+-includeresource: {readme.md}
 
 Provide-Capability: osgi.service;objectClass=com.pi4j.io.gpio.GpioController
-base.version: 1.1.0
+
 Import-Package: \
 	aQute.bnd.annotation.metatype;resolution:=optional,\
 	*
diff --git a/osgi.enroute.iot.rf522.adapter/bnd.bnd b/osgi.enroute.iot.rf522.adapter/bnd.bnd
@@ -4,7 +4,6 @@
 
 -nobundles: true
 
-base.version: 1.0.0
 Bundle-Description: 				\
 	A bundle with a provider. Notice that this provider exports the API package. \
 	It also provides a JUnit test and it can be run standalone. \

diff --git a/osgi.enroute.jdbc.datasource.provider/bnd.bnd b/osgi.enroute.jdbc.datasource.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 -nobundles: true
 
-Bundle-Version:					1.0.0.${tstamp}
 Bundle-Description: 				\
 	An alternative to PAX JDBC's config bundle because it assumes the config dictionary values are all \
 	string and does not provide Metatype information.

diff --git a/osgi.enroute.jsonrpc.simple.provider/bnd.bnd b/osgi.enroute.jsonrpc.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.1.3
 Bundle-Description: 				\
 	A simple implementation of the JSON RPC 2.0 specification. This bundle \
 	tracks any JSONRPC services. It assumes all public methods on the implementation \

diff --git a/osgi.enroute.jsplumb.webresource/bnd.bnd b/osgi.enroute.jsplumb.webresource/bnd.bnd
@@ -15,6 +15,10 @@ Bundle-License:			http://opensource.org/licenses/MIT, link="https://github.com/s
 Bundle-DocURL:			http://jsplumb.org/doc/home.html
 Bundle-Icon:			https://jsplumbtoolkit.com/img/logo-jsplumb-green.png
 Export-Package: 		osgi.enroute.jsplumb.capabilities;-split-package:=first
+Bundle-SCM:				\
+						url=https://github.com:sporritt/jsPlumb, \
+						connection=scm:[email protected]:sporritt/jsPlumb.git, \
+                        developerConnection=scm:[email protected]:sporritt/jsPlumb.git
 
 Provide-Capability: 	\
 	osgi.enroute.webresource; \

diff --git a/osgi.enroute.logger.simple.provider/bnd.bnd b/osgi.enroute.logger.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.2.1
 Bundle-Description: 				\
 	Provides a simple implementation of the OSGi SLF4J bridge, includes shell command
 Export-Package:  \
@@ -16,6 +15,9 @@ Private-Package:  \
 	org.slf4j.impl;-split-package:=first,\
 	org.slf4j.spi
 Bundle-License:			http://opensource.org/licenses/BSD-2-Clause
+Import-Package: \
+	aQute.bnd.annotation.metatype;resolution:=optional,\
+	*
 Conditional-Package: 	aQute.lib*
 
 -buildpath:  \
@@ -52,4 +54,4 @@ Import-Package: \
 	org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
 	org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
 	osgi.enroute.gogo.shell.provider;version=snapshot,\
-	osgi.enroute.logger.simple.provider;version=snapshot
+	osgi.enroute.logger.simple.provider;version=snapshot
diff --git a/osgi.enroute.logreader.rolling.provider/bnd.bnd b/osgi.enroute.logreader.rolling.provider/bnd.bnd
@@ -3,7 +3,7 @@
 #
 
 
-Bundle-Version:					1.0.0.${tstamp}
+
 Bundle-Description: 				\
 	Implements a Log Reader that stores the logs on disks and rolls them over.
 

diff --git a/osgi.enroute.quantity.util/bnd.bnd b/osgi.enroute.quantity.util/bnd.bnd
@@ -2,7 +2,6 @@
 # OSGI ENROUTE QUANTITY UTIL DEFAULTS
 #
 
-Bundle-Version:					0.0.0.${tstamp}
 Bundle-Description: 				\
 	A proposal for a quantity API. This proposal is in the same realm as the \
 	JSR 363 JCP API. The reason to do this different has several reasons. However, \

diff --git a/osgi.enroute.rest.simple.provider/bnd.bnd b/osgi.enroute.rest.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 2.0.2
 Bundle-Description: 				\
 	A simple REST endpoint. This service will look for REST services. It then \
 	assumes any public method that has an interface that extends RESTRequest \

diff --git a/osgi.enroute.scheduler.simple.provider/bnd.bnd b/osgi.enroute.scheduler.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.1.1
 Bundle-Description: 				\
   This bundle implements a scheduler and some Promise support methods related to time.  
 Private-Package:  \

diff --git a/osgi.enroute.stackexchange.pagedown.webresource/bnd.bnd b/osgi.enroute.stackexchange.pagedown.webresource/bnd.bnd
@@ -35,6 +35,11 @@ Bundle-Copyright:		\
 	(c) 2009-2014 Stack Exchange Inc.
 
 Export-Package: 		osgi.enroute.stackexchange.pagedown.capabilities;-split-package:=first
+Bundle-SCM:				\
+						url=http://code.google.com/p/pagedown/, \
+						connection=scm:[email protected]:ujifgc/pagedown.git, \
+                        developerConnection=scm:[email protected]:ujifgc/pagedown.git
+
 Provide-Capability: \
 	osgi.enroute.webresource; \
 		osgi.enroute.webresource=${name}; \

diff --git a/osgi.enroute.twitter.bootstrap.webresource/bnd.bnd b/osgi.enroute.twitter.bootstrap.webresource/bnd.bnd
@@ -22,6 +22,10 @@ Provide-Capability: 	\
 		osgi.enroute.webresource=${name}; \
 		root=${path}; \
 		version:Version=${base.version}
+Bundle-SCM:				\
+						url=https://github.com/angular/angular.js, \
+						connection=scm:[email protected]:twbs/bootstrap.git, \
+                        developerConnection=scm:[email protected]:twbs/bootstrap.git
 
 -buildpath: \
 	osgi.enroute.base.api

diff --git a/osgi.enroute.web.simple.provider/bnd.bnd b/osgi.enroute.web.simple.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.3.3
 Bundle-Description: 				\
 	Provides a simple implementation of the OSGi enRoute webserver with a number \
 	of useful filters.
@@ -65,4 +64,3 @@ Conditional-Package: aQute.lib*
 
 
 -runtrace: true
-Bundle-Version: 1.3.4.${tstamp}
diff --git a/osgi.enroute.web.simple.test/bnd.bnd b/osgi.enroute.web.simple.test/bnd.bnd
@@ -3,8 +3,6 @@
 #
 
 
-base.version: 1.3.3
-Bundle-Version:					1.0.0.${tstamp}
 Bundle-Description: Test case for osgi.enroute.web.simple.provider
 
 Private-Package:  \

diff --git a/osgi.enroute.webconsole.xray.provider/bnd.bnd b/osgi.enroute.webconsole.xray.provider/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 2.0.0
 Bundle-Description: A plugin for the Apache Felix Webconsole. When installed, this bundle \
  will add a tab on the Web Console that provides a graphic overview of the \
  OSGi framework, including services, bundles, and components. Colors are used to \

diff --git a/osgi.enroute.websecurity.adapter/bnd.bnd b/osgi.enroute.websecurity.adapter/bnd.bnd
@@ -3,7 +3,6 @@
 #
 
 
-base.version: 1.1.2
 Bundle-Description: 				\
 	Provides a filter that will start a Coordinator
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     #
-    base.version: 1.0.2
     Bundle-Description: 				\
     	An implementation of the Authenticator API based on User Admin.
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@ Private-Package: \


		-includeresource: {readme.md}
		base.version: 1.0.1