You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/10/12 03:40:33 UTC
svn commit: r1021577 - in /myfaces/commons/branches/jsf_11:
myfaces-commons-components/pom.xml myfaces-commons-converters/pom.xml
myfaces-commons-validators/pom.xml pom.xml
Author: lu4242
Date: Tue Oct 12 01:40:33 2010
New Revision: 1021577
URL: http://svn.apache.org/viewvc?rev=1021577&view=rev
Log:
update pom.xml, add facelets dependency, add myfaces builder annotations dependency (commons11 is jdk 1.5)
Modified:
myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml
myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml
myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml
myfaces/commons/branches/jsf_11/pom.xml
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml?rev=1021577&r1=1021576&r2=1021577&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml Tue Oct 12 01:40:33 2010
@@ -41,7 +41,6 @@
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.2</version>
<executions>
<execution>
<goals>
@@ -104,6 +103,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
@@ -128,27 +133,28 @@
<dependency>
<groupId>poi</groupId>
<artifactId>poi</artifactId>
- <version>2.5.1-final-20040804</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
- <version>1.4.8</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.myfaces.commons</groupId>
@@ -245,7 +251,6 @@
<!-- Generate content for custom tagdoc report -->
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.2</version>
<configuration>
<taglibs>
<mcc>http://myfaces.apache.org/commons/components</mcc>
@@ -275,7 +280,6 @@
<!-- which goal is run here? -->
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.2</version>
<configuration>
<taglibs>
<mcc>http://myfaces.apache.org/commons/components</mcc>
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml?rev=1021577&r1=1021576&r2=1021577&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml Tue Oct 12 01:40:33 2010
@@ -1,3 +1,20 @@
+<?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.
+-->
<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>
@@ -97,6 +114,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
@@ -117,6 +140,12 @@
<artifactId>myfaces-commons-utils11</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -316,4 +345,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml?rev=1021577&r1=1021576&r2=1021577&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml Tue Oct 12 01:40:33 2010
@@ -119,6 +119,11 @@
<artifactId>myfaces-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
@@ -143,6 +148,13 @@
<artifactId>myfaces-commons-utils11</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: myfaces/commons/branches/jsf_11/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/pom.xml?rev=1021577&r1=1021576&r2=1021577&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/pom.xml Tue Oct 12 01:40:33 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>6</version>
+ <version>9</version>
</parent>
<groupId>org.apache.myfaces.commons</groupId>
@@ -33,10 +33,10 @@
<url>http://myfaces.apache.org/commons11</url>
<inceptionYear>2007</inceptionYear>
- <!--issueManagement>
+ <issueManagement>
<system>jira</system>
- <url>http://issues.apache.org/jira/browse/MYFACES-COMMONS</url>
- </issueManagement-->
+ <url>http://issues.apache.org/jira/browse/MFCOMMONS</url>
+ </issueManagement>
<distributionManagement>
<site>
@@ -57,25 +57,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-6</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.1</resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<!--
- Make a checkstyle violation a compile error. Note that if a compile error occurs,
- further information can be found in target/site/checkstyle.html (present even when
@@ -107,7 +88,7 @@
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.2</version>
+ <version>1.0.8-SNAPSHOT</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
@@ -157,13 +138,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.6</version>
+ <version>${myfaces.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.6</version>
+ <version>${myfaces.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -178,6 +159,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-annotations</artifactId>
+ <version>1.0.7-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.14</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
<version>1.0.3</version>
@@ -320,7 +313,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -333,13 +326,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>all-modules</id>
- <modules>
- <module>myfaces-async-lifecycle</module>
- <module>myfaces-commons-site</module>
- </modules>
- </profile>
</profiles>
<reporting>
@@ -361,4 +347,8 @@
</plugin>
</plugins>
</reporting>
+ <properties>
+ <jetty.version>6.1.15</jetty.version>
+ <myfaces.version>1.1.8</myfaces.version>
+ </properties>
</project>