You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2020/04/05 20:29:59 UTC
[aries] branch trunk updated (7e5cb73 -> 6261559)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git.
from 7e5cb73 Make blueprint maven plugin compile on java 11
new 2512fb9 cleanup build warnings
new 6261559 bnd 5.0.1
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
spi-fly/spi-fly-core/pom.xml | 14 +++++++++--
.../org/apache/aries/spifly/BaseActivator.java | 3 +++
.../spifly/ProviderBundleTrackerCustomizer.java | 1 +
...ndleTrackerCustomizerGenericCapabilityTest.java | 26 ++++++++++++++++----
.../src/test/resources/logging.properties} | 2 +-
.../spi-fly-dynamic-bundle}/LICENSE | 0
{web => spi-fly/spi-fly-dynamic-bundle}/NOTICE | 0
spi-fly/spi-fly-dynamic-bundle/pom.xml | 28 ++++++++++++++++++----
.../ClientWeavingHookGenericCapabilityTest.java | 1 +
.../spifly/dynamic/ClientWeavingHookTest.java | 2 ++
.../test/resources/logging.properties} | 2 +-
.../spi-fly-dynamic-framework-extension}/LICENSE | 0
.../spi-fly-dynamic-framework-extension}/NOTICE | 0
.../spi-fly-dynamic-framework-extension/pom.xml | 20 ++++++++++++++++
.../spi-fly-static-bundle}/LICENSE | 0
{web => spi-fly/spi-fly-static-bundle}/NOTICE | 0
spi-fly/spi-fly-static-bundle/pom.xml | 13 +++++++++-
spi-fly/spi-fly-static-tool/pom.xml | 7 +++++-
.../src/test/resources/logging.properties} | 2 +-
spi-fly/spi-fly-weaver/pom.xml | 2 +-
20 files changed, 106 insertions(+), 17 deletions(-)
copy spi-fly/{spi-fly-dynamic-bundle/jul-logging.properties => spi-fly-core/src/test/resources/logging.properties} (89%)
copy {web/web-urlhandler => spi-fly/spi-fly-dynamic-bundle}/LICENSE (100%)
copy {web => spi-fly/spi-fly-dynamic-bundle}/NOTICE (100%)
copy spi-fly/spi-fly-dynamic-bundle/{jul-logging.properties => src/test/resources/logging.properties} (89%)
copy {web/web-urlhandler => spi-fly/spi-fly-dynamic-framework-extension}/LICENSE (100%)
copy {web => spi-fly/spi-fly-dynamic-framework-extension}/NOTICE (100%)
copy {web/web-urlhandler => spi-fly/spi-fly-static-bundle}/LICENSE (100%)
copy {web => spi-fly/spi-fly-static-bundle}/NOTICE (100%)
rename spi-fly/{spi-fly-dynamic-bundle/jul-logging.properties => spi-fly-static-tool/src/test/resources/logging.properties} (89%)
[aries] 01/02: cleanup build warnings
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 2512fb9dc4a04e3b151c0a6c7c37f5f0c3d3e178
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Sun Mar 29 11:22:47 2020 -0400
cleanup build warnings
Signed-off-by: Raymond Augé <ro...@apache.org>
---
spi-fly/spi-fly-core/pom.xml | 12 +-
.../org/apache/aries/spifly/BaseActivator.java | 3 +
.../spifly/ProviderBundleTrackerCustomizer.java | 1 +
...ndleTrackerCustomizerGenericCapabilityTest.java | 26 ++-
.../src/test/resources/logging.properties} | 2 +-
spi-fly/spi-fly-dynamic-bundle/LICENSE | 203 +++++++++++++++++++++
spi-fly/spi-fly-dynamic-bundle/NOTICE | 8 +
spi-fly/spi-fly-dynamic-bundle/pom.xml | 26 ++-
.../ClientWeavingHookGenericCapabilityTest.java | 1 +
.../spifly/dynamic/ClientWeavingHookTest.java | 2 +
.../test/resources/logging.properties} | 2 +-
.../spi-fly-dynamic-framework-extension/LICENSE | 203 +++++++++++++++++++++
spi-fly/spi-fly-dynamic-framework-extension/NOTICE | 8 +
.../spi-fly-dynamic-framework-extension/pom.xml | 20 ++
spi-fly/spi-fly-static-bundle/LICENSE | 203 +++++++++++++++++++++
spi-fly/spi-fly-static-bundle/NOTICE | 8 +
spi-fly/spi-fly-static-bundle/pom.xml | 11 ++
spi-fly/spi-fly-static-tool/pom.xml | 5 +
.../src/test/resources/logging.properties} | 2 +-
19 files changed, 734 insertions(+), 12 deletions(-)
diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml
index 5debd1e..22a9ede 100644
--- a/spi-fly/spi-fly-core/pom.xml
+++ b/spi-fly/spi-fly-core/pom.xml
@@ -61,6 +61,12 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
+ <artifactId>aQute.libg</artifactId>
+ <version>${bnd.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
<version>${bnd.version}</version>
</dependency>
@@ -75,6 +81,10 @@
<version>3.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
</project>
diff --git a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java
index ae84b86..f295ae4 100644
--- a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java
+++ b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java
@@ -55,7 +55,9 @@ public abstract class BaseActivator implements BundleActivator {
public static BaseActivator activator;
private BundleContext bundleContext;
+ @SuppressWarnings("rawtypes")
private BundleTracker consumerBundleTracker;
+ @SuppressWarnings("rawtypes")
private BundleTracker providerBundleTracker;
private final ConcurrentMap<Bundle, Set<WeavingData>> bundleWeavingData =
@@ -67,6 +69,7 @@ public abstract class BaseActivator implements BundleActivator {
private final ConcurrentMap<Bundle, Map<ConsumerRestriction, List<BundleDescriptor>>> consumerRestrictions =
new ConcurrentHashMap<Bundle, Map<ConsumerRestriction, List<BundleDescriptor>>>();
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public synchronized void start(BundleContext context, final String consumerHeaderName) throws Exception {
bundleContext = context;
diff --git a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
index e49afb2..9a50b48 100644
--- a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
+++ b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
@@ -54,6 +54,7 @@ import aQute.bnd.header.Parameters;
/**
* Listens for new bundles being installed and registers them as service providers if applicable.
*/
+@SuppressWarnings("rawtypes")
public class ProviderBundleTrackerCustomizer implements BundleTrackerCustomizer {
private static final String METAINF_SERVICES = "META-INF/services";
diff --git a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
index f03beef..d8c6ea0 100644
--- a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
+++ b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
@@ -69,6 +69,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
ProviderBundleTrackerCustomizer customizer = new ProviderBundleTrackerCustomizer(activator, mediatorBundle);
+ @SuppressWarnings("rawtypes")
ServiceRegistration sreg = EasyMock.createMock(ServiceRegistration.class);
sreg.unregister();
EasyMock.expectLastCall();
@@ -83,6 +84,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
assertEquals("Precondition", 0, activator.findProviderBundles("org.apache.aries.mytest.MySPI").size());
// Call addingBundle();
+ @SuppressWarnings("rawtypes")
List<ServiceRegistration> registrations = customizer.addingBundle(implBundle, null);
Collection<Bundle> bundles = activator.findProviderBundles("org.apache.aries.mytest.MySPI");
assertEquals(1, bundles.size());
@@ -169,6 +171,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
ProviderBundleTrackerCustomizer customizer = new ProviderBundleTrackerCustomizer(activator, mediatorBundle);
+ @SuppressWarnings("rawtypes")
ServiceRegistration sreg = EasyMock.createMock(ServiceRegistration.class);
EasyMock.replay(sreg);
@@ -179,6 +182,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE + "=org.apache.aries.mytest.MySPI; approval=yeah; ");
Bundle implBundle = mockSPIBundle(implBC, headers);
+ @SuppressWarnings("rawtypes")
List<ServiceRegistration> registrations = customizer.addingBundle(implBundle, null);
assertEquals(1, registrations.size());
Collection<Bundle> bundles = activator.findProviderBundles("org.apache.aries.mytest.MySPI");
@@ -202,6 +206,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
ProviderBundleTrackerCustomizer customizer = new ProviderBundleTrackerCustomizer(activator, mediatorBundle);
+ @SuppressWarnings("rawtypes")
ServiceRegistration sreg = EasyMock.createMock(ServiceRegistration.class);
EasyMock.replay(sreg);
@@ -213,6 +218,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
SpiFlyConstants.REGISTER_DIRECTIVE + "=\"\"");
Bundle implBundle = mockSPIBundle(implBC, headers);
+ @SuppressWarnings("rawtypes")
List<ServiceRegistration> registrations = customizer.addingBundle(implBundle, null);
assertEquals(0, registrations.size());
Collection<Bundle> bundles = activator.findProviderBundles("org.apache.aries.mytest.MySPI");
@@ -250,6 +256,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
SpiFlyConstants.REGISTER_DIRECTIVE + "=\"org.apache.aries.spifly.impl4.MySPIImpl4b\"");
Bundle implBundle = mockSPIBundle4(implBC, headers);
+ @SuppressWarnings("rawtypes")
List<ServiceRegistration> registrations = customizer.addingBundle(implBundle, null);
assertEquals(1, registrations.size());
@@ -283,6 +290,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE + "=org.apache.aries.mytest.MySPI2");
Bundle implBundle = mockSPIBundle4(implBC, headers);
+ @SuppressWarnings("rawtypes")
List<ServiceRegistration> registrations = customizer.addingBundle(implBundle, null);
assertEquals("Expected 3 registrations, one for MySPI and 2 for MySPI2", 3, registrations.size());
Set<String> expectedObjectClasses = new HashSet<String>(Arrays.asList("org.apache.aries.mytest.MySPI", "org.apache.aries.mytest.MySPI2"));
@@ -290,7 +298,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
boolean foundMySPI = false;
boolean foundMySPI2 = false;
- for (ServiceRegistration sr : registrations) {
+ for (@SuppressWarnings("rawtypes") ServiceRegistration sr : registrations) {
List<String> objectClasses = Arrays.asList((String[]) sr.getReference().getProperty(Constants.OBJECTCLASS));
actualObjectClasses.addAll(objectClasses);
assertNotNull(sr.getReference().getProperty(SpiFlyConstants.SERVICELOADER_MEDIATOR_PROPERTY));
@@ -331,17 +339,20 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
SpiFlyConstants.SERVICELOADER_CAPABILITY_NAMESPACE + "=org.apache.aries.mytest.MySPI2");
Bundle implBundle = mockSPIBundle4(implBC, headers);
+ @SuppressWarnings("rawtypes")
List<ServiceRegistration> registrations = customizer.addingBundle(implBundle, null);
assertEquals(3, registrations.size());
boolean foundA = false, foundB = false, foundC = false;
- for (ServiceRegistration sreg : registrations) {
+ for (@SuppressWarnings("rawtypes") ServiceRegistration sreg : registrations) {
+ @SuppressWarnings("rawtypes")
ServiceReference sref = sreg.getReference();
String objectClassName = ((String [])sref.getProperty(Constants.OBJECTCLASS))[0];
String serviceImplClassName = (String) sref.getProperty(SpiFlyConstants.PROVIDER_IMPLCLASS_PROPERTY);
if (MySPIImpl4a.class.getName().equals(serviceImplClassName)) {
assertEquals("org.apache.aries.mytest.MySPI", objectClassName);
+ @SuppressWarnings("unchecked")
MySPI svc = (MySPI) implBC.getService(sreg.getReference());
assertEquals("impl4a", svc.someMethod(""));
@@ -349,6 +360,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
} else if (MySPIImpl4b.class.getName().equals(serviceImplClassName)) {
assertEquals("org.apache.aries.mytest.MySPI2", objectClassName);
+ @SuppressWarnings("unchecked")
MySPI2 svc = (MySPI2) implBC.getService(sreg.getReference());
assertEquals("impl4b", svc.someMethod(""));
@@ -356,6 +368,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
} else if (MySPIImpl4c.class.getName().equals(serviceImplClassName)) {
assertEquals("org.apache.aries.mytest.MySPI2", objectClassName);
+ @SuppressWarnings("unchecked")
MySPI2 svc = (MySPI2) implBC.getService(sreg.getReference());
assertEquals("impl4c", svc.someMethod(""));
@@ -380,12 +393,14 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
ProviderBundleTrackerCustomizer customizer = new ProviderBundleTrackerCustomizer(activator, mediatorBundle);
+ @SuppressWarnings("rawtypes")
ServiceRegistration sreg = EasyMock.createMock(ServiceRegistration.class);
EasyMock.replay(sreg);
BundleContext implBC = mockSPIBundleContext(sreg);
Bundle implBundle = mockSPIBundle(implBC, SpiFlyConstants.PROVIDER_REQUIREMENT);
+ @SuppressWarnings("rawtypes")
List<ServiceRegistration> registrations = customizer.addingBundle(implBundle, null);
assertEquals(0, registrations.size());
Collection<Bundle> bundles = activator.findProviderBundles("org.apache.aries.mytest.MySPI");
@@ -393,8 +408,8 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
assertSame(implBundle, bundles.iterator().next());
}
+ @SuppressWarnings({ "resource", "unchecked" })
@Test
- @SuppressWarnings("unchecked")
public void testAddingBundleWithBundleClassPath() throws Exception {
Bundle mediatorBundle = EasyMock.createMock(Bundle.class);
EasyMock.expect(mediatorBundle.getBundleId()).andReturn(42l).anyTimes();
@@ -459,7 +474,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
}
@SuppressWarnings("unchecked")
- private BundleContext mockSPIBundleContext(ServiceRegistration sreg) {
+ private BundleContext mockSPIBundleContext(@SuppressWarnings("rawtypes") ServiceRegistration sreg) {
BundleContext implBC = EasyMock.createMock(BundleContext.class);
EasyMock.<Object>expect(implBC.registerService(
EasyMock.eq("org.apache.aries.mytest.MySPI"),
@@ -525,6 +540,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
implBC.getService(EasyMock.anyObject(ServiceReference.class));
EasyMock.expectLastCall().
andAnswer(new IAnswer<Object>() {
+ @SuppressWarnings("rawtypes")
@Override
public Object answer() throws Throwable {
ServiceRegistrationImpl reg = (ServiceRegistrationImpl) EasyMock.getCurrentArguments()[0];
@@ -570,6 +586,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
return implBundle;
}
+ @SuppressWarnings("rawtypes")
private static class ServiceRegistrationImpl implements ServiceRegistration<Object>, ServiceReference {
private final Object serviceObject;
private final Dictionary<String, Object> properties;
@@ -584,6 +601,7 @@ public class ProviderBundleTrackerCustomizerGenericCapabilityTest {
return serviceObject;
}
+ @SuppressWarnings("unchecked")
@Override
public ServiceReference<Object> getReference() {
return this;
diff --git a/spi-fly/spi-fly-dynamic-bundle/jul-logging.properties b/spi-fly/spi-fly-core/src/test/resources/logging.properties
similarity index 89%
copy from spi-fly/spi-fly-dynamic-bundle/jul-logging.properties
copy to spi-fly/spi-fly-core/src/test/resources/logging.properties
index bde7409..e992261 100644
--- a/spi-fly/spi-fly-dynamic-bundle/jul-logging.properties
+++ b/spi-fly/spi-fly-core/src/test/resources/logging.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-handlers= java.util.logging.ConsoleHandler
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
.level= FINEST
diff --git a/spi-fly/spi-fly-dynamic-bundle/LICENSE b/spi-fly/spi-fly-dynamic-bundle/LICENSE
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/spi-fly/spi-fly-dynamic-bundle/LICENSE
@@ -0,0 +1,203 @@
+
+ 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.
+
diff --git a/spi-fly/spi-fly-dynamic-bundle/NOTICE b/spi-fly/spi-fly-dynamic-bundle/NOTICE
new file mode 100644
index 0000000..a15bc51
--- /dev/null
+++ b/spi-fly/spi-fly-dynamic-bundle/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index 01c49af..3e46b87 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -84,15 +84,21 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
+ <artifactId>aQute.libg</artifactId>
<version>${bnd.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>5.0.0</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>${bnd.version}</version>
<scope>provided</scope>
</dependency>
@@ -113,6 +119,11 @@
<version>3.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -157,10 +168,17 @@
org.objectweb.asm.tree.analysis,
org.objectweb.asm.util
</_conditionalpackage>
+ <_includeresource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ </_includeresource>
<Provide-Capability>
osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0,
osgi.extender;osgi.extender=osgi.serviceloader.processor;version:Version=1.0;uses:="org.apache.aries.spifly"
</Provide-Capability>
+ <_fixupmessages>
+ Export org.apache.aries.spifly, has 1, private references
+ </_fixupmessages>
</instructions>
</configuration>
<dependencies>
diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java
index ec06490..dd9525a 100644
--- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java
+++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java
@@ -694,6 +694,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// Set up the classloader that will be used by the ASM-generated code as the TCCL.
// It can load a META-INF/services file
+ @SuppressWarnings("resource")
final ClassLoader cl = new TestProviderBundleClassLoader(subdir, resources.toArray(new String [] {}));
final List<String> classResources = new ArrayList<String>();
diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java
index 5fc60ec..18eae3c 100644
--- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java
+++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java
@@ -147,6 +147,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("load", new Class [] {Class.class});
+ @SuppressWarnings({ "unchecked", "rawtypes" })
Object result = method.invoke(Enum.valueOf((Class<? extends Enum>)cls, "INSTANCE"), MySPI.class);
Assert.assertTrue("Either null or not a MySPI", result instanceof MySPI);
MySPI instance = (MySPI)result;
@@ -746,6 +747,7 @@ public class ClientWeavingHookTest {
// Set up the classloader that will be used by the ASM-generated code as the TCCL.
// It can load a META-INF/services file
+ @SuppressWarnings("resource")
final ClassLoader cl = new TestProviderBundleClassLoader(subdir, resources.toArray(new String [] {}));
final List<String> classResources = new ArrayList<String>();
diff --git a/spi-fly/spi-fly-dynamic-bundle/jul-logging.properties b/spi-fly/spi-fly-dynamic-bundle/src/test/resources/logging.properties
similarity index 89%
copy from spi-fly/spi-fly-dynamic-bundle/jul-logging.properties
copy to spi-fly/spi-fly-dynamic-bundle/src/test/resources/logging.properties
index bde7409..e992261 100644
--- a/spi-fly/spi-fly-dynamic-bundle/jul-logging.properties
+++ b/spi-fly/spi-fly-dynamic-bundle/src/test/resources/logging.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-handlers= java.util.logging.ConsoleHandler
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
.level= FINEST
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/LICENSE b/spi-fly/spi-fly-dynamic-framework-extension/LICENSE
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/spi-fly/spi-fly-dynamic-framework-extension/LICENSE
@@ -0,0 +1,203 @@
+
+ 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.
+
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/NOTICE b/spi-fly/spi-fly-dynamic-framework-extension/NOTICE
new file mode 100644
index 0000000..a15bc51
--- /dev/null
+++ b/spi-fly/spi-fly-dynamic-framework-extension/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
index b382340..33e48e5 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
+++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
@@ -78,6 +78,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>5.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>aQute.libg</artifactId>
+ <version>${bnd.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
<version>${bnd.version}</version>
@@ -145,10 +157,18 @@
org.objectweb.asm.tree.analysis,
org.objectweb.asm.util
</_conditionalpackage>
+ <_includeresource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ </_includeresource>
<Provide-Capability>
osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0,
osgi.extender;osgi.extender=osgi.serviceloader.processor;version:Version=1.0;uses:="org.apache.aries.spifly"
</Provide-Capability>
+ <_fixupmessages>
+ Host system.bundle=extension:=framework,
+ Export org.apache.aries.spifly, has 1, private references
+ </_fixupmessages>
</instructions>
</configuration>
<dependencies>
diff --git a/spi-fly/spi-fly-static-bundle/LICENSE b/spi-fly/spi-fly-static-bundle/LICENSE
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/spi-fly/spi-fly-static-bundle/LICENSE
@@ -0,0 +1,203 @@
+
+ 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.
+
diff --git a/spi-fly/spi-fly-static-bundle/NOTICE b/spi-fly/spi-fly-static-bundle/NOTICE
new file mode 100644
index 0000000..a15bc51
--- /dev/null
+++ b/spi-fly/spi-fly-static-bundle/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index 79e40a9..0f18626 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -67,6 +67,12 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
+ <artifactId>aQute.libg</artifactId>
+ <version>${bnd.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
<version>${bnd.version}</version>
<scope>provided</scope>
@@ -114,10 +120,15 @@
aQute.libg.qtokens,
aQute.service.reporter
</_conditionalpackage>
+ <_includeresource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ </_includeresource>
<Bundle-Activator>org.apache.aries.spifly.staticbundle.StaticWeavingActivator</Bundle-Activator>
<Provide-Capability>
osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0
</Provide-Capability>
+ <_fixupmessages>Export org.apache.aries.spifly, has 1, private references</_fixupmessages>
</instructions>
</configuration>
<dependencies>
diff --git a/spi-fly/spi-fly-static-tool/pom.xml b/spi-fly/spi-fly-static-tool/pom.xml
index 23d79ed..6330ec6 100644
--- a/spi-fly/spi-fly-static-tool/pom.xml
+++ b/spi-fly/spi-fly-static-tool/pom.xml
@@ -81,6 +81,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/spi-fly/spi-fly-dynamic-bundle/jul-logging.properties b/spi-fly/spi-fly-static-tool/src/test/resources/logging.properties
similarity index 89%
rename from spi-fly/spi-fly-dynamic-bundle/jul-logging.properties
rename to spi-fly/spi-fly-static-tool/src/test/resources/logging.properties
index bde7409..e992261 100644
--- a/spi-fly/spi-fly-dynamic-bundle/jul-logging.properties
+++ b/spi-fly/spi-fly-static-tool/src/test/resources/logging.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-handlers= java.util.logging.ConsoleHandler
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
.level= FINEST
[aries] 02/02: bnd 5.0.1
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 626155919e7e67ed1644f9110c8da70d1ead4cc7
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Sun Apr 5 16:25:31 2020 -0400
bnd 5.0.1
---
spi-fly/spi-fly-core/pom.xml | 2 +-
spi-fly/spi-fly-dynamic-bundle/pom.xml | 2 +-
spi-fly/spi-fly-static-bundle/pom.xml | 2 +-
spi-fly/spi-fly-static-tool/pom.xml | 2 +-
spi-fly/spi-fly-weaver/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml
index 22a9ede..ad9d378 100644
--- a/spi-fly/spi-fly-core/pom.xml
+++ b/spi-fly/spi-fly-core/pom.xml
@@ -49,7 +49,7 @@
<properties>
<asm.version>7.3.1</asm.version>
<maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.0</bnd.version>
+ <bnd.version>5.0.1</bnd.version>
</properties>
<dependencies>
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index 3e46b87..6508095 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -49,7 +49,7 @@
<properties>
<asm.version>7.3.1</asm.version>
<maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.0</bnd.version>
+ <bnd.version>5.0.1</bnd.version>
</properties>
<dependencies>
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index 0f18626..d0d1650 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -49,7 +49,7 @@
<properties>
<asm.version>7.3.1</asm.version>
<maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.0</bnd.version>
+ <bnd.version>5.0.1</bnd.version>
</properties>
<dependencies>
diff --git a/spi-fly/spi-fly-static-tool/pom.xml b/spi-fly/spi-fly-static-tool/pom.xml
index 6330ec6..21690b7 100644
--- a/spi-fly/spi-fly-static-tool/pom.xml
+++ b/spi-fly/spi-fly-static-tool/pom.xml
@@ -47,7 +47,7 @@
<properties>
<asm.version>7.3.1</asm.version>
<maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.0</bnd.version>
+ <bnd.version>5.0.1</bnd.version>
</properties>
<dependencies>
diff --git a/spi-fly/spi-fly-weaver/pom.xml b/spi-fly/spi-fly-weaver/pom.xml
index d40dc1b..8e7b645 100644
--- a/spi-fly/spi-fly-weaver/pom.xml
+++ b/spi-fly/spi-fly-weaver/pom.xml
@@ -44,7 +44,7 @@
<properties>
<asm.version>7.3.1</asm.version>
<maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
- <bnd.version>5.0.0</bnd.version>
+ <bnd.version>5.0.1</bnd.version>
</properties>
<dependencies>