Author: awiner
Date: Fri May 26 16:10:31 2006
New Revision: 409774
URL: http://svn.apache.org/viewvc?rev=409774&view=rev
Log:
Some POM work. Change the version number to "incubator-m1-SNAPSHOT". Add some
more Apache content to the top-level POM. Add a repository reference to the
java.net maven repos, and switch Facelets and EL over to appropriate references
there. We should now be down to only jsf-mock as a non-legit dependency.
Modified:
incubator/adffaces/trunk/adf-faces/adf-faces-api/pom.xml
incubator/adffaces/trunk/adf-faces/adf-faces-build/pom.xml
incubator/adffaces/trunk/adf-faces/adf-faces-demo/pom.xml
incubator/adffaces/trunk/adf-faces/adf-faces-impl/pom.xml
incubator/adffaces/trunk/adf-faces/pom.xml
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/pom.xml?rev=409774&r1=409773&r2=409774&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/pom.xml (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/pom.xml Fri May 26
16:10:31 2006
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.myfaces.adf</groupId>
<artifactId>adf-faces</artifactId>
- <version>11-m7-SNAPSHOT</version>
+ <version>incubator-m1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -136,7 +136,7 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-build/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-build/pom.xml?rev=409774&r1=409773&r2=409774&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-build/pom.xml (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-build/pom.xml Fri May 26
16:10:31 2006
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.myfaces.adf</groupId>
<artifactId>adf-faces</artifactId>
- <version>11-m7-SNAPSHOT</version>
+ <version>incubator-m1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-demo/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-demo/pom.xml?rev=409774&r1=409773&r2=409774&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-demo/pom.xml (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-demo/pom.xml Fri May 26
16:10:31 2006
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.myfaces.adf</groupId>
<artifactId>adf-faces</artifactId>
- <version>11-m7-SNAPSHOT</version>
+ <version>incubator-m1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -123,7 +123,7 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
</dependencies>
Modified: incubator/adffaces/trunk/adf-faces/adf-faces-impl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/pom.xml?rev=409774&r1=409773&r2=409774&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-impl/pom.xml (original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-impl/pom.xml Fri May 26
16:10:31 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2006 The Apache Software Foundation.
@@ -14,263 +14,265 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project>
- <parent>
- <groupId>org.apache.myfaces.adf</groupId>
- <artifactId>adf-faces</artifactId>
- <version>11-m7-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <name>ADF Faces Apache Impl</name>
- <description>ADF JavaServer Faces Apache Impl</description>
-
- <artifactId>adf-faces-impl</artifactId>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.adfbuild</groupId>
- <artifactId>maven-jdev-plugin</artifactId>
- <configuration>
- <sourceRoots>
- <sourceRoot>src/main/java-templates/</sourceRoot>
- </sourceRoots>
- <resourceRoots>
- <resourceRoot>src/main/javascript/</resourceRoot>
- </resourceRoots>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>adf.renderkit.fulltests</name>
- <value>lenient</value>
- </property>
- <property>
- <name>adf.renderkit.scripts</name>
-
<value>${project.basedir}/src/test/resources/org/apache/myfaces/adfinternal/renderkit/testScripts/</value>
- </property>
- <property>
- <name>adf.renderkit.golden</name>
-
<value>${project.basedir}/src/test/resources/org/apache/myfaces/adfinternal/renderkit/golden/</value>
- </property>
- <property>
- <name>adf.renderkit.failures</name>
- <value>${project.basedir}/target/test-failures/</value>
- </property>
- <property>
- <name>java.awt.headless</name>
- <value>true</value>
- </property>
- </systemProperties>
- <includes implementation="java.util.ArrayList" >
- <include implementation="java.lang.String">**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.myfaces.adfbuild</groupId>
- <artifactId>maven-mock-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-mock-sources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.myfaces.adfbuild</groupId>
- <artifactId>maven-faces-plugin</artifactId>
- <configuration>
- <taglibs>
- <af>http://myfaces.apache.org/adf/faces</af>
- <afh>http://myfaces.apache.org/adf/faces/html</afh>
- </taglibs>
-
<faceletHandlerClass>org.apache.myfaces.adfinternal.facelets.AdfComponentHandler</faceletHandlerClass>
- <typePrefix>org.apache</typePrefix>
- <packageContains>org.apache</packageContains>
- <force>true</force>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate-faces-config</goal>
- <goal>generate-jsp-taglibs</goal>
- <goal>generate-facelets-taglibs</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.myfaces.adfbuild</groupId>
- <artifactId>maven-i18n-plugin</artifactId>
- <configuration>
- <force>true</force>
- <targetPath>META-INF/adf/jsLibs/resources</targetPath>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate-locale-elements</goal>
- <goal>generate-javascript-locales</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.myfaces.adfbuild</groupId>
- <artifactId>maven-javascript-plugin</artifactId>
- <configuration>
- <sourcePath>META-INF/adf/jsLibs</sourcePath>
- <targetPath>META-INF/adf/jsLibsDebug</targetPath>
- <optimizeTargetPath>META-INF/adf/jsLibs</optimizeTargetPath>
- <force>true</force>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>reduce-javascript</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.myfaces.adfbuild</groupId>
- <artifactId>maven-xrts-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-sources</goal>
- <goal>generate-test-sources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
+<project>
+ <parent>
+ <groupId>org.apache.myfaces.adf</groupId>
+ <artifactId>adf-faces</artifactId>
+ <version>incubator-m1-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>ADF Faces Apache Impl</name>
+ <description>ADF JavaServer Faces Apache Impl</description>
+
+ <artifactId>adf-faces-impl</artifactId>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.adfbuild</groupId>
+ <artifactId>maven-jdev-plugin</artifactId>
+ <configuration>
+ <sourceRoots>
+ <sourceRoot>src/main/java-templates/</sourceRoot>
+ </sourceRoots>
+ <resourceRoots>
+ <resourceRoot>src/main/javascript/</resourceRoot>
+ </resourceRoots>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>adf.renderkit.fulltests</name>
+ <value>lenient</value>
+ </property>
+ <property>
+ <name>adf.renderkit.scripts</name>
+
<value>${project.basedir}/src/test/resources/org/apache/myfaces/adfinternal/renderkit/testScripts/</value>
+ </property>
+ <property>
+ <name>adf.renderkit.golden</name>
+
<value>${project.basedir}/src/test/resources/org/apache/myfaces/adfinternal/renderkit/golden/</value>
+ </property>
+ <property>
+ <name>adf.renderkit.failures</name>
+ <value>${project.basedir}/target/test-failures/</value>
+ </property>
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ <includes implementation="java.util.ArrayList" >
+ <include implementation="java.lang.String">**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.adfbuild</groupId>
+ <artifactId>maven-mock-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-mock-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.adfbuild</groupId>
+ <artifactId>maven-faces-plugin</artifactId>
+ <configuration>
+ <taglibs>
+ <af>http://myfaces.apache.org/adf/faces</af>
+ <afh>http://myfaces.apache.org/adf/faces/html</afh>
+ </taglibs>
+
<faceletHandlerClass>org.apache.myfaces.adfinternal.facelets.AdfComponentHandler</faceletHandlerClass>
+ <typePrefix>org.apache</typePrefix>
+ <packageContains>org.apache</packageContains>
+ <force>true</force>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-faces-config</goal>
+ <goal>generate-jsp-taglibs</goal>
+ <goal>generate-facelets-taglibs</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.adfbuild</groupId>
+ <artifactId>maven-i18n-plugin</artifactId>
+ <configuration>
+ <force>true</force>
+ <targetPath>META-INF/adf/jsLibs/resources</targetPath>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-locale-elements</goal>
+ <goal>generate-javascript-locales</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.adfbuild</groupId>
+ <artifactId>maven-javascript-plugin</artifactId>
+ <configuration>
+ <sourcePath>META-INF/adf/jsLibs</sourcePath>
+ <targetPath>META-INF/adf/jsLibsDebug</targetPath>
+ <optimizeTargetPath>META-INF/adf/jsLibs</optimizeTargetPath>
+ <force>true</force>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>reduce-javascript</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.adfbuild</groupId>
+ <artifactId>maven-xrts-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ <goal>generate-test-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
<dependency>
<groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.adf</groupId>
- <artifactId>adf-faces-build</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.adf</groupId>
- <artifactId>adf-faces-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
-
- <!-- "test" scope dependencies -->
- <dependency>
- <groupId>org.apache.myfaces.adf</groupId>
- <artifactId>adf-faces-api</artifactId>
- <version>${project.version}</version>
- <classifier>mock</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-jdk1.4</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>mockmaker</groupId>
- <artifactId>mmmockobjects</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-mock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.6</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </dependency>
-
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
+ <dependency>
+ <groupId>org.apache.myfaces.adf</groupId>
+ <artifactId>adf-faces-build</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.adf</groupId>
+ <artifactId>adf-faces-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+
+ <!-- "test" scope dependencies -->
+ <dependency>
+ <groupId>org.apache.myfaces.adf</groupId>
+ <artifactId>adf-faces-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>mock</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-jdk1.4</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>mockmaker</groupId>
+ <artifactId>mmmockobjects</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.6</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </dependency>
+
+<!--
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+-->
+
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Modified: incubator/adffaces/trunk/adf-faces/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/pom.xml?rev=409774&r1=409773&r2=409774&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/pom.xml (original)
+++ incubator/adffaces/trunk/adf-faces/pom.xml Fri May 26 16:10:31 2006
@@ -17,18 +17,19 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <organization>
- <name>Apache ADF Faces Incubator</name>
- </organization>
-
- <name>ADF Faces Apache</name>
- <description>ADF Faces Apache Incubator</description>
<groupId>org.apache.myfaces.adf</groupId>
<artifactId>adf-faces</artifactId>
- <version>11-m7-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>ADF Faces Apache</name>
+ <version>incubator-m1-SNAPSHOT</version>
+ <description>ADF Faces Apache Incubator</description>
+ <issueManagement>
+ <system>Apache JIRA</system>
+ <url>http://issues.apache.org/jira/browse/ADFFACES</url>
+ </issueManagement>
+
<ciManagement>
<system>continuum</system>
<notifiers>
@@ -43,27 +44,45 @@
</notifiers>
</ciManagement>
+ <inceptionYear>2001</inceptionYear>
+
+ <mailingLists>
+ <mailingList>
+ <name>ADF Faces Incubator Users</name>
+ <post>[EMAIL PROTECTED]</post>
+ </mailingList>
+ <mailingList>
+ <name>ADF Faces Incubator Developers</name>
+ <post>[email protected]</post>
+ </mailingList>
+ <mailingList>
+ <name>ADF Faces Incubator issues</name>
+ <post>[email protected]</post>
+ </mailingList>
+ </mailingLists>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+
+
<scm>
<connection>
scm:svn:http://svn.apache.org/repos/asf/incubator/adffaces/trunk/adf-faces/
</connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/incubator/adffaces/trunk/adf-faces/
+ </developerConnection>
</scm>
-<!-- I'm not having any luck getting checkstyle to actually
- pick up the checkstyle.xml from inside adf-faces-build,
- so let's just turn this off for now.
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>adf-faces/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
--->
+ <organization>
+ <name>Apache ADF Faces Incubator</name>
+ </organization>
+
+
<build>
<pluginManagement>
@@ -158,6 +177,42 @@
<module>adf-faces-demo</module>
</modules>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>java-net</id>
+ <name>java.net repository</name>
+ <!-- NOTE: this URL must be HTTPS. However, unfortunately this
+ doesn't work behind a firewall. See:
+ http://jira.codehaus.org/browse/WAGONHTTP-6
+ ... for the source of that problem. Users behind firewalls
+ will have to manually download the files from this repository
+ and transfer them to their local repository.
+ -->
+ <url>https://maven-repository.dev.java.net/nonav/repository/</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
+
+<!-- I'm not having any luck getting checkstyle to actually
+ pick up the checkstyle.xml from inside adf-faces-build,
+ so let's just turn this off for now.
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>adf-faces/checkstyle.xml</configLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+-->
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -216,9 +271,10 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <!-- Use 2.1 so we have access to the EL APIs -->
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
@@ -226,22 +282,22 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>1.1.4</version>
+ <version>1.1.6</version>
</dependency>
+<!--
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0alpha</version>
</dependency>
-
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-ri</artifactId>
<version>1.0alpha</version>
</dependency>
-
+-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
