1:50 p.m.
Author: dan.j.allen
Date: 2010-06-15 14:50:04 -0400 (Tue, 15 Jun 2010)
New Revision: 13155
Modified:
examples/trunk/booking-simplified/pom.xml
Log:
cleanup arquillian profiles
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-15 18:30:09 UTC (rev 13154)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-15 18:50:04 UTC (rev 13155)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
@@ -26,12 +28,17 @@
</licenses>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<webapp.directory>src/main/webapp</webapp.directory>
<jboss.home>${env.JBOSS_HOME}</jboss.home>
<jboss.domain>default</jboss.domain>
- <seam.faces.version>3.0.0.Alpha3</seam.faces.version>
+ <arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
+ <glassfish.version>3.0.1-b02</glassfish.version>
<jpamodelgen.version>1.0.0.Final</jpamodelgen.version>
- <arquillian.version>1.0.0.Alpha2</arquillian.version>
+ <jboss-as-client.version>6.0.0.20100216-M2</jboss-as-client.version>
+ <jboss-javaee6-spec.version>1.0.0.Beta4</jboss-javaee6-spec.version>
+ <jboss-server-manager.version>1.0.3.GA</jboss-server-manager.version>
+ <seam-faces.version>3.0.0.Alpha3</seam-faces.version>
</properties>
<dependencies>
@@ -39,7 +46,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
- <!-- TODO Get this into Weld Parent! -->
<version>${jpamodelgen.version}</version>
<scope>provided</scope>
</dependency>
@@ -47,13 +53,14 @@
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces</artifactId>
- <version>${seam.faces.version}</version>
+ <version>${seam-faces.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces-api</artifactId>
- <version>${seam.faces.version}</version>
+ <version>${seam-faces.version}</version>
</dependency>
<dependency>
@@ -76,6 +83,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
@@ -89,6 +97,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
+ <version>1.0.0</version>
<scope>test</scope>
</dependency>
@@ -103,6 +112,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
+ <source>1.6</source>
+ <target>1.6</target>
<!-- don't waste time on generation -->
<compilerArgument>-proc:none</compilerArgument>
</configuration>
@@ -146,17 +157,87 @@
<wtpdefaultserver>JBossAS</wtpdefaultserver>
<wtpversion>2.0</wtpversion>
<!--
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
-->
</configuration>
</plugin>
+ <!-- Configure the JBoss AS Maven deploy plugin -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ <serverName>${jboss.domain}</serverName>
+ <fileNames>
+
<fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
+ </fileNames>
+ </configuration>
+ </plugin>
+
+ <!-- Configure the Embedded GlassFish Maven plugin -->
+ <plugin>
+ <groupId>org.glassfish</groupId>
+ <artifactId>maven-embedded-glassfish-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+
<app>${project.build.directory}/${project.build.finalName}.war</app>
+ <port>7070</port>
+ <containerType>web</containerType>
+
<instanceRoot>${project.build.directory}/gfembed${maven.build.timestamp}</instanceRoot>
+ <autoDelete>true</autoDelete>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
<profiles>
<profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>${jboss-javaee6-spec.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ <serverName>${jboss.domain}</serverName>
+ <fileNames>
+
<fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
+ </fileNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>glassfish</id>
<dependencies>
<dependency>
@@ -169,19 +250,18 @@
<version>1.5.10</version>
</dependency>
<dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Beta4</version>
- <type>pom</type>
+ <groupId>org.glassfish.extras</groupId>
+ <artifactId>glassfish-embedded-all</artifactId>
+ <version>${glassfish.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
+
<profile>
<id>glassfish-embedded</id>
<build>
<plugins>
- <!-- Configure the Embedded GlassFish Maven plugin -->
<plugin>
<groupId>org.glassfish</groupId>
<artifactId>maven-embedded-glassfish-plugin</artifactId>
@@ -207,52 +287,14 @@
<version>1.5.10</version>
</dependency>
<dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Beta4</version>
- <type>pom</type>
+ <groupId>org.glassfish.extras</groupId>
+ <artifactId>glassfish-embedded-all</artifactId>
+ <version>${glassfish.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
- <profile>
- <id>jboss</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <!-- Configure the JBoss AS Maven deploy plugin -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
-
<fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
- </fileNames>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Beta4</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
<profile>
<id>jbossas-remote-60</id>
<dependencies>
@@ -265,7 +307,7 @@
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Beta4</version>
+ <version>${jboss-javaee6-spec.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
@@ -273,7 +315,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
- <version>6.0.0.20100216-M2</version>
+ <version>${jboss-as-client.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -302,7 +344,7 @@
<dependency>
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
- <version>3.0.1-b02</version>
+ <version>${glassfish.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -319,18 +361,18 @@
</profile>
<profile>
- <id>glassfish-remote-jsr88</id>
+ <id>glassfish-remote-30</id>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-remote-jsr88</artifactId>
+ <artifactId>arquillian-glassfish-remote-30</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
- <version>3.0.1-b02</version>
+ <version>${glassfish.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>