You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/10/16 02:43:23 UTC
svn commit: r464338 - in /geronimo/gbuild/trunk: gbuild-assemblies/pom.xml
gbuild-extensions/pom.xml pom.xml
Author: jdillon
Date: Sun Oct 15 17:43:22 2006
New Revision: 464338
URL: http://svn.apache.org/viewvc?view=rev&rev=464338
Log:
Use the gshell assembly by default
Cleaned up some dep config
Added:
geronimo/gbuild/trunk/gbuild-assemblies/pom.xml (with props)
Modified:
geronimo/gbuild/trunk/gbuild-extensions/pom.xml
geronimo/gbuild/trunk/pom.xml
Added: geronimo/gbuild/trunk/gbuild-assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/pom.xml?view=auto&rev=464338
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/pom.xml (added)
+++ geronimo/gbuild/trunk/gbuild-assemblies/pom.xml Sun Oct 15 17:43:22 2006
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ 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
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.gbuild</groupId>
+ <artifactId>gbuild</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>gbuild-assemblies</artifactId>
+ <name>GBuild Assemblies</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <!--
+ <module>gbuild-agent-assembly</module>
+ -->
+
+ <module>gbuild-gshell-assembly</module>
+
+ <!--
+ <module>gbuild-manager-assembly</module>
+ -->
+ </modules>
+
+</project>
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/gbuild/trunk/gbuild-extensions/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/pom.xml?view=diff&rev=464338&r1=464337&r2=464338
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/pom.xml Sun Oct 15 17:43:22 2006
@@ -49,4 +49,20 @@
<module>requeue-failed</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/gbuild/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/pom.xml?view=diff&rev=464338&r1=464337&r2=464338
==============================================================================
--- geronimo/gbuild/trunk/pom.xml (original)
+++ geronimo/gbuild/trunk/pom.xml Sun Oct 15 17:43:22 2006
@@ -78,6 +78,18 @@
</roles>
<timezone>-8</timezone>
</developer>
+
+ <developer>
+ <id>jdillon</id>
+ <name>Jason Dillon</name>
+ <email>jdillon@apache.org</email>
+ <organization>Geronimo</organization>
+ <roles>
+ <role>Java Developer</role>
+ <role>PMC Member</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
</developers>
<dependencyManagement>
@@ -176,13 +188,14 @@
<artifactId>activemq-core</artifactId>
<version>4.1-incubator-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
@@ -194,6 +207,13 @@
<artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>1.0</version>
</dependency>
+ -->
+
+ <dependency>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
+ <version>1.0</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
@@ -231,6 +251,35 @@
<plugins>
<plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+
+ <executions>
+ <execution>
+ <id>validate-java-version</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>require-java-version</goal>
+ </goals>
+ <configuration>
+ <version>1.5+</version>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>install-legal-files</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-legal-files</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -244,6 +293,7 @@
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<jdkName>1.4</jdkName>
+ <jdkLevel>1.4</jdkLevel>
<linkModules>true</linkModules>
</configuration>
</plugin>
@@ -255,18 +305,6 @@
<tagBase>https://svn.apache.org/repos/asf/geronimo/gbuild/tags</tagBase>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -319,6 +357,7 @@
<module>gbuild-report</module>
-->
+ <module>gbuild-commands</module>
<module>gbuild-assemblies</module>
</modules>
</profile>