geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1832796 [2/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
Modified: geronimo/specs/trunk/geronimo-jta_1.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jta_1.2_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,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.transaction*;version=1.2</Export-Package>
+            <Provide-Capability><![CDATA[
+               osgi.contract;osgi.contract=JavaJTA;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.2,1.1'
+            ]]></Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itesta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itesta/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itesta/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itesta/pom.xml Mon Jun  4 06:39:48
2018
@@ -48,6 +48,7 @@ provider resolution scenarios.
             <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>

Modified: geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itestb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itestb/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itestb/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-itestb/pom.xml Mon Jun  4 06:39:48
2018
@@ -48,6 +48,7 @@ provider resolution scenarios.
             <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>

Modified: geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator/pom.xml Mon Jun  4 06:39:48
2018
@@ -67,6 +67,7 @@ should be copied into another bundle as
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Import-Package>*</Import-Package>

Modified: geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/pom.xml Mon Jun  4 06:39:48
2018
@@ -65,6 +65,7 @@ other bundles.
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>org.apache.geronimo.osgi.registry.api;version=1.0</Export-Package>

Modified: geronimo/specs/trunk/geronimo-osgi-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-osgi-support/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-osgi-support/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-osgi-support/pom.xml Mon Jun  4 06:39:48 2018
@@ -190,7 +190,7 @@ OSGi-specific lookup in the Geronimo spe
         <module>geronimo-osgi-locator</module>
         <module>geronimo-osgi-itesta</module>
         <module>geronimo-osgi-itestb</module>
-        <module>geronimo-osgi-registry-itests</module>
+        <!-- <module>geronimo-osgi-registry-itests</module> -->
         <module>geronimo-osgi-locator-itests</module>
     </modules>
 

Modified: geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-saaj_1.3_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -75,6 +75,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>
@@ -85,6 +86,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=JavaSAAJ;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.3'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_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.servlet*;version=2.5</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaServlet;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.5'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -62,6 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <!-- The OSGi Alliance defined package numbers don't match up
@@ -87,6 +88,9 @@
                             javax.servlet.http;version=2.6,
                             javax.servlet.resources;version=2.6,
                         </Import-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaServlet;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.0,2.5'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -80,6 +80,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <!-- The OSGi Alliance defined package numbers don't match up
@@ -105,6 +106,9 @@
                             javax.servlet.http;version=2.7,
                             javax.servlet.resources;version=2.7,
                         </Import-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaServlet;uses:="${packages;NAMED;javax.*}";version:List<Version>='3.1,3.0,2.5'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -72,6 +72,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>
@@ -82,6 +83,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=JavaSTAX;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-stax-api_1.2_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -70,6 +70,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>
@@ -80,6 +81,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=JavaSTAX;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.2,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-validation_1.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -80,6 +80,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>
@@ -90,6 +91,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=JavaBeanValidation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-validation_1.1_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -99,7 +99,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>
@@ -110,6 +110,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=JavaBeanValidation;uses:="${packages;NAMED;javax.*}";version:List<Version>='1.1,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-validation_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-validation_2.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-validation_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-validation_2.0_spec/pom.xml Mon Jun  4 06:39:48 2018
@@ -102,6 +102,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
@@ -114,6 +115,9 @@
                         <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>
                         <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>
                         <Automatic-Module-Name>java.validation</Automatic-Module-Name>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaBeanValidation;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.0,1.1,1.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

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

Modified: geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-ws-metadata_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ws-metadata_2.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
@@ -63,9 +63,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>javax.jws*;version=2.0</Export-Package>
+                        <Provide-Capability><![CDATA[
+                           osgi.contract;osgi.contract=JavaWebServicesMetadata;uses:="${packages;NAMED;javax.*}";version:List<Version>='2.0'
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?rev=1832796&r1=1832795&r2=1832796&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Mon Jun  4 06:39:48 2018
@@ -76,6 +76,7 @@
         <module>geronimo-jaxrpc_1.1_spec</module>
         <module>geronimo-jaxrs_1.1_spec</module>
         <module>geronimo-jaxrs_2.0_spec</module>
+        <module>geronimo-jaxrs_2.1_spec</module>
         <module>geronimo-jaxws_2.1.1_spec</module>
         <module>geronimo-jaxws_2.1_spec</module>
         <module>geronimo-jaxws_2.2_spec</module>
@@ -85,6 +86,7 @@
         <module>geronimo-jcdi_1.1_spec</module>
         <module>geronimo-jcdi_2.0_spec</module>
         <module>geronimo-jms_1.1_spec</module>
+        <module>geronimo-jms_2.0_spec</module>
         <module>geronimo-jpa_1.0_spec</module>
         <module>geronimo-jpa_2.0_spec</module>
         <module>geronimo-jpa_2.1_spec</module>
@@ -104,6 +106,7 @@
         <module>geronimo-stax-api_1.2_spec</module>
         <module>geronimo-validation_1.0_spec</module>
         <module>geronimo-validation_1.1_spec</module>
+        <module>geronimo-validation_2.0_spec</module>
         <module>geronimo-websockets_1.0_spec</module>
         <module>geronimo-ws-metadata_2.0_spec</module>
     </modules>



Mime
View raw message