You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/08/08 16:55:59 UTC
svn commit: r683988 - in /geronimo/samples/branches/2.1: pom.xml repository/
repository/pom.xml samples/pom.xml
Author: dwoods
Date: Fri Aug 8 07:55:59 2008
New Revision: 683988
URL: http://svn.apache.org/viewvc?rev=683988&view=rev
Log:
added local repository build to pull in the private server artifacts from the 2.1.2 server tag in svn to enable samples build with a clean local m2 repo
Added:
geronimo/samples/branches/2.1/repository/
geronimo/samples/branches/2.1/repository/pom.xml (with props)
Modified:
geronimo/samples/branches/2.1/pom.xml
geronimo/samples/branches/2.1/samples/pom.xml
Modified: geronimo/samples/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/pom.xml?rev=683988&r1=683987&r2=683988&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/pom.xml (original)
+++ geronimo/samples/branches/2.1/pom.xml Fri Aug 8 07:55:59 2008
@@ -61,6 +61,7 @@
<modules>
<module>buildutil</module>
+ <module>repository</module>
<module>geronimo-samples-archetype</module>
<module>samples</module>
</modules>
Added: geronimo/samples/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/repository/pom.xml?rev=683988&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/repository/pom.xml (added)
+++ geronimo/samples/branches/2.1/repository/pom.xml Fri Aug 8 07:55:59 2008
@@ -0,0 +1,197 @@
+<?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: 680611 $ $Date: 2008-07-28 23:08:37 -0400 (Mon, 28 Jul 2008) $ -->
+
+<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.samples</groupId>
+ <artifactId>samples-parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>repository</artifactId>
+ <name>Geronimo Local Repository</name>
+ <packaging>jar</packaging>
+
+ <description>
+ Container for local artifacts, this is a temporary solution until a more
+ permeant Geronimo specific repository solution can be implemented.
+ </description>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <!-- See GERONIMO-3010 These artifacts are here temporarily while we discuss the proposed change in
+ managed object lifecycle handling with the tomcat team. One way or another it should be gone in a couple
+ of weeks -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ </dependency>
+
+ <!-- add the following for wsgen -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+ <!--end add for wsgen-->
+
+ <!-- See GERONIMO-3410 -->
+ <dependency>
+ <groupId>org.codehaus.mojo.jspc</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <version>2.0-alpha-1-20070806</version>
+ </dependency>
+
+ <!-- This is to resolve an intermitent Maven problem with openejb-3.0-beta-1 transitive depend -->
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ <version>3.2-r579367</version>
+ </dependency>
+
+ <!-- Added for patched build of Pluto 1.1.6-G643117 -->
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-container</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptor-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptor-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal-driver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal-driver-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-taglib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>8.0-20060801</version>
+ </dependency>
+
+ <!-- See GERONIMO-3858 -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>geronimo-repo</id>
+ <name>Geronimo Server Private Repository</name>
+ <url>http://svn.apache.org/repos/asf/geronimo/server/tags/2.1.2/repository</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <!--
+ HACK: No legal files needed here... so don't fail the build if they are missing
+ -->
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>install-legal-files</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/samples/branches/2.1/repository/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=683988&r1=683987&r2=683988&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Fri Aug 8 07:55:59 2008
@@ -68,23 +68,32 @@
<module>all-samples</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -123,7 +132,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.3</version>
<configuration>
<resourcesDir>${project.build.outputDirectory}</resourcesDir>
<archive>
@@ -132,11 +140,9 @@
</archive>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
<configuration>
<archive>
<!-- Do not include META-INF/maven to avoid long file problems on windows -->
@@ -230,7 +236,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
<configuration>
<aggregate>true</aggregate>
<minmemory>128m</minmemory>
@@ -269,13 +274,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.3</version>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
<inherited>false</inherited>
</plugin>
<plugin>