Author: wsmoak
Date: Mon Jul 31 10:56:40 2006
New Revision: 427187
URL: http://svn.apache.org/viewvc?rev=427187&view=rev
Log:
Restore the shale-parent pom to a dependency on MyFaces 1.1.1 (r427160).
Exclude the transitive dependency on MyFaces 1.1.1 from the shale-petstore pom.
After this change, the shale-petstore app contains only MyFaces 1.1.5-SNAPSHOT.
Modified:
shale/framework/trunk/pom.xml
shale/sandbox/shale-petstore/pom.xml
Modified: shale/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/pom.xml?rev=427187&r1=427186&r2=427187&view=diff
==============================================================================
--- shale/framework/trunk/pom.xml (original)
+++ shale/framework/trunk/pom.xml Mon Jul 31 10:56:40 2006
@@ -100,14 +100,14 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
+ <groupId>myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
+ <groupId>myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>1.1.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -246,8 +246,36 @@
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-4</version>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>render-books</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <books>
+ <book>
+ <directory>src/site/xdoc</directory>
+ <descriptor>src/books/shale-book.xml</descriptor>
+ <formats>
+ <format>
+ <id>pdf</id>
+ </format>
+ </formats>
+ </book>
+ </books>
+ </configuration>
+ </plugin>
+ </plugins>
<defaultGoal>install</defaultGoal>
Modified: shale/sandbox/shale-petstore/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-petstore/pom.xml?rev=427187&r1=427186&r2=427187&view=diff
==============================================================================
--- shale/sandbox/shale-petstore/pom.xml (original)
+++ shale/sandbox/shale-petstore/pom.xml Mon Jul 31 10:56:40 2006
@@ -98,6 +98,16 @@
<groupId>org.apache.shale</groupId>
<artifactId>shale-core</artifactId>
<version>1.0.3-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
@@ -218,6 +228,6 @@
<artifactId>surefire-report-maven-plugin</artifactId>
</plugin>
</plugins>
- </reporting>
+ </reporting>
</project>
