You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2016/11/24 10:53:34 UTC
[30/50] [abbrv] aries-jax-rs-whiteboard git commit: bndrun config
bndrun config
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f1252f85
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f1252f85
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f1252f85
Branch: refs/heads/master
Commit: f1252f85d8e2a80dd64edf47ee27c518fa992e28
Parents: 854ba8f
Author: Raymond Auge <ra...@liferay.com>
Authored: Fri Oct 28 06:24:13 2016 +0200
Committer: Raymond Auge <ra...@liferay.com>
Committed: Fri Oct 28 06:24:13 2016 +0200
----------------------------------------------------------------------
bndrun/org.apache.aries.jax-rs.example.bndrun | 50 ++++++++++------------
bndrun/pom.xml | 16 +++++++
2 files changed, 38 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f1252f85/bndrun/org.apache.aries.jax-rs.example.bndrun
----------------------------------------------------------------------
diff --git a/bndrun/org.apache.aries.jax-rs.example.bndrun b/bndrun/org.apache.aries.jax-rs.example.bndrun
index 27ef6ab..e3ee47a 100644
--- a/bndrun/org.apache.aries.jax-rs.example.bndrun
+++ b/bndrun/org.apache.aries.jax-rs.example.bndrun
@@ -1,7 +1,7 @@
-standalone:
-include: ${.}/augments.bnd
--plugin.pom.repo = \
+-plugin.A.pom.repo = \
aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
releaseUrls=https://repo1.maven.org/maven2/; \
@@ -9,35 +9,29 @@
name=pom.repo; \
location=${.}/target/cached.xml
--runrequires: osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)'
+-runrequires: \
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.cxf-common)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax-rs.example)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.rest.extender)'
+
-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
-runbundles: \
- log4j;version='[1.2.17,1.2.18)',\
- org.apache.aries.jax-rs.example;version=snapshot,\
- org.apache.aries.jax-rs.cxf-common;version='[1.0.0,1.0.1)',\
- org.apache.aries.rest.extender;version='[1.0.0,1.0.1)',\
- org.apache.commons.fileupload;version='[1.2.2,1.2.3)',\
- 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.scr;version='[2.0.6,2.0.7)',\
- org.eclipse.equinox.http.jetty;version='[3.4.0,3.4.1)',\
- org.eclipse.equinox.http.servlet;version='[1.4.0,1.4.1)',\
- org.eclipse.equinox.metatype;version='[1.4.200,1.4.201)',\
- org.eclipse.jetty.http;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.io;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.security;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.server;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.servlet;version='[9.3.9,9.3.10)',\
- org.eclipse.jetty.util;version='[9.3.9,9.3.10)',\
- org.objectweb.asm.all.debug;version='[5.0.3,5.0.4)',\
- org.osgi.service.metatype;version='[1.3.0,1.3.1)',\
- org.slf4j.api;version='[1.7.2,1.7.3)',\
- org.apache.felix.bundlerepository;version='[2.0.8,2.0.9)',\
- org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\
- org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\
- org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\
- javax.servlet-api;version='[3.1.0,3.1.1)'
+ log4j; version='[1.2.17,1.2.18)',\
+ org.apache.aries.jax-rs.cxf-common; version='[1.0.0,1.0.1)',\
+ org.apache.aries.jax-rs.example; version='[1.0.0,1.0.1)',\
+ org.apache.aries.rest.extender; version='[1.0.0,1.0.1)',\
+ org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\
+ org.apache.felix.http.jetty; version='[3.2.0,3.2.1)',\
+ org.apache.felix.http.servlet-api; version='[1.1.2,1.1.3)',\
+ org.apache.felix.scr; version='[2.0.2,2.0.3)',\
+ org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\
+ org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\
+ org.objectweb.asm; version='[5.0.4,5.0.5)',\
+ org.osgi.service.event; version='[1.3.1,1.3.2)',\
+ org.osgi.service.http.whiteboard; version='[1.0.0,1.0.1)',\
+ org.osgi.service.metatype; version='[1.3.0,1.3.1)',\
+ slf4j.api; version='[1.7.21,1.7.22)',\
+ slf4j.log4j12; version='[1.6.1,1.6.2)'
-runee: JavaSE-1.8
-resolve.effective: resolve, active
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f1252f85/bndrun/pom.xml
----------------------------------------------------------------------
diff --git a/bndrun/pom.xml b/bndrun/pom.xml
index 444e74d..01ed697 100644
--- a/bndrun/pom.xml
+++ b/bndrun/pom.xml
@@ -19,6 +19,7 @@
<artifactId>bnd-export-maven-plugin</artifactId>
<version>3.4.0-SNAPSHOT</version>
<configuration>
+ <failOnChanges>false</failOnChanges>
<resolve>true</resolve>
<bndruns>
<bndrun>org.apache.aries.jax-rs.example.bndrun</bndrun>
@@ -38,10 +39,25 @@
<dependencies>
<dependency>
<groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.jax-rs.cxf-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.jax-rs.example</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.rest.extender</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.enroute.pom.distro</artifactId>
<version>2.0.0</version>