Repository changes

osgi · Oct 14, 2016 · a57ed9a · a57ed9a
1 parent 5a84966
commit a57ed9a
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 10 deletions.
diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -42,6 +42,13 @@ usr = ${env;REPOSITORY_USERNAME;}
 		index=${.}/osgi-nexus.maven; \
 		name="OSGiNexus"
 
+-plugin.4.Central:  \
+	aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
+		releaseUrls=https://repo1.maven.org/maven2/; \
+		pom=${.}/pom.xml; \
+		name=Central; \
+		location=${.}/target/cached.xml
+
 -releaserepo: OSGiNexus
 -baselinerepo: Distro
-
+ 
diff --git a/cnf/ext/enroute-distro.bnd b/cnf/ext/enroute-distro.bnd
@@ -9,7 +9,7 @@
 -plugin.enroute.distro = \
 	aQute.bnd.deployer.repository.FixedIndexedRepo; \
 	        name		=       Distro; \
-	        locations	=       https://raw.githubusercontent.com/osgi/osgi.enroute/master/cnf/distro/index.xml
+	        locations	=       https://raw.githubusercontent.com/osgi/osgi.enroute/v1.0.0/cnf/distro/index.xml
 
 
 -runblacklist.enroute:	\

diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>osgi.enroute.bundles</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<groupId>org.osgi</groupId>
+	<artifactId>osgi.enroute.pom.bundles</artifactId>
+	<version>2.0.0</version>
+	<packaging>pom</packaging>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.enroute.base.api</artifactId>
+			<version>2.0.0</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.htmlunit</groupId>
+			<artifactId>htmlunit</artifactId>
+			<version>2.23</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.gogo.runtime</artifactId>
+			<version>0.16.2</version>
+		</dependency>
+		<dependency>
+			<groupId>jline</groupId>
+			<artifactId>jline</artifactId>
+			<version>2.14.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.gogo.shell</artifactId>
+			<version>0.12.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.cmpn</artifactId>
+			<version>6.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.webconsole</artifactId>
+			<version>4.2.16</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.scr</artifactId>
+			<version>2.0.6</version>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/osgi.enroute.base.test/bnd.bnd b/osgi.enroute.base.test/bnd.bnd
@@ -18,7 +18,8 @@ Import-Package: com.gargoylesoftware.*;version=0,*
 	osgi.enroute.base.api;version=1.0,\
 	biz.aQute.bndlib;packages=*, \
 	osgi.enroute.junit.wrapper,\
-	net.sourceforge.htmlunit;version=2.15
+	net.sourceforge.htmlunit;version=2.15, \
+	osgi.enroute.web.simple.provider
 
 
 -runrequires: \
@@ -28,18 +29,14 @@ Import-Package: com.gargoylesoftware.*;version=0,*
 
 runsystempackages: org.junit;version=4.11, junit.framework;version=3.8
 -runbundles: \
-	biz.aQute.bndlib;version='[3.0.0,3.0.1)',\
 	com.springsource.org.json;version='[1.0.0,1.0.1)',\
 	net.sourceforge.htmlunit;version='[2.15.0,2.15.1)',\
 	org.apache.commons.fileupload;version='[1.3.1,1.3.2)',\
-	org.apache.commons.io;version='[2.4.0,2.4.1)',\
 	org.apache.felix.configadmin;version='[1.8.6,1.8.7)',\
 	org.apache.felix.http.api;version='[3.0.0,3.0.1)',\
 	org.apache.felix.http.jetty;version='[3.1.0,3.1.1)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.log;version='[1.0.1,1.0.2)',\
-	org.apache.felix.scr;version='[2.0.0,2.0.1)',\
-	org.apache.felix.webconsole;version='[4.2.8,4.2.9)',\
 	org.eclipse.equinox.coordinator;version='[1.3.100,1.3.101)',\
 	org.eclipse.equinox.event;version='[1.3.100,1.3.101)',\
 	org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\
@@ -63,7 +60,10 @@ runsystempackages: org.junit;version=4.11, junit.framework;version=3.8
 	osgi.enroute.twitter.bootstrap.webresource;version=snapshot,\
 	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)'
+	biz.aQute.bndlib;version='[3.3.0,3.3.1)',\
+	org.apache.commons.io;version='[2.5.0,2.5.1)',\
+	org.apache.felix.scr;version='[2.0.6,2.0.7)',\
+	org.apache.felix.webconsole;version='[4.2.16,4.2.17)'
 
 -osgitest=true
 

diff --git a/osgi.enroute.hamcrest.wrapper/bnd.bnd b/osgi.enroute.hamcrest.wrapper/bnd.bnd
@@ -5,6 +5,6 @@ Bundle-License:		http://opensource.org/licenses/BSD-2-Clause
 Bundle-Copyright: 	Copyright 2012- hamcrest.org
 
 -buildpath: \
-	org.hamcrest__hamcrest-all;version=1.3
+	org.hamcrest:hamcrest-all;version=1.3
 
 -includeresource: LICENSE.txt
diff --git a/osgi.enroute.junit.wrapper/bnd.bnd b/osgi.enroute.junit.wrapper/bnd.bnd
@@ -17,6 +17,6 @@ Import-Package:\
 	*
 
 -buildpath: \
-	junit__junit
+	junit:junit
 
 -includeresource: LICENSE.txt