[seam-commits] Seam SVN: r12883 - in modules/faces/trunk: docs/reference and 1 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri May 28 08:34:40 EDT 2010
Author: pete.muir at jboss.org
Date: 2010-05-28 08:34:39 -0400 (Fri, 28 May 2010)
New Revision: 12883
Modified:
modules/faces/trunk/docs/reference/pom.xml
modules/faces/trunk/examples/short-ly/pom.xml
modules/faces/trunk/pom.xml
Log:
clean ups to POM as a result of weld-parent:10
Modified: modules/faces/trunk/docs/reference/pom.xml
===================================================================
--- modules/faces/trunk/docs/reference/pom.xml 2010-05-28 12:34:05 UTC (rev 12882)
+++ modules/faces/trunk/docs/reference/pom.xml 2010-05-28 12:34:39 UTC (rev 12883)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>9</version>
+ <version>10-SNAPSHOT</version>
</parent>
<properties>
@@ -24,12 +24,6 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <configuration>
- <sourceDirectory>${project.basedir}/src/main/docbook</sourceDirectory>
- <imageResource>
- <directory>${project.basedir}/src/main/docbook/en-US</directory>
- </imageResource>
- </configuration>
</plugin>
</plugins>
</build>
Modified: modules/faces/trunk/examples/short-ly/pom.xml
===================================================================
--- modules/faces/trunk/examples/short-ly/pom.xml 2010-05-28 12:34:05 UTC (rev 12882)
+++ modules/faces/trunk/examples/short-ly/pom.xml 2010-05-28 12:34:39 UTC (rev 12883)
@@ -1,137 +1,97 @@
<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>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam.faces</groupId>
- <artifactId>seam-faces-examples-short-ly</artifactId>
+ <parent>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
- <packaging>war</packaging>
- <version>3.0.0-SNAPSHOT</version>
- <name>Seam Faces Example bit.ly clone with PrettyFaces</name>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces-examples-short-ly</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>Seam Faces Example bit.ly clone with PrettyFaces</name>
- <url>http://seamframework.org</url>
+ <url>http://seamframework.org</url>
- <repositories>
- <repository>
- <id>java.net2</id>
- <name>Repository hosting the jee6 artifacts</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <repository>
- <id>JBoss.ORG</id>
- <name>JBoss Maven Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- </repository>
- </repositories>
+ <properties>
+ <hibernate.version>3.5.1-Final</hibernate.version>
+ </properties>
- <properties>
- <hibernate.version>3.5.1-Final</hibernate.version>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.faces</groupId>
+ <artifactId>seam-faces</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.faces</groupId>
- <artifactId>seam-faces</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-web-api</artifactId>
- <version>6.0</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>com.ocpsoft</groupId>
+ <artifactId>ocpsoft-pretty-faces</artifactId>
+ <version>2.0.4</version>
+ </dependency>
- <dependency>
- <groupId>com.ocpsoft</groupId>
- <artifactId>ocpsoft-pretty-faces</artifactId>
- <version>2.0.4</version>
- </dependency>
+ <dependency>
+ <groupId>com.ocpsoft</groupId>
+ <artifactId>ocpsoft-pretty-time</artifactId>
+ <version>1.0.5</version>
+ </dependency>
- <dependency>
- <groupId>com.ocpsoft</groupId>
- <artifactId>ocpsoft-pretty-time</artifactId>
- <version>1.0.5</version>
- </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.10</version>
+ </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.glassfish</groupId>
+ <artifactId>maven-embedded-glassfish-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ <finalName>short.ly</finalName>
+ </build>
- <pluginRepositories>
- <pluginRepository>
- <id>Glassfish</id>
- <url>http://download.java.net/maven/glassfish/</url>
- </pluginRepository>
- </pluginRepositories>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.glassfish</groupId>
- <artifactId>maven-embedded-glassfish-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <goalPrefix>glassfish</goalPrefix>
- <app>${project.build.directory}/${build.finalName}.war</app>
- <port>8080</port>
- <contextRoot>${build.finalName}</contextRoot>
- </configuration>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
- </plugins>
- <finalName>short.ly</finalName>
- </build>
-
</project>
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-05-28 12:34:05 UTC (rev 12882)
+++ modules/faces/trunk/pom.xml 2010-05-28 12:34:39 UTC (rev 12883)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>9</version>
+ <version>10</version>
</parent>
<artifactId>seam-faces-parent</artifactId>
@@ -157,72 +157,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>code-coverage</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>${emma.maven.plugin.version}</version>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>instrumentation</id>
- <phase>process-classes</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- <configuration>
- <verbose>true</verbose>
- </configuration>
- </execution>
- <execution>
- <id>cleaning</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <forkMode>once</forkMode>
- <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma4it-maven-plugin</artifactId>
- <version>${emma4it.maven.plugin.version}</version>
- <executions>
- <execution>
- <id>report</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <sourceSets>
- <sourceSet>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceSet>
- </sourceSets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
</profiles>
<developers>
More information about the seam-commits
mailing list