You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/12/20 19:04:11 UTC
svn commit: r1221386 - in /geronimo/server/trunk/assemblies:
geronimo-jetty8-javaee6-web/ geronimo-jetty8-javaee6/
geronimo-jetty8-minimal/ geronimo-tomcat7-javaee6-web/
geronimo-tomcat7-javaee6/ geronimo-tomcat7-minimal/
Author: djencks
Date: Tue Dec 20 18:04:11 2011
New Revision: 1221386
URL: http://svn.apache.org/viewvc?rev=1221386&view=rev
Log:
GERONIMO-6240 include startup features in assemblies
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty8-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml?rev=1221386&r1=1221385&r2=1221386&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml Tue Dec 20 18:04:11 2011
@@ -38,11 +38,58 @@
<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.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>javaee6-web-jetty</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
</dependencies>
+ <build>
+ <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>
+ <feature>obr</feature>
+ <feature>framework</feature>
+ </startupFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml?rev=1221386&r1=1221385&r2=1221386&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6/pom.xml Tue Dec 20 18:04:11 2011
@@ -38,6 +38,34 @@
<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.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>javaee6-jetty</artifactId>
<version>${project.version}</version>
@@ -45,4 +73,23 @@
</dependency>
</dependencies>
+ <build>
+ <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>
+ <feature>obr</feature>
+ <feature>framework</feature>
+ </startupFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty8-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty8-minimal/pom.xml?rev=1221386&r1=1221385&r2=1221386&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty8-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty8-minimal/pom.xml Tue Dec 20 18:04:11 2011
@@ -38,6 +38,34 @@
<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.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>wab-jetty</artifactId>
<version>${project.version}</version>
@@ -46,53 +74,23 @@
</dependencies>
<build>
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-dependency-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<phase>process-resources</phase>-->
- <!--<goals>-->
- <!--<goal>unpack</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<artifactItems>-->
- <!--<artifactItem>-->
- <!--<groupId>org.apache.geronimo.assemblies</groupId>-->
- <!--<artifactId>geronimo-framework</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>zip</type>-->
- <!--<classifier>bin</classifier>-->
- <!--</artifactItem>-->
- <!--</artifactItems>-->
- <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-antrun-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<phase>process-resources</phase>-->
- <!--<goals>-->
- <!--<goal>run</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<tasks>-->
- <!--<mkdir dir="${project.build.directory}/assembly" />-->
- <!--<copy todir="${project.build.directory}/assembly">-->
- <!--<fileset dir="${project.build.directory}/geronimo-framework-${project.version}" />-->
- <!--</copy>-->
- <!--</tasks>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
- <!--</plugins>-->
+ <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>
+ <feature>obr</feature>
+ <feature>framework</feature>
+ </startupFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml?rev=1221386&r1=1221385&r2=1221386&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml Tue Dec 20 18:04:11 2011
@@ -38,11 +38,58 @@
<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.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>javaee6-web-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
</dependencies>
+ <build>
+ <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>
+ <feature>obr</feature>
+ <feature>framework</feature>
+ </startupFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml?rev=1221386&r1=1221385&r2=1221386&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml Tue Dec 20 18:04:11 2011
@@ -38,11 +38,58 @@
<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.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>javaee6-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
</dependencies>
+ <build>
+ <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>
+ <feature>obr</feature>
+ <feature>framework</feature>
+ </startupFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml?rev=1221386&r1=1221385&r2=1221386&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml Tue Dec 20 18:04:11 2011
@@ -38,6 +38,34 @@
<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.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.version}</version>
+ <type>kar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>wab-tomcat</artifactId>
<version>${project.version}</version>
@@ -45,54 +73,24 @@
</dependency>
</dependencies>
- <!--<build>-->
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-dependency-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<phase>process-resources</phase>-->
- <!--<goals>-->
- <!--<goal>unpack</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<artifactItems>-->
- <!--<artifactItem>-->
- <!--<groupId>org.apache.geronimo.assemblies</groupId>-->
- <!--<artifactId>geronimo-framework</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>zip</type>-->
- <!--<classifier>bin</classifier>-->
- <!--</artifactItem>-->
- <!--</artifactItems>-->
- <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
-
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-antrun-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<phase>process-resources</phase>-->
- <!--<goals>-->
- <!--<goal>run</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<tasks>-->
- <!--<mkdir dir="${project.build.directory}/assembly" />-->
- <!--<copy todir="${project.build.directory}/assembly">-->
- <!--<fileset dir="${project.build.directory}/geronimo-framework-${project.version}" />-->
- <!--</copy>-->
- <!--</tasks>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
- <!--</plugins>-->
- <!--</build>-->
+ <build>
+ <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>
+ <feature>obr</feature>
+ <feature>framework</feature>
+ </startupFeatures>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>