geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221373 [1/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
Author: djencks
Date: Tue Dec 20 18:03:25 2011
New Revision: 1221373

URL: http://svn.apache.org/viewvc?rev=1221373&view=rev
Log:
GERONIMO-6240 modify car-maven-plugin to install karaf kars and features, use this for the
base server

Added:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/maven/plugin.xml
  (with props)
Modified:
    geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/server/trunk/framework/plugingroups/framework/pom.xml
    geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml?rev=1221373&r1=1221372&r2=1221373&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Tue Dec 20 18:03:25
2011
@@ -39,6 +39,28 @@
     
     <dependencies>
         <dependency>
+            <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.plugingroups</groupId>
             <artifactId>framework</artifactId>
             <version>${project.version}</version>
@@ -147,6 +169,21 @@
                 
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <startupFeatures>
+                        <feature>standard</feature>
+                        <feature>management</feature>
+                        <feature>ssh</feature>
+                        <feature>config</feature>
+                        <feature>kar</feature>
+                    </startupFeatures>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=1221373&r1=1221372&r2=1221373&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Dec 20 18:03:25
2011
@@ -199,7 +199,7 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
-            <version>1.0-alpha-9-stable-1</version>
+            <version>1.0-alpha-43</version>
             <scope>provided</scope>
         </dependency>
         <!--<dependency>-->
@@ -273,8 +273,25 @@
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-mvn</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.tooling</groupId>
+            <artifactId>karaf-maven-plugin</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <skipDescriptor>true</skipDescriptor>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <profile>
             <id>felix</id>

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=1221373&r1=1221372&r2=1221373&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
Tue Dec 20 18:03:25 2011
@@ -576,7 +576,9 @@ public abstract class AbstractCarMojo
         }
 
         private Accept accept(Artifact dependency, Accept previous) {
-            if (dependency.getGroupId().startsWith("org.apache.geronimo.genesis")) {
+            if (dependency.getGroupId().startsWith("org.apache.geronimo.genesis")
+                    || dependency.getType().equals("kar")
+                    || (dependency.getType().equals("xml") && "features".equals(dependency.getClassifier())))
{
                 return Accept.STOP;
             }
             String scope = dependency.getScope();



Mime
View raw message