geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221373 [3/3] - in /geronimo/server/trunk/framework: assemblies/geronimo-framework/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/car-maven-plugin/src/main/res...
Date Tue, 20 Dec 2011 18:03:25 GMT
Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1221373&r1=1221372&r2=1221373&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Tue Dec 20 18:03:25 2011
@@ -126,7 +126,10 @@
                     <lifecycle>
                         <id>default</id>
                         <phases>
-                            <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+                            <process-resources>
+                                org.apache.maven.plugins:maven-resources-plugin:resources,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:install-kars
+                            </process-resources>
                             <compile>org.apache.geronimo.buildsupport:car-maven-plugin:install-modules</compile>
                             <package>org.apache.geronimo.buildsupport:car-maven-plugin:archive</package>
                             <install>org.apache.maven.plugins:maven-install-plugin:install</install>

Modified: geronimo/server/trunk/framework/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/framework/pom.xml?rev=1221373&r1=1221372&r2=1221373&view=diff
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/plugingroups/framework/pom.xml Tue Dec 20 18:03:25 2011
@@ -35,13 +35,35 @@
     </description>
 
     <dependencies>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>karaf-framework</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+        
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>karaf-framework</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
+            <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</groupId>
             <artifactId>geronimo-shell-base</artifactId>

Modified: geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml?rev=1221373&r1=1221372&r2=1221373&view=diff
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
Tue Dec 20 18:03:25 2011
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.framework.plugingroups</groupId>
         <artifactId>framework</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-beta-1-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -18,22 +18,32 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-security</artifactId>
-        <type>car</type>
+        <artifactId>geronimo-deployment</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-system</artifactId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-shell-base</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>j2ee-security</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jsr88-cli</artifactId>
+        <artifactId>j2ee-system</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>karaf-framework</artifactId>
+        <artifactId>jsr88-cli</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -61,4 +71,34 @@
         <artifactId>shutdown</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-osgi-registry</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.console</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>



Mime
View raw message