[ARIES-JAXRS] simplify using latest bnd maven plugins Signed-off-by: Raymond Auge <[email protected]>
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/f8a7138a Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f8a7138a Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f8a7138a Branch: refs/heads/master Commit: f8a7138a50be8488b1fdb32c92735ee21d2333b6 Parents: 2bac01c Author: Raymond Auge <[email protected]> Authored: Thu Feb 23 16:27:24 2017 -0500 Committer: Raymond Auge <[email protected]> Committed: Fri Feb 24 10:11:03 2017 -0500 ---------------------------------------------------------------------- jax-rs.example-run/LICENSE | 202 -------------------------------- jax-rs.example-run/augments.bnd | 77 ------------ jax-rs.example-run/example.bndrun | 57 --------- jax-rs.example-run/pom.xml | 94 --------------- jax-rs.example/.gitignore | 2 - jax-rs.example/augments.bnd | 77 ++++++++++++ jax-rs.example/example.bndrun | 49 ++++++++ jax-rs.example/pom.xml | 130 ++++++++++++++++++-- jax-rs.itests-run/LICENSE | 202 -------------------------------- jax-rs.itests-run/itest.bndrun | 56 --------- jax-rs.itests-run/pom.xml | 92 --------------- jax-rs.itests/bnd.bnd | 4 +- jax-rs.itests/itest.bndrun | 45 +++++++ jax-rs.itests/pom.xml | 99 +++++++++++++++- jax-rs.log4j-configuration/pom.xml | 13 +- jax-rs.whiteboard/pom.xml | 9 ++ pom.xml | 142 +++++++++++++++------- 17 files changed, 508 insertions(+), 842 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.example-run/LICENSE ---------------------------------------------------------------------- diff --git a/jax-rs.example-run/LICENSE b/jax-rs.example-run/LICENSE deleted file mode 100644 index d645695..0000000 --- a/jax-rs.example-run/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.example-run/augments.bnd ---------------------------------------------------------------------- diff --git a/jax-rs.example-run/augments.bnd b/jax-rs.example-run/augments.bnd deleted file mode 100644 index aa1cca1..0000000 --- a/jax-rs.example-run/augments.bnd +++ /dev/null @@ -1,77 +0,0 @@ --augment.javax.servlet-api: \ - javax.servlet-api; \ - requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'" - --augment.javax.ws.rs-api: \ - javax.ws.rs-api; \ - requirement:="osgi.implementation;filter:='(osgi.implementation=aries.jax-rs)'" - --augment.org.apache.commons.fileupload: \ - org.apache.commons.fileupload; \ - capability:=" generic.dependency;generic.dependency='commons.fileupload'" - --augment.org.apache.felix.gogo.command: \ - org.apache.felix.gogo.command; \ - capability:=" generic.dependency;generic.dependency='gogo.shell.command';version:Version='1.0.0'"; \ - version='1.0.0' - --augment.org.apache.felix.gogo.shell: \ - org.apache.felix.gogo.shell; \ - capability:=" osgi.implementation;osgi.implementation='gogo.shell';version:Version='1.0.0'"; \ - requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \ - version='1.0.0' - --augment.org.apache.felix.gogo.jline: \ - org.apache.felix.gogo.jline; \ - capability:=" osgi.implementation;osgi.implementation='gogo.jline';version:Version='1.0.0'"; \ - requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \ - version='1.0.0' - --augment.org.apache.felix.log: \ - org.apache.felix.log; \ - capability:=" osgi.implementation;osgi.implementation=osgi.log" - --augment.org.apache.felix.scr: \ - org.apache.felix.scr; \ - requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'" - --augment.org.eclipse.equinox.coordinator: \ - org.eclipse.equinox.coordinator; \ - capability:=" osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active, \ - osgi.implementation;osgi.implementation=osgi.coordinator" - --augment.org.eclipse.equinox.event: \ - org.eclipse.equinox.event; \ - capability:=" osgi.service;objectClass=org.osgi.service.event.EventAdmin;effective:=active, \ - osgi.implementation;osgi.implementation=osgi.event"; \ - requirement:="osgi.extender;filter:='(osgi.extender=osgi.component)'" - --augment.org.eclipse.equinox.http.jetty: \ - org.eclipse.equinox.http.jetty; \ - capability:=" equinox.module.data;activation.policy=eager, \ - generic.dependency;generic.dependency='osgi.servlet.container';version:Version='1.0.0'" - --augment.org.eclipse.equinox.http.servlet: \ - org.eclipse.equinox.http.servlet; \ - capability:=" equinox.module.data;activation.policy=eager"; \ - requirement:="generic.dependency;filter:='(generic.dependency=commons.fileupload)';effective:=active,\ - generic.dependency;filter:='(generic.dependency=osgi.servlet.container)';effective:=active" - --augment.org.knopflerfish.bundle.useradmin: \ - org.knopflerfish.bundle.useradmin; \ - capability:=" osgi.service;objectClass:List<String>=org.osgi.service.useradmin.UserAdmin;effective:=active, \ - osgi.implementation;osgi.implementation=osgi.useradmin" - --augment.org.osgi.service.event: \ - org.osgi.service.event; \ - requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.event)'" - --augment.org.osgi.service.metatype: \ - org.osgi.service.metatype; \ - requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'" - --augment.org.osgi.service.remoteserviceadmin: \ - org.osgi.service.remoteserviceadmin; \ - requirement:="osgi.remoteserviceadmin.distribution;filter:='(configs=*)', \ - osgi.remoteserviceadmin.topology;filter:='(policy=*)', \ - osgi.remoteserviceadmin.discovery;filter:='(protocols=*)'" http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.example-run/example.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.example-run/example.bndrun b/jax-rs.example-run/example.bndrun deleted file mode 100644 index 376ea3f..0000000 --- a/jax-rs.example-run/example.bndrun +++ /dev/null @@ -1,57 +0,0 @@ --standalone: --include: ${.}/augments.bnd --resourceonly: true - --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/; \ - pom=${.}/pom.xml; \ - name=pom.repo; \ - location=${.}/target/cached.xml - --runrequires: \ - osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\ - osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)',\ - osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)' - - # ,\ -# osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)' - --runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]' --runbundles: \ - javax.annotation-api; version='[1.2.0,1.2.1)',\ - javax.json-api; version='[1.0.0,1.0.1)',\ - javax.ws.rs-api; version='[2.0.1,2.0.2)',\ - log4j; version='[1.2.17,1.2.18)',\ - org.apache.aries.jax.rs.example; version='[0.0.1,0.0.2)',\ - org.apache.aries.jax.rs.log4j-configuration; version='[0.0.1,0.0.2)',\ - org.apache.aries.jax.rs.whiteboard; version='[0.0.1,0.0.2)',\ - org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\ - org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\ - org.apache.felix.gogo.command; version='[1.0.0,1.0.1)',\ - org.apache.felix.gogo.jline; version='[1.0.0,1.0.1)',\ - org.apache.felix.gogo.runtime; version='[1.0.0,1.0.1)',\ - org.apache.felix.http.api; version='[3.0.0,3.0.1)',\ - org.apache.felix.http.jetty; version='[3.4.0,3.4.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.apache.ws.xmlschema.core; version='[2.2.1,2.2.2)',\ - org.eclipse.equinox.event; version='[1.3.100,1.3.101)',\ - org.eclipse.equinox.metatype; version='[1.4.100,1.4.101)',\ - org.jline; version='[3.0.0,3.0.1)',\ - org.objectweb.asm; version='[5.0.4,5.0.5)',\ - org.osgi.service.event; version='[1.3.1,1.3.2)',\ - 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 --runproperties: \ - osgi.console.enable.builtin=false, \ - osgi.console=, \ - org.osgi.service.http.port=8080 --runsystemcapabilities.dflt: ${native_capability} --runblacklist:\ - osgi.identity;filter:='(osgi.identity=org.osgi.compendium)' http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.example-run/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.example-run/pom.xml b/jax-rs.example-run/pom.xml deleted file mode 100644 index 1fe66a1..0000000 --- a/jax-rs.example-run/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - - <artifactId>org.apache.aries.jax.rs.example-run</artifactId> - <description>Apache Aries JAX-RS Example Run Configuration</description> - <name>Apache Aries JAX-RS Example Run Configuration</name> - <packaging>pom</packaging> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-export-maven-plugin</artifactId> - <version>3.4.0-SNAPSHOT</version> - <configuration> - <failOnChanges>false</failOnChanges> - <resolve>false</resolve> - <bndruns> - <bndrun>example.bndrun</bndrun> - </bndruns> - <targetDir>.</targetDir> - </configuration> - <executions> - <execution> - <goals> - <goal>export</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.example</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId> - <version>0.0.1-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.apache.felix</groupId> - <artifactId>org.apache.felix.gogo.command</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.gogo.jline</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.enroute.pom.distro</artifactId> - <version>2.0.0</version> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.example/.gitignore ---------------------------------------------------------------------- diff --git a/jax-rs.example/.gitignore b/jax-rs.example/.gitignore deleted file mode 100644 index 83ccc54..0000000 --- a/jax-rs.example/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build/ -/bin/ http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.example/augments.bnd ---------------------------------------------------------------------- diff --git a/jax-rs.example/augments.bnd b/jax-rs.example/augments.bnd new file mode 100644 index 0000000..aa1cca1 --- /dev/null +++ b/jax-rs.example/augments.bnd @@ -0,0 +1,77 @@ +-augment.javax.servlet-api: \ + javax.servlet-api; \ + requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.http)'" + +-augment.javax.ws.rs-api: \ + javax.ws.rs-api; \ + requirement:="osgi.implementation;filter:='(osgi.implementation=aries.jax-rs)'" + +-augment.org.apache.commons.fileupload: \ + org.apache.commons.fileupload; \ + capability:=" generic.dependency;generic.dependency='commons.fileupload'" + +-augment.org.apache.felix.gogo.command: \ + org.apache.felix.gogo.command; \ + capability:=" generic.dependency;generic.dependency='gogo.shell.command';version:Version='1.0.0'"; \ + version='1.0.0' + +-augment.org.apache.felix.gogo.shell: \ + org.apache.felix.gogo.shell; \ + capability:=" osgi.implementation;osgi.implementation='gogo.shell';version:Version='1.0.0'"; \ + requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \ + version='1.0.0' + +-augment.org.apache.felix.gogo.jline: \ + org.apache.felix.gogo.jline; \ + capability:=" osgi.implementation;osgi.implementation='gogo.jline';version:Version='1.0.0'"; \ + requirement:="generic.dependency;filter:='(generic.dependency=gogo.shell.command)';effective:=active"; \ + version='1.0.0' + +-augment.org.apache.felix.log: \ + org.apache.felix.log; \ + capability:=" osgi.implementation;osgi.implementation=osgi.log" + +-augment.org.apache.felix.scr: \ + org.apache.felix.scr; \ + requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'" + +-augment.org.eclipse.equinox.coordinator: \ + org.eclipse.equinox.coordinator; \ + capability:=" osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active, \ + osgi.implementation;osgi.implementation=osgi.coordinator" + +-augment.org.eclipse.equinox.event: \ + org.eclipse.equinox.event; \ + capability:=" osgi.service;objectClass=org.osgi.service.event.EventAdmin;effective:=active, \ + osgi.implementation;osgi.implementation=osgi.event"; \ + requirement:="osgi.extender;filter:='(osgi.extender=osgi.component)'" + +-augment.org.eclipse.equinox.http.jetty: \ + org.eclipse.equinox.http.jetty; \ + capability:=" equinox.module.data;activation.policy=eager, \ + generic.dependency;generic.dependency='osgi.servlet.container';version:Version='1.0.0'" + +-augment.org.eclipse.equinox.http.servlet: \ + org.eclipse.equinox.http.servlet; \ + capability:=" equinox.module.data;activation.policy=eager"; \ + requirement:="generic.dependency;filter:='(generic.dependency=commons.fileupload)';effective:=active,\ + generic.dependency;filter:='(generic.dependency=osgi.servlet.container)';effective:=active" + +-augment.org.knopflerfish.bundle.useradmin: \ + org.knopflerfish.bundle.useradmin; \ + capability:=" osgi.service;objectClass:List<String>=org.osgi.service.useradmin.UserAdmin;effective:=active, \ + osgi.implementation;osgi.implementation=osgi.useradmin" + +-augment.org.osgi.service.event: \ + org.osgi.service.event; \ + requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.event)'" + +-augment.org.osgi.service.metatype: \ + org.osgi.service.metatype; \ + requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'" + +-augment.org.osgi.service.remoteserviceadmin: \ + org.osgi.service.remoteserviceadmin; \ + requirement:="osgi.remoteserviceadmin.distribution;filter:='(configs=*)', \ + osgi.remoteserviceadmin.topology;filter:='(policy=*)', \ + osgi.remoteserviceadmin.discovery;filter:='(protocols=*)'" http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.example/example.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.example/example.bndrun b/jax-rs.example/example.bndrun new file mode 100644 index 0000000..de1c487 --- /dev/null +++ b/jax-rs.example/example.bndrun @@ -0,0 +1,49 @@ +-standalone: ${.}/target/index.xml +-include: ${.}/augments.bnd +-resourceonly: true + +-runrequires: \ + osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\ + osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)',\ + osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\ + osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' + +-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]' +-runbundles: \ + javax.annotation-api;version='[1.2.0,1.2.1)',\ + javax.json-api;version='[1.0.0,1.0.1)',\ + javax.ws.rs-api;version='[2.0.1,2.0.2)',\ + log4j;version='[1.2.17,1.2.18)',\ + org.apache.aries.jax.rs.example;version='[0.0.1,0.0.2)',\ + org.apache.aries.jax.rs.log4j-configuration;version='[0.0.1,0.0.2)',\ + org.apache.aries.jax.rs.whiteboard;version='[0.0.1,0.0.2)',\ + org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\ + org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\ + org.apache.felix.gogo.command;version='[1.0.0,1.0.1)',\ + org.apache.felix.gogo.jline;version='[1.0.0,1.0.1)',\ + org.apache.felix.gogo.runtime;version='[1.0.0,1.0.1)',\ + org.apache.felix.http.api;version='[3.0.0,3.0.1)',\ + org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\ + org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ + org.apache.felix.scr;version='[2.0.8,2.0.9)',\ + org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\ + org.eclipse.equinox.metatype;version='[1.4.100,1.4.101)',\ + org.jline;version='[3.0.0,3.0.1)',\ + org.objectweb.asm;version='[5.0.4,5.0.5)',\ + org.osgi.service.cm;version='[1.5.0,1.5.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 +-runproperties: \ + osgi.console.enable.builtin=false, \ + osgi.console=, \ + org.osgi.service.http.port=8080 +-runsystemcapabilities: ${native_capability} +-runblacklist:\ + osgi.identity;filter:='(osgi.identity=org.osgi.compendium)',\ + osgi.identity;filter:='(osgi.identity=osgi.cmpn)' + http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.example/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml index 9200bd2..4a71297 100644 --- a/jax-rs.example/pom.xml +++ b/jax-rs.example/pom.xml @@ -15,12 +15,10 @@ specific language governing permissions and limitations under the License. --> -<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"; -> +<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> <groupId>org.apache.aries.jax.rs</groupId> <artifactId>org.apache.aries.jax.rs</artifactId> @@ -28,19 +26,131 @@ </parent> <artifactId>org.apache.aries.jax.rs.example</artifactId> - <description>Apache Aries JAX-RS Example</description> - <name>Apache Aries JAX-RS Example</name> + <description>Apache Aries JAX-RS Executable Example</description> + <name>Apache Aries JAX-RS Executable Example</name> + <build> + <plugins> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-indexer-maven-plugin</artifactId> + <configuration> + <includeJar>true</includeJar> + <localURLs>REQUIRED</localURLs> + </configuration> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-resolver-maven-plugin</artifactId> + <configuration> + <failOnChanges>false</failOnChanges> + <bndruns> + <bndrun>example.bndrun</bndrun> + </bndruns> + </configuration> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-export-maven-plugin</artifactId> + <configuration> + <failOnChanges>false</failOnChanges> + <resolve>false</resolve> + <bndruns> + <bndrun>example.bndrun</bndrun> + </bndruns> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0.1</version> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.21</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.aries.jax.rs</groupId> + <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.aries.jax.rs</groupId> + <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.eventadmin</artifactId> + <version>1.4.8</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.jetty</artifactId> + <version>3.4.0</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.servlet-api</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.command</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.jline</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr</artifactId> + <version>2.0.8</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.eclipse.equinox.metatype</artifactId> + <version>1.4.100.v20150408-1437</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.eclipse.osgi</artifactId> + <version>3.10.100.v20150529-1857</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.component.annotations</artifactId> <version>1.3.0</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype</artifactId> + <version>1.3.0</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.itests-run/LICENSE ---------------------------------------------------------------------- diff --git a/jax-rs.itests-run/LICENSE b/jax-rs.itests-run/LICENSE deleted file mode 100644 index d645695..0000000 --- a/jax-rs.itests-run/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.itests-run/itest.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.itests-run/itest.bndrun b/jax-rs.itests-run/itest.bndrun deleted file mode 100644 index c13d8c2..0000000 --- a/jax-rs.itests-run/itest.bndrun +++ /dev/null @@ -1,56 +0,0 @@ --standalone: - --plugin.integration.test = \ - aQute.bnd.repository.maven.pom.provider.BndPomRepository; \ - snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \ - releaseUrls=https://repo1.maven.org/maven2/; \ - pom=${.}/pom.xml; \ - name=integration.test; \ - location=${.}/target/cached.xml - --runrequires: \ - osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)',\ - osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)' - --runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]' - -#-runtrace: true - --runee: JavaSE-1.8 --resolve.effective: resolve, active - --runsystempackages.eqnx: javax.script --runsystemcapabilities.dflt: ${native_capability} --runproperties: \ - osgi.console.enable.builtin=false, \ - osgi.console=, \ - org.osgi.service.http.port=8080 --runbundles: \ - javax.annotation-api; version='[1.2.0,1.2.1)',\ - javax.json-api; version='[1.0.0,1.0.1)',\ - javax.ws.rs-api; version='[2.0.1,2.0.2)',\ - log4j; version='[1.2.17,1.2.18)',\ - org.apache.aries.jax.rs.itests; version='[0.0.1,0.0.2)',\ - org.apache.aries.jax.rs.log4j-configuration; version='[0.0.1,0.0.2)',\ - org.apache.aries.jax.rs.whiteboard; version='[0.0.1,0.0.2)',\ - org.apache.cxf.cxf-core; version='[3.1.7,3.1.8)',\ - org.apache.cxf.cxf-rt-transports-http; version='[3.1.7,3.1.8)',\ - org.apache.cxf.cxf-rt-frontend-jaxrs; version='[3.1.7,3.1.8)',\ - org.apache.cxf.cxf-rt-rs-client; version='[3.1.7,3.1.8)',\ - org.apache.felix.bundlerepository; version='[1.6.0,1.6.1)',\ - org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\ - org.apache.felix.http.api; version='[3.0.0,3.0.1)',\ - org.apache.felix.http.jetty; version='[3.4.0,3.4.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.apache.ws.xmlschema.core; version='[2.2.1,2.2.2)',\ - 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.compendium; version='[4.1.0,4.1.1)',\ - org.osgi.service.event; version='[1.3.1,1.3.2)',\ - org.osgi.service.metatype; version='[1.3.0,1.3.1)',\ - osgi.enroute.hamcrest.wrapper; version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper; version='[4.12.0,4.12.1)',\ - slf4j.api; version='[1.7.21,1.7.22)',\ - slf4j.log4j12; version='[1.6.1,1.6.2)' http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.itests-run/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.itests-run/pom.xml b/jax-rs.itests-run/pom.xml deleted file mode 100644 index 19e75e8..0000000 --- a/jax-rs.itests-run/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<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> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - - <artifactId>org.apache.aries.jax.rs.itests-run</artifactId> - <description>Apache Aries JAX-RS Integration Test Plan</description> - <name>Apache Aries JAX-RS Integration Test Plan</name> - <packaging>pom</packaging> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - <version>3.4.0-SNAPSHOT</version> - <configuration> - <failOnChanges>false</failOnChanges> - <resolve>false</resolve> - <bndruns> - <bndrun>itest.bndrun</bndrun> - </bndruns> - <targetDir>.</targetDir> - </configuration> - <executions> - <execution> - <goals> - <goal>testing</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.itests</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId> - <version>0.0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-client</artifactId> - <version>${cxf.version}</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> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.itests/bnd.bnd ---------------------------------------------------------------------- diff --git a/jax-rs.itests/bnd.bnd b/jax-rs.itests/bnd.bnd index ff9ca86..f601893 100644 --- a/jax-rs.itests/bnd.bnd +++ b/jax-rs.itests/bnd.bnd @@ -1,5 +1,5 @@ Bundle-Description: Integration Test bundle for the JAX-RS extender Test-Cases: \ - ${classes;CONCRETE;EXTENDS;junit.framework.TestCase},\ - ${classes;CONCRETE;ANNOTATED;org.junit.Test} + ${classes;CONCRETE;EXTENDS;junit.framework.TestCase},\ + ${classes;CONCRETE;ANNOTATED;org.junit.Test} http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.itests/itest.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun new file mode 100644 index 0000000..5d96119 --- /dev/null +++ b/jax-rs.itests/itest.bndrun @@ -0,0 +1,45 @@ +-standalone: ${.}/target/index.xml + +-runrequires: \ + osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)',\ + osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)',\ + osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\ + osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' + +-runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]' + +#-runtrace: true + +-runee: JavaSE-1.8 +-resolve.effective: resolve, active + +-runsystemcapabilities: ${native_capability} +-runproperties: \ + osgi.console.enable.builtin=false, \ + osgi.console=, \ + org.osgi.service.http.port=8080 +-runblacklist:\ + osgi.identity;filter:='(osgi.identity=org.osgi.compendium)',\ + osgi.identity;filter:='(osgi.identity=osgi.cmpn)' +-runbundles: \ + javax.annotation-api;version='[1.2.0,1.2.1)',\ + javax.ws.rs-api;version='[2.0.1,2.0.2)',\ + log4j;version='[1.2.17,1.2.18)',\ + org.apache.aries.jax.rs.itests;version='[0.0.1,0.0.2)',\ + org.apache.aries.jax.rs.log4j-configuration;version='[0.0.1,0.0.2)',\ + org.apache.cxf.cxf-core;version='[3.1.7,3.1.8)',\ + org.apache.cxf.cxf-rt-transports-http;version='[3.1.7,3.1.8)',\ + org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.1.7,3.1.8)',\ + org.apache.cxf.cxf-rt-rs-client;version='[3.1.7,3.1.8)',\ + org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\ + osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ + osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ + javax.json-api;version='[1.0.0,1.0.1)',\ + org.apache.aries.jax.rs.whiteboard;version='[0.0.1,0.0.2)',\ + org.apache.felix.http.jetty;version='[3.4.0,3.4.1)',\ + org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ + org.objectweb.asm;version='[5.0.4,5.0.5)',\ + slf4j.api;version='[1.7.21,1.7.22)',\ + slf4j.log4j12;version='[1.6.1,1.6.2)',\ + org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\ + org.osgi.service.cm;version='[1.5.0,1.5.1)' http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.itests/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml index d5147a1..06729b7 100644 --- a/jax-rs.itests/pom.xml +++ b/jax-rs.itests/pom.xml @@ -19,24 +19,91 @@ 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> <groupId>org.apache.aries.jax.rs</groupId> <artifactId>org.apache.aries.jax.rs</artifactId> <version>0.0.1-SNAPSHOT</version> + <relativePath>..</relativePath> </parent> <artifactId>org.apache.aries.jax.rs.itests</artifactId> <description>Apache Aries JAX-RS Integration Tests</description> <name>Apache Aries JAX-RS Integration Tests</name> + <build> + <plugins> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-indexer-maven-plugin</artifactId> + <configuration> + <includeJar>true</includeJar> + <localURLs>REQUIRED</localURLs> + </configuration> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-resolver-maven-plugin</artifactId> + <configuration> + <failOnChanges>false</failOnChanges> + <bndruns> + <bndrun>itest.bndrun</bndrun> + </bndruns> + </configuration> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-testing-maven-plugin</artifactId> + <configuration> + <failOnChanges>false</failOnChanges> + <resolve>false</resolve> + <bndruns> + <bndrun>itest.bndrun</bndrun> + </bndruns> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0.1</version> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.21</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.aries.jax.rs</groupId> + <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.aries.jax.rs</groupId> + <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId> + <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -44,14 +111,34 @@ <version>${cxf.version}</version> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.eventadmin</artifactId> + <version>1.4.8</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.jetty</artifactId> + <version>3.4.0</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.servlet-api</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>6.0.0</version> + <artifactId>org.eclipse.osgi</artifactId> + <version>3.10.100.v20150529-1857</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.enroute.junit.wrapper</artifactId> <version>4.12.0</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.enroute.hamcrest.wrapper</artifactId> + <version>1.3.0</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.log4j-configuration/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.log4j-configuration/pom.xml b/jax-rs.log4j-configuration/pom.xml index a72beee..cf5f881 100644 --- a/jax-rs.log4j-configuration/pom.xml +++ b/jax-rs.log4j-configuration/pom.xml @@ -15,8 +15,8 @@ specific language governing permissions and limitations under the License. --> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; +<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"; > @@ -30,4 +30,13 @@ <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId> <description>Apache Aries JAX-RS Log4J Configuration Fragment</description> <name>Apache Aries JAX-RS Log4J Configuration Fragment</name> + + <build> + <plugins> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/jax-rs.whiteboard/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml index b3db5cd..1ebcc29 100644 --- a/jax-rs.whiteboard/pom.xml +++ b/jax-rs.whiteboard/pom.xml @@ -108,4 +108,13 @@ <version>0.0.1-SNAPSHOT</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f8a7138a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 72c613e..009ce6e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ under the License. --> <project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + 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> @@ -28,9 +28,10 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <cxf.version>3.1.7</cxf.version> + <bnd.version>3.4.0-SNAPSHOT</bnd.version> </properties> - - <distributionManagement> + + <distributionManagement> <repository> <id>apache.releases.https</id> <name>Apache Release Distribution Repository</name> @@ -44,49 +45,105 @@ </snapshotRepository> </distributionManagement> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>3.0.1</version> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - <version>3.4.0-SNAPSHOT</version> - <executions> - <execution> - <goals> - <goal>bnd-process</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.1</version> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-baseline-maven-plugin</artifactId> + <version>${bnd.version}</version> + <configuration> + <includeDistributionManagement>false</includeDistributionManagement> + <fullReport>true</fullReport> + </configuration> + <executions> + <execution> + <id>baseline</id> + <goals> + <goal>baseline</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-export-maven-plugin</artifactId> + <version>${bnd.version}</version> + <executions> + <execution> + <id>export</id> + <goals> + <goal>export</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-indexer-maven-plugin</artifactId> + <version>${bnd.version}</version> + <executions> + <execution> + <id>index</id> + <goals> + <goal>index</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + <version>${bnd.version}</version> + <executions> + <execution> + <id>bnd-process</id> + <goals> + <goal>bnd-process</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-testing-maven-plugin</artifactId> + <version>${bnd.version}</version> + <executions> + <execution> + <id>testing</id> + <goals> + <goal>testing</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> <modules> <module>jax-rs.whiteboard</module> <module>jax-rs.log4j-configuration</module> <module>jax-rs.itests</module> - <module>jax-rs.itests-run</module> <module>jax-rs.example</module> - <module>jax-rs.example-run</module> </modules> <dependencies> <dependency> @@ -97,6 +154,11 @@ </dependencies> <repositories> <repository> + <id>apache snapshots</id> + <url>http://repository.apache.org/snapshots/</url> + <layout>default</layout> + </repository> + <repository> <id>osgi-releases-and-snapshots</id> <url>https://oss.sonatype.org/content/groups/osgi/</url> <layout>default</layout>
