Permalink
Browse files

Updated library versions

  • Loading branch information...
1 parent e03b64b commit c87e2e2841779d359d346d4eb7b1ded39e754bd5 @aslakhellesoy aslakhellesoy committed Jan 30, 2013
View
2 core/pom.xml
@@ -66,13 +66,11 @@
<dependency>
<groupId>org.webbitserver</groupId>
<artifactId>webbit</artifactId>
- <version>0.4.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.webbitserver</groupId>
<artifactId>webbit-rest</artifactId>
- <version>0.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
View
5 ...ebsockets-selenium/src/main/java/cucumber/examples/java/websockets/TemperatureServer.java
@@ -7,12 +7,15 @@
import org.webbitserver.handler.EmbeddedResourceHandler;
import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.util.concurrent.Executors;
public class TemperatureServer {
private final WebServer webServer;
public TemperatureServer(int port) {
- webServer = WebServers.createWebServer(port);
+ webServer = WebServers.createWebServer(Executors.newSingleThreadExecutor(), new InetSocketAddress(port), URI.create("http://localhost:" + port));
webServer.add(new EmbeddedResourceHandler("web"));
webServer.add("/temperature", new BaseWebSocketHandler() {
@Override
View
25 examples/spring-txn/pom.xml
@@ -12,28 +12,16 @@
<packaging>war</packaging>
<name>Examples: Spring Transactions</name>
- <properties>
- <dbunit.version>2.4.9</dbunit.version>
- <freemarker.version>2.3.19</freemarker.version>
- <hibernate.version>4.1.4.Final</hibernate.version>
- <hsqldb.version>2.2.8</hsqldb.version>
- <log4j.version>1.2.17</log4j.version>
- <slf4j.version>1.7.1</slf4j.version>
- <spring.data.version>1.1.0.RELEASE</spring.data.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
</dependency>
<dependency>
@@ -42,10 +30,18 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
</dependency>
<dependency>
@@ -73,17 +69,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
</dependency>
<dependency>
@@ -109,13 +102,11 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>${dbunit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
View
4 jython/pom.xml
@@ -94,12 +94,12 @@
import groovy.text.SimpleTemplateEngine
import gherkin.I18n
+def unsupported = ["ar", "bg", "fa", "he", "hi", "is", "ja", "ko", "pl", "ru", "sr_cyrl", "tl", "tt", "uk", "uz", "zh_cn", "zh_tw"]
def engine = new SimpleTemplateEngine()
-
def templateSource = new File(project.baseDir, "src${File.separator}main${File.separator}code_generator${File.separator}I18n.jython.txt").getText()
I18n.all.each { i18n ->
- if (!["ar", "bg", "fa", "he", "is", "ja", "ko", "pl", "ru", "sr_cyrl", "uk", "uz", "zh_cn", "zh_tw"].contains(i18n.underscoredIsoCode)) {
+ if (!unsupported.contains(i18n.underscoredIsoCode)) {
def binding = ["i18n":i18n]
template = engine.createTemplate(templateSource).make(binding)
file = new File(project.baseDir, "target${File.separator}generated-resources${File.separator}i18n${File.separator}cucumber${File.separator}runtime${File.separator}jython${File.separator}i18n${File.separator}${i18n.underscoredIsoCode.toUpperCase()}.py")
View
137 pom.xml
@@ -1,4 +1,5 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
@@ -17,12 +18,34 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<outputDirectory>${project.build.directory}</outputDirectory>
- <gherkin.version>2.11.5</gherkin.version>
- <groovy.version>2.0.5</groovy.version>
- <spring.version>3.2.0.RELEASE</spring.version>
- <spring.data.version>1.1.0.RELEASE</spring.data.version>
- <hibernate.version>4.1.4.Final</hibernate.version>
- <hsqldb.version>2.2.8</hsqldb.version>
+ <gherkin.version>2.11.6</gherkin.version>
+ <groovy.version>2.1.0</groovy.version>
+ <spring.version>3.2.1.RELEASE</spring.version>
+ <spring.data.version>1.2.0.RELEASE</spring.data.version>
+ <hibernate.version>4.1.9.Final</hibernate.version>
+ <hsqldb.version>2.2.9</hsqldb.version>
+ <guice.version>3.0</guice.version>
+ <scala.version>2.10.0</scala.version>
+ <clojure.version>1.5.0-RC4</clojure.version>
+ <rhino.version>1.7R4</rhino.version>
+ <ioke.version>P-0.4.0-p11</ioke.version>
+ <jsoup.version>1.7.2</jsoup.version>
+ <junit.version>4.11</junit.version>
+ <jython.version>2.5.3</jython.version>
+ <mockito.version>1.9.5</mockito.version>
+ <selenium.version>2.29.0</selenium.version>
+ <webbit.version>0.4.14</webbit.version>
+ <webbit-rest.version>0.2.0</webbit-rest.version>
+ <jruby.version>1.7.2</jruby.version>
+ <weld-se.version>2.0.0.Beta2</weld-se.version>
+ <cdi-api.version>1.1-PRD</cdi-api.version>
+ <openejb-core.version>4.5.1</openejb-core.version>
+ <cobertura.version>1.9.4.1</cobertura.version>
+ <dbunit.version>2.4.9</dbunit.version>
+ <log4j.version>1.2.17</log4j.version>
+ <slf4j.version>1.7.1</slf4j.version>
+ <freemarker.version>2.3.19</freemarker.version>
+ <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
</properties>
<licenses>
<license>
@@ -35,8 +58,7 @@
<connection>scm:git:git://github.com/cucumber/cucumber-jvm.git</connection>
<developerConnection>scm:git:git@github.com:cucumber/cucumber-jvm.git</developerConnection>
<url>git://github.com/cucumber/cucumber-jvm.git</url>
- <tag>HEAD</tag>
- </scm>
+ </scm>
<dependencyManagement>
<dependencies>
@@ -138,6 +160,11 @@
<version>${spring.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>${spring.data.version}</version>
@@ -154,6 +181,22 @@
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>${dbunit.version}</version>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -164,107 +207,137 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
- <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet-api.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>3.0</version>
+ <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.9.2</version>
+ <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>2.9.2</version>
+ <version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<!-- Remember to bounce version in examples/clojure_cukes/project.clj as well -->
- <version>1.5.0-beta1</version>
+ <version>${clojure.version}</version>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
- <version>1.7R4</version>
+ <version>${rhino.version}</version>
</dependency>
<dependency>
<groupId>org.ioke</groupId>
<artifactId>ioke-lang</artifactId>
- <version>P-0.4.0-p11</version>
+ <version>${ioke.version}</version>
</dependency>
<dependency>
<groupId>org.ioke</groupId>
<artifactId>ioke-lang-lib</artifactId>
- <version>P-0.4.0-p11</version>
+ <version>${ioke.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
- <version>2.5.3</version>
+ <version>${jython.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
+ <version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.7.1</version>
- <scope>test</scope>
+ <version>${jsoup.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
- <version>2.25.0</version>
+ <version>${selenium.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
- <version>2.25.0</version>
+ <version>${selenium.version}</version>
</dependency>
<dependency>
<groupId>org.webbitserver</groupId>
<artifactId>webbit</artifactId>
- <version>0.4.14</version>
+ <version>${webbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webbitserver</groupId>
+ <artifactId>webbit-rest</artifactId>
+ <version>${webbit-rest.version}</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>1.7.0</version>
+ <version>${jruby.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se</artifactId>
- <version>2.0.0.Alpha3</version>
+ <version>${weld-se.version}</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.1.EDR1.2</version>
+ <version>${cdi-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>4.5.0</version>
+ <version>${openejb-core.version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura</artifactId>
- <version>1.9.4.1</version>
+ <version>${cobertura.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -313,7 +386,7 @@
<profile>
<id>examples</id>
<modules>
- <module>examples/spring-txn</module>
+ <!--<module>examples/spring-txn</module>-->
<module>examples/java-calculator</module>
<module>examples/groovy-calculator</module>
<module>examples/scala-calculator</module>

0 comments on commit c87e2e2

Please sign in to comment.