Skip to content
This repository was archived by the owner on Dec 15, 2018. It is now read-only.

Commit df99094

Browse files
Gregor Tudanchkal
authored andcommitted
create a testsuite module and migrate the thymeleaf example to it
1 parent 3bb393c commit df99094

File tree

17 files changed

+337
-192
lines changed

17 files changed

+337
-192
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
language: java
22
sudo: required
33
jdk: oraclejdk8
4+
5+
services:
6+
- docker
7+
48
jobs:
59
include:
610
- stage: build
@@ -11,6 +15,10 @@ jobs:
1115
- stage: test
1216
env: TYPE=glassfish-bundled
1317
script: .travis/tests.sh ${TYPE}
18+
- stage: test
19+
env: TYPE=testsuite-wildfly
20+
before_script: .travis/docker-wildfly.sh
21+
script: mvn -P${TYPE} --projects testsuite clean verify
1422
- stage: test
1523
env: TYPE=tck-glassfish
1624
script: .travis/tests.sh ${TYPE}

.travis/docker-wildfly.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env sh
2+
3+
set -eu
4+
5+
docker pull jboss/wildfly:14.0.1.Final
6+
docker run --name=wildfly -d -p 8080:8080 -p 9990:9990 -it jboss/wildfly /opt/jboss/wildfly/bin/standalone.sh -bmanagement 0.0.0.0 -b 0.0.0.0
7+
docker exec wildfly /opt/jboss/wildfly/bin/add-user.sh admin wildfly

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<dependency>
119119
<groupId>javax</groupId>
120120
<artifactId>javaee-web-api</artifactId>
121-
<version>8.0</version>
121+
<version>${javaee.version}</version>
122122
<scope>provided</scope>
123123
</dependency>
124124
<dependency>

examples/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
<module>requestDispatcher</module>
7979
<module>returns</module>
8080
<module>stringtemplate</module>
81-
<module>thymeleaf</module>
8281
<module>validation</module>
8382
<module>validation-i18n</module>
8483
<module>velocity</module>

examples/thymeleaf/pom.xml

Lines changed: 0 additions & 40 deletions
This file was deleted.

examples/thymeleaf/src/main/webapp/index.html

Lines changed: 0 additions & 16 deletions
This file was deleted.

examples/thymeleaf/src/main/webapp/ozark.css

Lines changed: 0 additions & 78 deletions
This file was deleted.

examples/thymeleaf/src/test/java/org/mvcspec/ozark/test/thymeleaf/ThymeleafIT.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
<spec.version>1.0-pfd</spec.version>
4040
<jersey.version>2.26-b07</jersey.version>
41+
<javaee.version>8.0</javaee.version>
4142

4243
</properties>
4344

@@ -49,6 +50,7 @@
4950
<module>tck</module>
5051
<module>ext</module>
5152
<module>examples</module>
53+
<module>testsuite</module>
5254
</modules>
5355

5456
<licenses>

0 commit comments

Comments
 (0)