Permalink
Browse files

Merge pull request #26 from thangamfrm/master

Fixed build issue by updating Tapestry version and its dependency (kaptcha)
  • Loading branch information...
2 parents b8b4caa + 9e21445 commit df73a5d673ff443026879743dca8dbf7def97fe1 @ccordenier committed Jan 2, 2013
Showing with 12 additions and 13 deletions.
  1. +10 −11 pom.xml
  2. +2 −2 src/main/webapp/Signup.tml
View
21 pom.xml
@@ -40,7 +40,11 @@
<artifactId>tapestry-hibernate</artifactId>
<version>${tapestry-release-version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-kaptcha</artifactId>
+ <version>${tapestry-release-version}</version>
+ </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -84,15 +88,6 @@
<scope>provided</scope>
</dependency>
- <!--
- Tapx Core : include kaptcha component
- -->
- <dependency>
- <groupId>com.howardlewisship</groupId>
- <artifactId>tapx-core</artifactId>
- <version>${tapx-release-version}</version>
- </dependency>
-
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
@@ -199,11 +194,15 @@
<id>tapestry360-snapshot</id>
<url>http://tapestry.formos.com/maven-snapshot-repository</url>
</repository>
+ <repository>
+ <id>jahia</id>
+ <url>https://www.escidoc.org/artifactory/maven.jahia.org/</url>
+ </repository>
</repositories>
<properties>
<tapx-release-version>1.1-SNAPSHOT</tapx-release-version>
- <tapestry-release-version>5.2.4</tapestry-release-version>
+ <tapestry-release-version>5.3.6</tapestry-release-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
@@ -49,13 +49,13 @@
<tr>
<th><label t:type="label" t:for="fcaptcha">Enter text displayed below</label></th>
<td>
- <t:tapx.kaptchafield image="kaptcha" t:id="fcaptcha" />
+ <t:kaptchafield image="kaptcha" t:id="fcaptcha" />
</td>
</tr>
<tr>
<th></th>
<td>
- <t:tapx.kaptchaimage t:id="kaptcha" style="float:left;"/>
+ <t:kaptchaimage t:id="kaptcha" style="float:left;"/>
</td>
</tr>
</table>

0 comments on commit df73a5d

Please sign in to comment.