Author: rotty3000 Date: Wed Dec 19 22:30:02 2018 New Revision: 1849345 URL: http://svn.apache.org/viewvc?rev=1849345&view=rev Log: FELIX-6003 Add some resolver checks to make sure @RequireGogo annotation works for both jline and shell
Signed-off-by: Raymond Auge <[email protected]> Added: felix/trunk/gogo/itest-jline/ felix/trunk/gogo/itest-jline/DEPENDENCIES felix/trunk/gogo/itest-jline/LICENSE felix/trunk/gogo/itest-jline/NOTICE felix/trunk/gogo/itest-jline/itest.bndrun felix/trunk/gogo/itest-jline/pom.xml felix/trunk/gogo/itest-jline/src/ felix/trunk/gogo/itest-jline/src/main/ felix/trunk/gogo/itest-jline/src/main/java/ felix/trunk/gogo/itest-jline/src/main/java/org/ felix/trunk/gogo/itest-jline/src/main/java/org/apache/ felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/ felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/ felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/ felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/ felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java felix/trunk/gogo/itest-shell/ felix/trunk/gogo/itest-shell/DEPENDENCIES felix/trunk/gogo/itest-shell/LICENSE felix/trunk/gogo/itest-shell/NOTICE felix/trunk/gogo/itest-shell/itest.bndrun felix/trunk/gogo/itest-shell/pom.xml felix/trunk/gogo/itest-shell/src/ felix/trunk/gogo/itest-shell/src/main/ felix/trunk/gogo/itest-shell/src/main/java/ felix/trunk/gogo/itest-shell/src/main/java/org/ felix/trunk/gogo/itest-shell/src/main/java/org/apache/ felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/ felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/ felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/ felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/ felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java Modified: felix/trunk/gogo/command/pom.xml felix/trunk/gogo/gogo-parent/pom.xml felix/trunk/gogo/jline/pom.xml felix/trunk/gogo/pom.xml felix/trunk/gogo/runtime/pom.xml felix/trunk/gogo/shell/pom.xml Modified: felix/trunk/gogo/command/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/command/pom.xml?rev=1849345&r1=1849344&r2=1849345&view=diff ============================================================================== --- felix/trunk/gogo/command/pom.xml (original) +++ felix/trunk/gogo/command/pom.xml Wed Dec 19 22:30:02 2018 @@ -35,6 +35,12 @@ <description> Provides basic shell commands for Gogo. </description> + <url>http://felix.apache.org/</url> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/command/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/command/</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/command/</url> + </scm> <dependencies> <dependency> Modified: felix/trunk/gogo/gogo-parent/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/gogo-parent/pom.xml?rev=1849345&r1=1849344&r2=1849345&view=diff ============================================================================== --- felix/trunk/gogo/gogo-parent/pom.xml (original) +++ felix/trunk/gogo/gogo-parent/pom.xml Wed Dec 19 22:30:02 2018 @@ -30,11 +30,11 @@ <description>Apache Felix Gogo Subproject</description> <artifactId>gogo-parent</artifactId> <version>5-SNAPSHOT</version> - + <url>http://felix.apache.org/</url> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/gogo/gogo-parent</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/gogo-parent</developerConnection> - <url>http://svn.apache.org/repos/asf/felix/gogo/gogo-parent</url> + <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/gogo-parent/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/gogo-parent/</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/gogo-parent/</url> </scm> <dependencyManagement> Added: felix/trunk/gogo/itest-jline/DEPENDENCIES URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-jline/DEPENDENCIES?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-jline/DEPENDENCIES (added) +++ felix/trunk/gogo/itest-jline/DEPENDENCIES Wed Dec 19 22:30:02 2018 @@ -0,0 +1,23 @@ +Apache Felix Gogo ITest JLine +Copyright 2014 The Apache Software Foundation + +This software was developed at the Apache Software Foundation +(http://www.apache.org) and may have dependencies on other +Apache software licensed under Apache License 2.0. + +I. Included Third-Party Software + +This product includes software developed at +The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2009). +Licensed under the Apache License 2.0. + +II. Used Third-Party Software + +This product uses software developed at +The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2009). +Licensed under the Apache License 2.0. + +III. License Summary +- Apache License 2.0 Added: felix/trunk/gogo/itest-jline/LICENSE URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-jline/LICENSE?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-jline/LICENSE (added) +++ felix/trunk/gogo/itest-jline/LICENSE Wed Dec 19 22:30:02 2018 @@ -0,0 +1,202 @@ + + 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. Added: felix/trunk/gogo/itest-jline/NOTICE URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-jline/NOTICE?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-jline/NOTICE (added) +++ felix/trunk/gogo/itest-jline/NOTICE Wed Dec 19 22:30:02 2018 @@ -0,0 +1,11 @@ +Apache Felix Gogo ITest JLine +Copyright 2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +Licensed under the Apache License 2.0. + +This product includes software developed at +The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2009). +Licensed under the Apache License 2.0. Added: felix/trunk/gogo/itest-jline/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-jline/itest.bndrun?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-jline/itest.bndrun (added) +++ felix/trunk/gogo/itest-jline/itest.bndrun Wed Dec 19 22:30:02 2018 @@ -0,0 +1,31 @@ +# 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. + +#-runtrace: true +#-runvm: -Xdebug, "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" + +-standalone: true + +-runrequires: osgi.identity;filter:='(osgi.identity=itest-jline)' + +-resolve.effective: resolve, active +-runee: JavaSE-1.8 +-runfw: org.apache.felix.framework +-runproperties: \ + osgi.console= + +-runbundles: \ + itest-jline;version='[0.0.1,0.0.2)',\ + org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\ + org.apache.felix.gogo.jline;version='[1.1.1,1.1.2)',\ + org.apache.felix.gogo.runtime;version='[1.1.1,1.1.2)',\ + org.jline;version='[3.7.0,3.7.1)' \ No newline at end of file Added: felix/trunk/gogo/itest-jline/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-jline/pom.xml?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-jline/pom.xml (added) +++ felix/trunk/gogo/itest-jline/pom.xml Wed Dec 19 22:30:02 2018 @@ -0,0 +1,90 @@ +<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.felix</groupId> + <artifactId>gogo-parent</artifactId> + <version>5-SNAPSHOT</version> + <relativePath>../gogo-parent/pom.xml</relativePath> + </parent> + + <artifactId>itest-jline</artifactId> + <packaging>bundle</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>Apache Felix Gogo ITest JLine</name> + <description>Some tests for Gogo JLine shell.</description> + <url>http://felix.apache.org/</url> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/itest-jline/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/itest-jline/</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/itest-jline/</url> + </scm> + + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + <maven.install.skip>true</maven.install.skip> + </properties> + + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.annotation</artifactId> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.command</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.jline</artifactId> + <version>1.1.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.runtime</artifactId> + <version>1.1.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>6.0.1</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package></Export-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-resolver-maven-plugin</artifactId> + <version>${bnd.version}</version> + <configuration> + <failOnChanges>false</failOnChanges> + <bndruns> + <bndrun>itest.bndrun</bndrun> + </bndruns> + </configuration> + <executions> + <execution> + <id>resolve</id> + <goals> + <goal>resolve</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Added: felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java (added) +++ felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java Wed Dec 19 22:30:02 2018 @@ -0,0 +1,25 @@ +/* + * 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. + */ + +@RequireGogo(JLINE) +package org.apache.felix.gogo.itest.jline; + +import static org.apache.felix.service.command.annotation.RequireGogo.JLINE; + +import org.apache.felix.service.command.annotation.RequireGogo; \ No newline at end of file Added: felix/trunk/gogo/itest-shell/DEPENDENCIES URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-shell/DEPENDENCIES?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-shell/DEPENDENCIES (added) +++ felix/trunk/gogo/itest-shell/DEPENDENCIES Wed Dec 19 22:30:02 2018 @@ -0,0 +1,23 @@ +Apache Felix Gogo ITest Shell +Copyright 2014 The Apache Software Foundation + +This software was developed at the Apache Software Foundation +(http://www.apache.org) and may have dependencies on other +Apache software licensed under Apache License 2.0. + +I. Included Third-Party Software + +This product includes software developed at +The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2009). +Licensed under the Apache License 2.0. + +II. Used Third-Party Software + +This product uses software developed at +The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2009). +Licensed under the Apache License 2.0. + +III. License Summary +- Apache License 2.0 Added: felix/trunk/gogo/itest-shell/LICENSE URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-shell/LICENSE?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-shell/LICENSE (added) +++ felix/trunk/gogo/itest-shell/LICENSE Wed Dec 19 22:30:02 2018 @@ -0,0 +1,202 @@ + + 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. Added: felix/trunk/gogo/itest-shell/NOTICE URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-shell/NOTICE?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-shell/NOTICE (added) +++ felix/trunk/gogo/itest-shell/NOTICE Wed Dec 19 22:30:02 2018 @@ -0,0 +1,11 @@ +Apache Felix Gogo ITest Shell +Copyright 2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +Licensed under the Apache License 2.0. + +This product includes software developed at +The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2009). +Licensed under the Apache License 2.0. Added: felix/trunk/gogo/itest-shell/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-shell/itest.bndrun?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-shell/itest.bndrun (added) +++ felix/trunk/gogo/itest-shell/itest.bndrun Wed Dec 19 22:30:02 2018 @@ -0,0 +1,30 @@ +# 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. + +#-runtrace: true +#-runvm: -Xdebug, "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" + +-standalone: true + +-runrequires: osgi.identity;filter:='(osgi.identity=itest-shell)' + +-resolve.effective: resolve, active +-runee: JavaSE-1.8 +-runfw: org.apache.felix.framework +-runproperties: \ + osgi.console=localhost:11311 + +-runbundles: \ + itest-shell;version='[0.0.1,0.0.2)',\ + org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\ + org.apache.felix.gogo.runtime;version='[1.1.1,1.1.2)',\ + org.apache.felix.gogo.shell;version='[1.1.1,1.1.2)' \ No newline at end of file Added: felix/trunk/gogo/itest-shell/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-shell/pom.xml?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-shell/pom.xml (added) +++ felix/trunk/gogo/itest-shell/pom.xml Wed Dec 19 22:30:02 2018 @@ -0,0 +1,90 @@ +<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.felix</groupId> + <artifactId>gogo-parent</artifactId> + <version>5-SNAPSHOT</version> + <relativePath>../gogo-parent/pom.xml</relativePath> + </parent> + + <artifactId>itest-shell</artifactId> + <packaging>bundle</packaging> + <version>0.0.1-SNAPSHOT</version> + <name>Apache Felix Gogo ITest Shell</name> + <description>Some tests for Gogo Shell.</description> + <url>http://felix.apache.org/</url> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/itest-shell/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/itest-shell/</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/itest-shell/</url> + </scm> + + <properties> + <maven.deploy.skip>true</maven.deploy.skip> + <maven.install.skip>true</maven.install.skip> + </properties> + + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.annotation</artifactId> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.command</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.shell</artifactId> + <version>1.1.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.runtime</artifactId> + <version>1.1.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>6.0.1</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Export-Package></Export-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-resolver-maven-plugin</artifactId> + <version>${bnd.version}</version> + <configuration> + <failOnChanges>false</failOnChanges> + <bndruns> + <bndrun>itest.bndrun</bndrun> + </bndruns> + </configuration> + <executions> + <execution> + <id>resolve</id> + <goals> + <goal>resolve</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Added: felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java?rev=1849345&view=auto ============================================================================== --- felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java (added) +++ felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java Wed Dec 19 22:30:02 2018 @@ -0,0 +1,23 @@ +/* + * 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. + */ + +@RequireGogo +package org.apache.felix.gogo.itest.shell; + +import org.apache.felix.service.command.annotation.RequireGogo; \ No newline at end of file Modified: felix/trunk/gogo/jline/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/pom.xml?rev=1849345&r1=1849344&r2=1849345&view=diff ============================================================================== --- felix/trunk/gogo/jline/pom.xml (original) +++ felix/trunk/gogo/jline/pom.xml Wed Dec 19 22:30:02 2018 @@ -28,11 +28,13 @@ <name>Apache Felix Gogo JLine Shell</name> <artifactId>org.apache.felix.gogo.jline</artifactId> <version>1.1.1-SNAPSHOT</version> + <url>http://felix.apache.org/</url> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/gogo/jline</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/jline</developerConnection> - <url>http://svn.apache.org/repos/asf/felix/gogo/jline</url> + <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/jline/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/jline/</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/jline/</url> </scm> + <dependencies> <dependency> <groupId>org.osgi</groupId> Modified: felix/trunk/gogo/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/pom.xml?rev=1849345&r1=1849344&r2=1849345&view=diff ============================================================================== --- felix/trunk/gogo/pom.xml (original) +++ felix/trunk/gogo/pom.xml Wed Dec 19 22:30:02 2018 @@ -26,11 +26,11 @@ <groupId>org.apache.felix</groupId> <artifactId>gogo-reactor</artifactId> <version>1.1.0-SNAPSHOT</version> - + <url>http://felix.apache.org/</url> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/gogo</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo</developerConnection> - <url>http://svn.apache.org/repos/asf/felix/gogo</url> + <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/</url> </scm> <modules> @@ -39,6 +39,8 @@ <module>jline</module> <module>shell</module> <module>command</module> + <module>itest-shell</module> + <module>itest-jline</module> </modules> </project> Modified: felix/trunk/gogo/runtime/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=1849345&r1=1849344&r2=1849345&view=diff ============================================================================== --- felix/trunk/gogo/runtime/pom.xml (original) +++ felix/trunk/gogo/runtime/pom.xml Wed Dec 19 22:30:02 2018 @@ -28,11 +28,13 @@ <name>Apache Felix Gogo Runtime</name> <artifactId>org.apache.felix.gogo.runtime</artifactId> <version>1.1.1-SNAPSHOT</version> + <url>http://felix.apache.org/</url> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/gogo/runtime</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/runtime</developerConnection> - <url>http://svn.apache.org/repos/asf/felix/gogo/runtime</url> + <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/runtime/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/runtime/</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/runtime/</url> </scm> + <dependencies> <dependency> <groupId>org.osgi</groupId> Modified: felix/trunk/gogo/shell/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/pom.xml?rev=1849345&r1=1849344&r2=1849345&view=diff ============================================================================== --- felix/trunk/gogo/shell/pom.xml (original) +++ felix/trunk/gogo/shell/pom.xml Wed Dec 19 22:30:02 2018 @@ -20,11 +20,13 @@ <name>Apache Felix Gogo Shell</name> <artifactId>org.apache.felix.gogo.shell</artifactId> <version>1.1.1-SNAPSHOT</version> + <url>http://felix.apache.org/</url> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/gogo/shell</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/shell</developerConnection> - <url>http://svn.apache.org/repos/asf/felix/gogo/shell</url> + <connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/shell/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/shell/</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/shell/</url> </scm> + <dependencies> <dependency> <groupId>org.osgi</groupId>
