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 2018/04/27 23:32:28 UTC
svn commit: r1830404 - in /aries/trunk/cdi: ./ cdi-extender/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/
cdi-extender/src/main/java/org/apache/aries/cdi/provider/
cdi-extender/src/test/resources/ cdi-extension-http/ cdi-ex...
Author: rotty3000
Date: Fri Apr 27 23:32:27 2018
New Revision: 1830404
URL: http://svn.apache.org/viewvc?rev=1830404&view=rev
Log:
[CDI] rat and cleanup
Signed-off-by: Raymond Auge <ro...@apache.org>
Removed:
aries/trunk/cdi/hs_err_pid14088.log
Modified:
aries/trunk/cdi/cdi-extender/bnd.bnd
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/Binder.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java
aries/trunk/cdi/cdi-extender/src/test/resources/logback.xml
aries/trunk/cdi/cdi-extension-http/bnd.bnd
aries/trunk/cdi/cdi-extension-jndi/bnd.bnd
aries/trunk/cdi/cdi-extra/bnd.bnd
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java
aries/trunk/cdi/cdi-itests/bnd.bnd
aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd
aries/trunk/cdi/cdi-itests/bnd/services-one.bnd
aries/trunk/cdi/cdi-itests/bnd/tb1.bnd
aries/trunk/cdi/cdi-itests/bnd/tb10.bnd
aries/trunk/cdi/cdi-itests/bnd/tb11.bnd
aries/trunk/cdi/cdi-itests/bnd/tb2.bnd
aries/trunk/cdi/cdi-itests/bnd/tb3.bnd
aries/trunk/cdi/cdi-itests/bnd/tb4.bnd
aries/trunk/cdi/cdi-itests/bnd/tb5.bnd
aries/trunk/cdi/cdi-itests/bnd/tb6.bnd
aries/trunk/cdi/cdi-itests/bnd/tb7.bnd
aries/trunk/cdi/cdi-itests/bnd/tb8.bnd
aries/trunk/cdi/cdi-itests/bnd/tb9.bnd
aries/trunk/cdi/cdi-itests/cdi-executable.bndrun
aries/trunk/cdi/cdi-itests/itest.bndrun
aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/maven-metadata-local.xml
aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/maven-metadata-local.xml
aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/3.13.0/org.eclipse.osgi-3.13.0.pom
aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/maven-metadata-local.xml
aries/trunk/cdi/cdi-itests/logback.xml
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java
aries/trunk/cdi/javax.annotation-api/bnd.bnd
aries/trunk/cdi/javax.cdi-api/bnd.bnd
aries/trunk/cdi/javax.el-api/bnd.bnd
aries/trunk/cdi/javax.inject-api/bnd.bnd
aries/trunk/cdi/javax.interceptor-api/bnd.bnd
Modified: aries/trunk/cdi/cdi-extender/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-extender/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,6 +1,17 @@
+# 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.
+
Conditional-Package: \
org.apache.felix.utils.extender,\
org.osgi.util.converter
--contract: JavaAnnotation, JavaCDI, JavaEL, JavaInject, JavaInterceptor
--includeresource: META-INF/=LICENSE, META-INF/=NOTICE
\ No newline at end of file
+-contract: JavaAnnotation, JavaCDI, JavaEL, JavaInject, JavaInterceptor
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/Binder.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/Binder.java?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/Binder.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/Binder.java Fri Apr 27 23:32:27 2018
@@ -1,3 +1,17 @@
+/**
+ * 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.
+ */
+
package org.apache.aries.cdi.container.internal.model;
import org.osgi.framework.ServiceReference;
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/provider/package-info.java Fri Apr 27 23:32:27 2018
@@ -1,3 +1,17 @@
+/**
+ * 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.
+ */
+
@Capability(
name = CDIConstants.CDI_CAPABILITY_NAME,
namespace = ExtenderNamespace.EXTENDER_NAMESPACE,
Modified: aries/trunk/cdi/cdi-extender/src/test/resources/logback.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/resources/logback.xml?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/resources/logback.xml (original)
+++ aries/trunk/cdi/cdi-extender/src/test/resources/logback.xml Fri Apr 27 23:32:27 2018
@@ -1,3 +1,19 @@
+<!--
+/**
+ * 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.
+ */
+-->
+
<configuration>
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
Modified: aries/trunk/cdi/cdi-extension-http/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-extension-http/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,2 +1,13 @@
--contract: JavaAnnotation, JavaCDI, JavaServlet
--includeresource: META-INF/=LICENSE, META-INF/=NOTICE
\ No newline at end of file
+# 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.
+
+-contract: JavaAnnotation, JavaCDI, JavaServlet
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extension-jndi/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-extension-jndi/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,2 +1,13 @@
--contract: JavaCDI
--includeresource: META-INF/=LICENSE, META-INF/=NOTICE
\ No newline at end of file
+# 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.
+
+-contract: JavaCDI
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extra/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-extra/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,4 +1,15 @@
+# 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.
+
Import-Package: javax.servlet;resolution:=optional, *
-contract: JavaServlet;resolution:=optional
--exportcontents: ${packages;VERSIONED}
--includeresource: META-INF/=LICENSE, META-INF/=NOTICE
\ No newline at end of file
+-exportcontents: ${packages;VERSIONED}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/package-info.java Fri Apr 27 23:32:27 2018
@@ -1,2 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2018). All Rights Reserved.
+ *
+ * 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.
+ */
+
@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.aries.cdi.extra.propertytypes;
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Bundle-Description: Integration Test bundle for the CDI Extender
Export-Package: ${p}.cases.*,${p}.interfaces.*
Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
Modified: aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.beans.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/services-one.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/services-one.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/services-one.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/services-one.bnd Fri Apr 27 23:32:27 2018
@@ -1 +1,13 @@
+# 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.
+
Export-Package: ${p}.components.*;-split-package:=first
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb1.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb1.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb1.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb1.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb1.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb10.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb10.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb10.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb10.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb10.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb11.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb11.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb11.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb11.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb11.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb2.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb2.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb2.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb2.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb2.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb3.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb3.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb3.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb3.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb3.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb4.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb4.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb4.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb4.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb4.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb5.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb5.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb5.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb5.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb5.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb6.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb6.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb6.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb6.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb6.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb7.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb7.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb7.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb7.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb7.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb8.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb8.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb8.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb8.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb8.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/bnd/tb9.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb9.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb9.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb9.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Export-Package: ${p}.tb9.*;-split-package:=first
Require-Capability:\
osgi.extender;\
Modified: aries/trunk/cdi/cdi-itests/cdi-executable.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/cdi-executable.bndrun?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/cdi-executable.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/cdi-executable.bndrun Fri Apr 27 23:32:27 2018
@@ -1,3 +1,14 @@
+# 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: false
#-runvm: -Xdebug, "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
Modified: aries/trunk/cdi/cdi-itests/itest.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/itest.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/itest.bndrun Fri Apr 27 23:32:27 2018
@@ -1,3 +1,14 @@
+# 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"
Modified: aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/maven-metadata-local.xml?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/maven-metadata-local.xml (original)
+++ aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/maven-metadata-local.xml Fri Apr 27 23:32:27 2018
@@ -1,35 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
<metadata modelVersion="1.1.0">
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.0-SNAPSHOT</version>
- <versioning>
- <snapshot>
- <localCopy>true</localCopy>
- </snapshot>
- <lastUpdated>20180407030954</lastUpdated>
- <snapshotVersions>
- <snapshotVersion>
- <classifier>sources</classifier>
- <extension>jar</extension>
- <value>1.9.0-SNAPSHOT</value>
- <updated>20180407030954</updated>
- </snapshotVersion>
- <snapshotVersion>
- <extension>pom</extension>
- <value>1.9.0-SNAPSHOT</value>
- <updated>20180407030954</updated>
- </snapshotVersion>
- <snapshotVersion>
- <extension>jar</extension>
- <value>1.9.0-SNAPSHOT</value>
- <updated>20180407030835</updated>
- </snapshotVersion>
- <snapshotVersion>
- <extension>bundle</extension>
- <value>1.9.0-SNAPSHOT</value>
- <updated>20180407030645</updated>
- </snapshotVersion>
- </snapshotVersions>
- </versioning>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <localCopy>true</localCopy>
+ </snapshot>
+ <lastUpdated>20180407030954</lastUpdated>
+ <snapshotVersions>
+ <snapshotVersion>
+ <classifier>sources</classifier>
+ <extension>jar</extension>
+ <value>1.9.0-SNAPSHOT</value>
+ <updated>20180407030954</updated>
+ </snapshotVersion>
+ <snapshotVersion>
+ <extension>pom</extension>
+ <value>1.9.0-SNAPSHOT</value>
+ <updated>20180407030954</updated>
+ </snapshotVersion>
+ <snapshotVersion>
+ <extension>jar</extension>
+ <value>1.9.0-SNAPSHOT</value>
+ <updated>20180407030835</updated>
+ </snapshotVersion>
+ <snapshotVersion>
+ <extension>bundle</extension>
+ <value>1.9.0-SNAPSHOT</value>
+ <updated>20180407030645</updated>
+ </snapshotVersion>
+ </snapshotVersions>
+ </versioning>
</metadata>
Modified: aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/maven-metadata-local.xml?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/maven-metadata-local.xml (original)
+++ aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/maven-metadata-local.xml Fri Apr 27 23:32:27 2018
@@ -1,11 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
<metadata>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <versioning>
- <versions>
- <version>1.9.0-SNAPSHOT</version>
- </versions>
- <lastUpdated>20180407030954</lastUpdated>
- </versioning>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <versioning>
+ <versions>
+ <version>1.9.0-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20180407030954</lastUpdated>
+ </versioning>
</metadata>
Modified: aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/3.13.0/org.eclipse.osgi-3.13.0.pom
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/3.13.0/org.eclipse.osgi-3.13.0.pom?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/3.13.0/org.eclipse.osgi-3.13.0.pom (original)
+++ aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/3.13.0/org.eclipse.osgi-3.13.0.pom Fri Apr 27 23:32:27 2018
@@ -1,9 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.13.0</version>
- <description>POM was created from install:install-file</description>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.13.0</version>
+ <description>POM was created from install:install-file</description>
</project>
Modified: aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/maven-metadata-local.xml?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/maven-metadata-local.xml (original)
+++ aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/maven-metadata-local.xml Fri Apr 27 23:32:27 2018
@@ -1,12 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
<metadata>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <versioning>
- <release>3.13.0</release>
- <versions>
- <version>3.13.0</version>
- </versions>
- <lastUpdated>20180315235604</lastUpdated>
- </versioning>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <versioning>
+ <release>3.13.0</release>
+ <versions>
+ <version>3.13.0</version>
+ </versions>
+ <lastUpdated>20180315235604</lastUpdated>
+ </versioning>
</metadata>
Modified: aries/trunk/cdi/cdi-itests/logback.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/logback.xml?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/logback.xml (original)
+++ aries/trunk/cdi/cdi-itests/logback.xml Fri Apr 27 23:32:27 2018
@@ -1,5 +1,21 @@
+<!--
+/**
+ * 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.
+ */
+-->
+
<configuration>
-<!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
+ <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
</contextListener>
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java Fri Apr 27 23:32:27 2018
@@ -1,3 +1,17 @@
+/**
+ * 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.
+ */
+
package org.apache.aries.cdi.test.cases;
import static org.junit.Assert.*;
Modified: aries/trunk/cdi/javax.annotation-api/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.annotation-api/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/javax.annotation-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.annotation-api/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html"
Provide-Capability:\
osgi.contract;\
Modified: aries/trunk/cdi/javax.cdi-api/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/javax.cdi-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.cdi-api/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Bundle-License: ASL-2.0;link="http://www.apache.org/licenses/LICENSE-2.0.txt"
Provide-Capability: \
osgi.contract; \
Modified: aries/trunk/cdi/javax.el-api/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.el-api/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/javax.el-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.el-api/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html"
Provide-Capability: \
osgi.contract; \
Modified: aries/trunk/cdi/javax.inject-api/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/javax.inject-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.inject-api/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Bundle-License: ASL-2.0;link="http://www.apache.org/licenses/LICENSE-2.0.txt"
Provide-Capability: \
osgi.contract; \
Modified: aries/trunk/cdi/javax.interceptor-api/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/bnd.bnd?rev=1830404&r1=1830403&r2=1830404&view=diff
==============================================================================
--- aries/trunk/cdi/javax.interceptor-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.interceptor-api/bnd.bnd Fri Apr 27 23:32:27 2018
@@ -1,3 +1,15 @@
+# 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.
+
Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html"
Provide-Capability: \
osgi.contract; \