geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221390 [8/8] - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/buildsupport/car-maven-plugin/src/main/resources/M...
Date Tue, 20 Dec 2011 18:05:05 GMT
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,11 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,11 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml Tue Dec 20 18:04:59 2011
@@ -127,7 +127,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -139,7 +139,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <!--deploymentConfig>${cxfDeployer}</deploymentConfig-->

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -181,7 +181,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jaxwsSunTools}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Tue Dec 20 18:04:59
2011
@@ -37,11 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <type>kar</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml Tue Dec 20 18:04:59 2011
@@ -94,7 +94,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml Tue Dec 20 18:04:59 2011
@@ -101,7 +101,7 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>

Modified: geronimo/server/trunk/plugins/wink/wink/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wink/wink/pom.xml (original)
+++ geronimo/server/trunk/plugins/wink/wink/pom.xml Tue Dec 20 18:04:59 2011
@@ -37,10 +37,32 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>standard</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>framework</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>kar</type>
         </dependency>
 
         <!-- parent -->

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1221390&r1=1221389&r2=1221390&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 20 18:04:59 2011
@@ -97,10 +97,8 @@
         <myfacesVersion>2.0.9_1</myfacesVersion>
 
         <!-- Deployers -->
-        <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
-        </gbeanDeployerBootstrap>
 
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${project.version}/car</gbeanDeployer>
+        <!--<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${project.version}/car</gbeanDeployer>-->
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${project.version}/car</j2eeDeployer>
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${project.version}/car</clientDeployer>
         <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${project.version}/car</connectorDeployer>
@@ -374,7 +372,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
-                <version>1.2-SNAPSHOT</version>
+                <version>2.0-SNAPSHOT</version>
                 <!--<exclusions>-->
                     <!--<exclusion>-->
                         <!--<groupId>org.apache.geronimo.bundles</groupId>-->
@@ -1710,7 +1708,12 @@ only found in cxf
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.scr</artifactId>
-                <version>1.6.0</version>
+                <version>1.6.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.scr.annotations</artifactId>
+                <version>1.4.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
@@ -2112,6 +2115,23 @@ only found in cxf
                 </plugin>
 
                 <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-scr-plugin</artifactId>
+                    <version>1.6.0</version>
+                    <executions>
+                        <execution>
+                            <id>generate-scr-scrdescriptor</id>
+                            <goals>
+                                <goal>scr</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <specVersion>1.1</specVersion>
+                    </configuration>
+                </plugin>
+
+                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
                     <version>1.3</version>



Mime
View raw message