geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1832796 [1/2] - in /geronimo/specs/trunk: ./ geronimo-activation_1.1_spec/ geronimo-annotation_1.0-MR1_spec/ geronimo-annotation_1.0_spec/ geronimo-annotation_1.1_spec/ geronimo-annotation_1.2_spec/ geronimo-annotation_1.3_spec/ geronimo-a...
Date Mon, 04 Jun 2018 06:39:49 GMT
Author: struberg
Date: Mon Jun  4 06:39:48 2018
New Revision: 1832796

URL: http://svn.apache.org/viewvc?rev=1832796&view=rev
Log:
GERONIMO-6606 improve OSGi handling.

Patch provided by Raymond Auge (apacheId rotty3000), thanks!

Modified:
    geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-annotation_1.0-MR1_spec/pom.xml
    geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-annotation_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-annotation_1.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml
    geronimo/specs/trunk/geronimo-atinject_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml
    geronimo/specs/trunk/geronimo-availability_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-ccpp_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml
    geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-ejb_3.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-interceptor_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
    geronimo/specs/trunk/geronimo-j2ee-deployment_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
    geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml
    geronimo/specs/trunk/geronimo-javamail_1.5_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxb_2.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxrs_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxrs_2.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxws_2.1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jaxws_2.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-jbatch_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jcache_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jcdi_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jpa_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jpa_2.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-json_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-json_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jta_1.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itesta/pom.xml
    geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itestb/pom.xml
    geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator/pom.xml
    geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/pom.xml
    geronimo/specs/trunk/geronimo-osgi-support/pom.xml
    geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-validation_2.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-websockets_1.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml
    geronimo/specs/trunk/pom.xml

Modified: geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -97,6 +97,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -107,6 +108,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator,org.apache.geronimo.specs.activation</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.specs.activation.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaActivation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-annotation_1.0-MR1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.0-MR1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.0-MR1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.0-MR1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -60,9 +60,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.annotation*;version=1.1</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaActivation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -60,9 +60,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.annotation*;version=1.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaAnnotation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-annotation_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -60,6 +60,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -67,6 +68,9 @@
                         <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
                         <Specification-Version>1.1</Specification-Version>
                         <Export-Package>javax.annotation*;version=1.1</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaAnnotation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-annotation_1.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.2_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -68,6 +68,9 @@
                         <Specification-Vendor>Oracle, Inc.</Specification-Vendor>
                         <Specification-Version>1.2</Specification-Version>
                         <Export-Package>javax.annotation*;version=1.2</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaAnnotation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.2,1.1,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.3_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -68,6 +68,9 @@
                         <Specification-Vendor>Oracle, Inc.</Specification-Vendor>
                         <Specification-Version>1.3</Specification-Version>
                         <Export-Package>javax.annotation*;version=1.3</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaAnnotation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.3,1.2,1.1,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-atinject_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-atinject_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-atinject_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-atinject_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -54,9 +54,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.inject*;version=1.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaInject;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-availability_0.4_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -61,9 +61,13 @@
         <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>3.5.0</version>
             <configuration>
                 <instructions>
                   <Export-Package>javax.availability.management*;version=0.4</Export-Package>
+                    <Provide-Capability><![CDATA[
+                        osgi.contract;osgi.contract=JavaAvailabilityManagement;uses:="${packages;NAMED;javax.*}";version:List<Version>='0.4'
+                    ]]></Provide-Capability>
                 </instructions>
             </configuration>
         </plugin>

Modified: geronimo/specs/trunk/geronimo-availability_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-availability_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-availability_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-availability_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -61,9 +61,13 @@
         <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>3.5.0</version>
             <configuration>
                 <instructions>
                   <Export-Package>javax.availability.management*;version=1.0</Export-Package>
+                    <Provide-Capability><![CDATA[
+                        osgi.contract;osgi.contract=JavaAvailabilityManagement;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0,0.4'
+                    ]]></Provide-Capability>
                 </instructions>
             </configuration>
         </plugin>

Modified: geronimo/specs/trunk/geronimo-ccpp_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ccpp_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ccpp_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ccpp_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -77,9 +77,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.ccpp*;version=1.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaCCPP;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-commonj_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -61,6 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <!-- TODO import and export of java packages cannot be specified.  Is this really a java spec rather than javax?? -->

Modified: geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-concurrent_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -64,10 +64,13 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>3.5.0</version>
         <configuration>
           <instructions>
             <Export-Package>javax.enterprise.concurrent*;version=1.0</Export-Package>
+            <Provide-Capability><![CDATA[
+                osgi.contract;osgi.contract=JavaEnterpriseConcurrency;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+            ]]></Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -56,14 +56,14 @@
             <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-interceptor_3.0_spec</artifactId>
             <version>1.0.1</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -83,10 +83,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <!-- TODO how about javax.xml.rpc.handler which is in this jar?? -->
                         <Export-Package>javax.ejb*;version=3.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaEJB;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.0,2.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec-alt/pom.xml Mon Jun  4 06:39:48 2018
@@ -83,6 +83,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -97,6 +98,9 @@
                         <Include-Resource>
                             {maven-resources}, javax/ejb/EJBException.class=target/classes/javax/ejb/EJBException.class
                         </Include-Resource>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaEJB;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.1,3.0,2.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -97,6 +97,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -107,6 +108,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaEJB;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.1,3.0,2.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-ejb_3.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.2_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -97,16 +97,20 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
-                        <Specification-Title>JSR-318 Enterprise Java Beans 3.1</Specification-Title>
+                        <Specification-Title>JSR-318 Enterprise Java Beans 3.2</Specification-Title>
                         <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
-                        <Specification-Version>3.1</Specification-Version>
-                        <Export-Package>javax.ejb*;version=3.1</Export-Package>
+                        <Specification-Version>3.2</Specification-Version>
+                        <Export-Package>javax.ejb*;version=3.2</Export-Package>
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaEJB;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.2,3.1,3.0,2.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-el_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -60,9 +60,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.el*;version=1.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaEL;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -69,6 +69,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
@@ -79,6 +80,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaEL;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.2,2.1,2.0,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-interceptor_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -60,9 +60,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.interceptor*;version=1.1</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaInterceptor;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -60,10 +60,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.interceptor*;version=1.2</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaInterceptor;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.2,1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -35,7 +35,7 @@
     <packaging>bundle</packaging>
     <name>Apache Geronimo Interceptor Spec 1.0</name>
     <version>1.0.2-SNAPSHOT</version>
-    <description>Interceptor API 1.0</description>
+    <description>Interceptor API 3.0</description>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     <distributionManagement>
@@ -60,9 +60,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.interceptor*;version=3.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaInterceptor;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.0,1.2,1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -75,9 +75,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.resource*;version=1.6</Export-Package>
+                        <Provide-Capability><![CDATA[
+                            osgi.contract;osgi.contract=JavaEEConnector;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.6'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-j2ee-deployment_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-deployment_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-deployment_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-deployment_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -68,9 +68,13 @@
         <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>3.5.0</version>
             <configuration>
                 <instructions>
                   <Export-Package>javax.enterprise.deploy*;version=1.1</Export-Package>
+                  <Provide-Capability><![CDATA[
+                     osgi.contract;osgi.contract=JavaEEDeployment;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                  ]]></Provide-Capability>
                 </instructions>
             </configuration>
         </plugin>

Modified: geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-management_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -76,10 +76,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.management.j2ee*;version=1.1</Export-Package>
                         <Import-Package>javax.ejb*;resolution:=optional;version=2.1,*</Import-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaEEManagement;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jacc_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -82,6 +82,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -92,6 +93,9 @@
                         <Import-Package>javax.servlet*;resolution:=optional;version=2.5,org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJACC;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jacc_1.4_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -82,6 +82,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -92,6 +93,9 @@
                         <Import-Package>javax.servlet*;resolution:=optional;version=2.5,org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJACC;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.4,1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaspic_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -69,6 +69,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -79,6 +80,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJASPIC;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -68,9 +68,13 @@
         <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>3.5.0</version>
             <configuration>
                 <instructions>
                   <Export-Package>javax.enterprise.deploy*;version=1.1.3</Export-Package>
+                  <Provide-Capability><![CDATA[
+                     osgi.contract;osgi.contract=JavaEEDeployment;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                  ]]></Provide-Capability>
                 </instructions>
             </configuration>
         </plugin>

Modified: geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.4_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -101,6 +101,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
@@ -111,6 +112,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator,org.apache.geronimo.mail</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.mail.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaMail;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.4'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-javamail_1.5_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.5_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.5_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -126,7 +126,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
@@ -137,6 +137,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator,org.apache.geronimo.mail</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.mail.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaMail;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.5,1.4'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -72,9 +72,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.xml.bind*;version=2.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXB;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -72,9 +72,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.xml.bind*;version=2.1</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXB;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.1,2.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxb_2.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.2_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -78,6 +78,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -88,6 +89,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXB;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.2,2.1,2.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxr_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -90,6 +90,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -100,6 +101,9 @@
                         <Import-Package>javax.activation;version=1.1,org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXR;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxrpc_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -83,6 +83,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -93,6 +94,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXRPC;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxrs_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -67,6 +67,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -77,6 +78,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXRS;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -67,17 +67,20 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>3.5.0</version>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
-            <Specification-Title>JSR-339 Java RESTful Web Services 1.1</Specification-Title>
+            <Specification-Title>JSR-339 Java RESTful Web Services 2.0</Specification-Title>
             <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
-            <Specification-Version>1.1</Specification-Version>
-            <Export-Package>javax.ws.rs*;version=1.1</Export-Package>
+            <Specification-Version>2.0</Specification-Version>
+            <Export-Package>javax.ws.rs*;version=2.0</Export-Package>
             <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
             <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
             <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+            <Provide-Capability><![CDATA[
+               osgi.contract;osgi.contract=JavaJAXRS;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.0,1.1'
+            ]]></Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxrs_2.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -67,7 +67,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>3.5.0</version>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
@@ -78,6 +78,9 @@
             <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
             <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
             <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+            <Provide-Capability><![CDATA[
+               osgi.contract;osgi.contract=JavaJAXRS;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.1,2.0,1.1'
+            ]]></Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxws_2.1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxws_2.1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxws_2.1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxws_2.1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -93,6 +93,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -103,6 +104,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXWS;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.1.1,2.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxws_2.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -87,9 +87,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.xml.ws*;version=2.1</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXWS;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jaxws_2.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxws_2.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxws_2.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jaxws_2.2_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -97,6 +97,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -107,6 +108,9 @@
                         <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJAXWS;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.2,2.1.1,2.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jbatch_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jbatch_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jbatch_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jbatch_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -76,6 +76,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Specification-Version>1.0</Specification-Version>
@@ -89,6 +90,9 @@
                             javax.enterprise.util;resolution:=optional,
                             *
                         </Import-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaBatch;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jcache_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcache_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcache_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jcache_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -92,12 +92,17 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>3.5.0</version>
         <configuration>
           <instructions>
+            <Specification-Version>1.0</Specification-Version>
+            <Specification-Title>JSR-107 JCache 1.0</Specification-Title>
             <Export-Package>
               javax.cache*;version=1.0
             </Export-Package>
+            <Provide-Capability><![CDATA[
+               osgi.contract;osgi.contract=JavaCache;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+            ]]></Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -27,7 +27,7 @@
     <groupId>org.apache.geronimo.specs</groupId>
     <artifactId>geronimo-jcdi_1.0_spec</artifactId>
     <packaging>bundle</packaging>
-    <name>Apache Geronimo JSCI Spec 1.0</name>
+    <name>Apache Geronimo JCDI Spec 1.0</name>
     <version>1.1-SNAPSHOT</version>
 
     <description>Apache Geronimo implementation of the JSR-299 Context and Dependency Injection for the Java EE Platform</description>
@@ -100,6 +100,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>
@@ -109,6 +110,11 @@
                             javax.enterprise.inject*;version=1.0,
                             javax.enterprise.util*;version=1.0
                         </Export-Package>
+                        <Specification-Version>1.0</Specification-Version>
+                        <Specification-Title>JSR-299 CDI 1.0</Specification-Title>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaCDI;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jcdi_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jcdi_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -91,7 +91,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <artifactId>geronimo-annotation_1.2_spec</artifactId>
             <version>1.0</version>
             <scope>provided</scope>
         </dependency>
@@ -102,16 +102,21 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            javax.decorator*;version=1.0,
-                            javax.enterprise.context*;version=1.0,
-                            javax.enterprise.event*;version=1.0,
-                            javax.enterprise.inject*;version=1.0,
-                            javax.enterprise.util*;version=1.0
+                            javax.decorator*;version=1.1,
+                            javax.enterprise.context*;version=1.1,
+                            javax.enterprise.event*;version=1.1,
+                            javax.enterprise.inject*;version=1.1,
+                            javax.enterprise.util*;version=1.1
                         </Export-Package>
+                        <Specification-Version>1.1 &amp; 1.2</Specification-Version>
+                        <Specification-Title>JSR-346 CDI 1.1 &amp; 1.2</Specification-Title>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaCDI;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.2,1.1,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -102,7 +102,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>
@@ -112,6 +112,11 @@
                             javax.enterprise.inject*;version=2.0,
                             javax.enterprise.util*;version=2.0
                         </Export-Package>
+                        <Specification-Version>2.0</Specification-Version>
+                        <Specification-Title>JSR-365 CDI 2.0</Specification-Title>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaCDI;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.0,1.2,1.1,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jms_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -83,9 +83,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.jms*;version=1.1</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJMS;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -85,9 +85,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.jms*;version=2.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJMS;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.0,1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jpa_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -55,18 +55,22 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jpa_1.0_spec/</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jpa_1.0_spec/</url>
     </scm>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Specification-Title>JSR-220 Java Persistence API 1.0</Specification-Title>
                         <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
                         <Specification-Version>1.0</Specification-Version>
                         <Export-Package>javax.persistence*;version=1.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJPA;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -125,6 +125,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
@@ -158,6 +159,9 @@
                             org.osgi.util.tracker;resolution:=optional,
                             org.apache.geronimo.osgi.registry.api;resolution:=optional
                         </Import-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJPA;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.0,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>

Modified: geronimo/specs/trunk/geronimo-jpa_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -117,6 +117,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <version>3.5.0</version>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName>
@@ -150,6 +151,9 @@
               org.osgi.util.tracker;resolution:=optional,
               org.apache.geronimo.osgi.registry.api;resolution:=optional
             </Import-Package>
+            <Provide-Capability><![CDATA[
+               osgi.contract;osgi.contract=JavaJPA;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.1,2.0,1.0'
+            ]]></Provide-Capability>
           </instructions>
           <unpackBundle>true</unpackBundle>
         </configuration>

Modified: geronimo/specs/trunk/geronimo-json_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-json_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-json_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-json_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -91,12 +91,15 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.0.1</version>
+        <version>3.5.0</version>
         <configuration>
           <instructions>
             <Export-Package>
               javax.json*;version=1.0
             </Export-Package>
+            <Provide-Capability><![CDATA[
+               osgi.contract;osgi.contract=JavaJSONP;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+            ]]></Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: geronimo/specs/trunk/geronimo-json_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-json_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-json_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-json_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -77,12 +77,15 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.5.0</version>
         <configuration>
           <instructions>
             <Export-Package>
               javax.json*;version=1.1
             </Export-Package>
+            <Provide-Capability><![CDATA[
+               osgi.contract;osgi.contract=JavaJSONP;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1,1.0'
+            ]]></Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsonb_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -87,7 +87,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>
@@ -96,6 +96,9 @@
                         <Import-Package>
                             javax.json.*
                         </Import-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJSONB;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -63,7 +63,7 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1_spec/</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1_spec/</developerConnection>
@@ -75,9 +75,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.servlet.jsp*;version=2.1</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJSP;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.1,2.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -75,9 +75,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.servlet.jsp*;version=2.2</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJSP;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.2,2.1,2.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -60,9 +60,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.transaction*;version=1.1</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaJTA;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>



Mime
View raw message