Skip to content

Commit 61d21db

Browse files
aslakhellesoyaslakhellesoy
committed
Updated library versions
1 parent 2fe7fba commit 61d21db

File tree

5 files changed

+118
-39
lines changed

5 files changed

+118
-39
lines changed

‎core/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,11 @@
6666
<dependency>
6767
<groupId>org.webbitserver</groupId>
6868
<artifactId>webbit</artifactId>
69-
<version>0.4.14</version>
7069
<scope>test</scope>
7170
</dependency>
7271
<dependency>
7372
<groupId>org.webbitserver</groupId>
7473
<artifactId>webbit-rest</artifactId>
75-
<version>0.2.0</version>
7674
<scope>test</scope>
7775
</dependency>
7876
</dependencies>

‎examples/java-webbit-websockets-selenium/src/main/java/cucumber/examples/java/websockets/TemperatureServer.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
import org.webbitserver.handler.EmbeddedResourceHandler;
88

99
import java.io.IOException;
10+
import java.net.InetSocketAddress;
11+
import java.net.URI;
12+
import java.util.concurrent.Executors;
1013

1114
public class TemperatureServer {
1215
private final WebServer webServer;
1316

1417
public TemperatureServer(int port) {
15-
webServer = WebServers.createWebServer(port);
18+
webServer = WebServers.createWebServer(Executors.newSingleThreadExecutor(), new InetSocketAddress(port), URI.create("http://localhost:" + port));
1619
webServer.add(new EmbeddedResourceHandler("web"));
1720
webServer.add("/temperature", new BaseWebSocketHandler() {
1821
@Override

‎examples/spring-txn/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34

45
<parent>

‎jython/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@
9494
import groovy.text.SimpleTemplateEngine
9595
import gherkin.I18n
9696
97+
def unsupported = ["ar", "bg", "fa", "he", "hi", "is", "ja", "ko", "pl", "ru", "sr_cyrl", "tl", "tt", "uk", "uz", "zh_cn", "zh_tw"]
9798
def engine = new SimpleTemplateEngine()
98-
9999
def templateSource = new File(project.baseDir, "src${File.separator}main${File.separator}code_generator${File.separator}I18n.jython.txt").getText()
100100
101101
I18n.all.each { i18n ->
102-
if (!["ar", "bg", "fa", "he", "is", "ja", "ko", "pl", "ru", "sr_cyrl", "uk", "uz", "zh_cn", "zh_tw"].contains(i18n.underscoredIsoCode)) {
102+
if (!unsupported.contains(i18n.underscoredIsoCode)) {
103103
def binding = ["i18n":i18n]
104104
template = engine.createTemplate(templateSource).make(binding)
105105
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")

‎pom.xml

+110-33
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<groupId>info.cukes</groupId>
45
<artifactId>cucumber-jvm</artifactId>
@@ -17,12 +18,34 @@
1718
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1819
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1920
<outputDirectory>${project.build.directory}</outputDirectory>
20-
<gherkin.version>2.11.5</gherkin.version>
21-
<groovy.version>2.0.5</groovy.version>
22-
<spring.version>3.2.0.RELEASE</spring.version>
23-
<spring.data.version>1.1.0.RELEASE</spring.data.version>
24-
<hibernate.version>4.1.4.Final</hibernate.version>
25-
<hsqldb.version>2.2.8</hsqldb.version>
21+
<gherkin.version>2.11.6</gherkin.version>
22+
<groovy.version>2.1.0</groovy.version>
23+
<spring.version>3.2.1.RELEASE</spring.version>
24+
<spring.data.version>1.2.0.RELEASE</spring.data.version>
25+
<hibernate.version>4.1.9.Final</hibernate.version>
26+
<hsqldb.version>2.2.9</hsqldb.version>
27+
<guice.version>3.0</guice.version>
28+
<scala.version>2.10.0</scala.version>
29+
<clojure.version>1.5.0-RC4</clojure.version>
30+
<rhino.version>1.7R4</rhino.version>
31+
<ioke.version>P-0.4.0-p11</ioke.version>
32+
<jsoup.version>1.7.2</jsoup.version>
33+
<junit.version>4.11</junit.version>
34+
<jython.version>2.5.3</jython.version>
35+
<mockito.version>1.9.5</mockito.version>
36+
<selenium.version>2.29.0</selenium.version>
37+
<webbit.version>0.4.14</webbit.version>
38+
<webbit-rest.version>0.2.0</webbit-rest.version>
39+
<jruby.version>1.7.2</jruby.version>
40+
<weld-se.version>2.0.0.Beta2</weld-se.version>
41+
<cdi-api.version>1.1-PRD</cdi-api.version>
42+
<openejb-core.version>4.5.1</openejb-core.version>
43+
<cobertura.version>1.9.4.1</cobertura.version>
44+
<dbunit.version>2.4.9</dbunit.version>
45+
<log4j.version>1.2.17</log4j.version>
46+
<slf4j.version>1.7.1</slf4j.version>
47+
<freemarker.version>2.3.19</freemarker.version>
48+
<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
2649
</properties>
2750
<licenses>
2851
<license>
@@ -35,8 +58,7 @@
3558
<connection>scm:git:git://github.com/cucumber/cucumber-jvm.git</connection>
3659
<developerConnection>scm:git:[email protected]:cucumber/cucumber-jvm.git</developerConnection>
3760
<url>git://github.com/cucumber/cucumber-jvm.git</url>
38-
<tag>HEAD</tag>
39-
</scm>
61+
</scm>
4062

4163
<dependencyManagement>
4264
<dependencies>
@@ -137,6 +159,11 @@
137159
<artifactId>spring-orm</artifactId>
138160
<version>${spring.version}</version>
139161
</dependency>
162+
<dependency>
163+
<groupId>org.springframework</groupId>
164+
<artifactId>spring-web</artifactId>
165+
<version>${spring.version}</version>
166+
</dependency>
140167
<dependency>
141168
<groupId>org.springframework.data</groupId>
142169
<artifactId>spring-data-jpa</artifactId>
@@ -149,6 +176,27 @@
149176
</exclusion>
150177
</exclusions>
151178
</dependency>
179+
<dependency>
180+
<groupId>org.springframework</groupId>
181+
<artifactId>spring-webmvc</artifactId>
182+
<version>${spring.version}</version>
183+
</dependency>
184+
<dependency>
185+
<groupId>org.springframework</groupId>
186+
<artifactId>spring-test</artifactId>
187+
<version>${spring.version}</version>
188+
</dependency>
189+
<dependency>
190+
<groupId>org.springframework</groupId>
191+
<artifactId>spring-jdbc</artifactId>
192+
<version>${spring.version}</version>
193+
</dependency>
194+
195+
<dependency>
196+
<groupId>org.dbunit</groupId>
197+
<artifactId>dbunit</artifactId>
198+
<version>${dbunit.version}</version>
199+
</dependency>
152200

153201
<dependency>
154202
<groupId>org.hibernate</groupId>
@@ -159,107 +207,137 @@
159207
<groupId>org.hsqldb</groupId>
160208
<artifactId>hsqldb</artifactId>
161209
<version>${hsqldb.version}</version>
162-
<scope>runtime</scope>
210+
</dependency>
211+
212+
<dependency>
213+
<groupId>org.freemarker</groupId>
214+
<artifactId>freemarker</artifactId>
215+
<version>${freemarker.version}</version>
216+
</dependency>
217+
218+
<dependency>
219+
<groupId>org.slf4j</groupId>
220+
<artifactId>jcl-over-slf4j</artifactId>
221+
<version>${slf4j.version}</version>
222+
</dependency>
223+
<dependency>
224+
<groupId>org.slf4j</groupId>
225+
<artifactId>slf4j-log4j12</artifactId>
226+
<version>${slf4j.version}</version>
227+
</dependency>
228+
<dependency>
229+
<groupId>log4j</groupId>
230+
<artifactId>log4j</artifactId>
231+
<version>${log4j.version}</version>
232+
</dependency>
233+
234+
<dependency>
235+
<groupId>javax.servlet</groupId>
236+
<artifactId>javax.servlet-api</artifactId>
237+
<version>${javax.servlet-api.version}</version>
163238
</dependency>
164239

165240
<dependency>
166241
<groupId>com.google.inject</groupId>
167242
<artifactId>guice</artifactId>
168-
<version>3.0</version>
243+
<version>${guice.version}</version>
169244
</dependency>
170245
<dependency>
171246
<groupId>org.scala-lang</groupId>
172247
<artifactId>scala-library</artifactId>
173-
<version>2.9.2</version>
248+
<version>${scala.version}</version>
174249
</dependency>
175250
<dependency>
176251
<groupId>org.scala-lang</groupId>
177252
<artifactId>scala-compiler</artifactId>
178-
<version>2.9.2</version>
253+
<version>${scala.version}</version>
179254
</dependency>
180255
<dependency>
181256
<groupId>org.clojure</groupId>
182257
<artifactId>clojure</artifactId>
183258
<!-- Remember to bounce version in examples/clojure_cukes/project.clj as well -->
184-
<version>1.5.0-beta1</version>
259+
<version>${clojure.version}</version>
185260
</dependency>
186261
<dependency>
187262
<groupId>org.mozilla</groupId>
188263
<artifactId>rhino</artifactId>
189-
<version>1.7R4</version>
264+
<version>${rhino.version}</version>
190265
</dependency>
191266
<dependency>
192267
<groupId>org.ioke</groupId>
193268
<artifactId>ioke-lang</artifactId>
194-
<version>P-0.4.0-p11</version>
269+
<version>${ioke.version}</version>
195270
</dependency>
196271
<dependency>
197272
<groupId>org.ioke</groupId>
198273
<artifactId>ioke-lang-lib</artifactId>
199-
<version>P-0.4.0-p11</version>
274+
<version>${ioke.version}</version>
200275
</dependency>
201276
<dependency>
202277
<groupId>junit</groupId>
203278
<artifactId>junit</artifactId>
204-
<version>4.11</version>
279+
<version>${junit.version}</version>
205280
</dependency>
206281
<dependency>
207282
<groupId>org.python</groupId>
208283
<artifactId>jython-standalone</artifactId>
209-
<version>2.5.3</version>
284+
<version>${jython.version}</version>
210285
</dependency>
211286
<dependency>
212287
<groupId>org.mockito</groupId>
213288
<artifactId>mockito-all</artifactId>
214-
<version>1.9.5</version>
215-
<scope>test</scope>
289+
<version>${mockito.version}</version>
216290
</dependency>
217291
<dependency>
218292
<groupId>org.jsoup</groupId>
219293
<artifactId>jsoup</artifactId>
220-
<version>1.7.1</version>
221-
<scope>test</scope>
294+
<version>${jsoup.version}</version>
222295
</dependency>
223296
<dependency>
224297
<groupId>org.seleniumhq.selenium</groupId>
225298
<artifactId>selenium-chrome-driver</artifactId>
226-
<version>2.25.0</version>
299+
<version>${selenium.version}</version>
227300
</dependency>
228301
<dependency>
229302
<groupId>org.seleniumhq.selenium</groupId>
230303
<artifactId>selenium-server</artifactId>
231-
<version>2.25.0</version>
304+
<version>${selenium.version}</version>
232305
</dependency>
233306
<dependency>
234307
<groupId>org.webbitserver</groupId>
235308
<artifactId>webbit</artifactId>
236-
<version>0.4.14</version>
309+
<version>${webbit.version}</version>
310+
</dependency>
311+
<dependency>
312+
<groupId>org.webbitserver</groupId>
313+
<artifactId>webbit-rest</artifactId>
314+
<version>${webbit-rest.version}</version>
237315
</dependency>
238316
<dependency>
239317
<groupId>org.jruby</groupId>
240318
<artifactId>jruby-complete</artifactId>
241-
<version>1.7.0</version>
319+
<version>${jruby.version}</version>
242320
</dependency>
243321
<dependency>
244322
<groupId>org.jboss.weld.se</groupId>
245323
<artifactId>weld-se</artifactId>
246-
<version>2.0.0.Alpha3</version>
324+
<version>${weld-se.version}</version>
247325
</dependency>
248326
<dependency>
249327
<groupId>javax.enterprise</groupId>
250328
<artifactId>cdi-api</artifactId>
251-
<version>1.1.EDR1.2</version>
329+
<version>${cdi-api.version}</version>
252330
</dependency>
253331
<dependency>
254332
<groupId>org.apache.openejb</groupId>
255333
<artifactId>openejb-core</artifactId>
256-
<version>4.5.0</version>
334+
<version>${openejb-core.version}</version>
257335
</dependency>
258336

259337
<dependency>
260338
<groupId>net.sourceforge.cobertura</groupId>
261339
<artifactId>cobertura</artifactId>
262-
<version>1.9.4.1</version>
340+
<version>${cobertura.version}</version>
263341
</dependency>
264342
</dependencies>
265343
</dependencyManagement>
@@ -308,7 +386,7 @@
308386
<profile>
309387
<id>examples</id>
310388
<modules>
311-
<module>examples/spring-txn</module>
389+
<!--<module>examples/spring-txn</module>-->
312390
<module>examples/java-calculator</module>
313391
<module>examples/groovy-calculator</module>
314392
<module>examples/scala-calculator</module>
@@ -549,4 +627,3 @@
549627
</extensions>
550628
</build>
551629
</project>
552-

0 commit comments

Comments
 (0)