Skip to content
This repository was archived by the owner on Jul 22, 2020. It is now read-only.

Commit 6f6849d

Browse files
committed
Updated Travis build matrix to run integration test only on JDK 1.8
1 parent f95d4bd commit 6f6849d

File tree

4 files changed

+27
-11
lines changed

4 files changed

+27
-11
lines changed

.travis.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
language: java
2-
jdk:
3-
- openjdk7
4-
- oraclejdk7
5-
- oraclejdk8
62
env:
73
global:
84
- secure: "q+fkZBCN8ET5RrgaG4RGt1t1aSjsL6LN6BSt/Yvx2H5a2DtGmNA/A/gcAEnKlyv0BgXAcrzAzCCIgXvt2P4om5DcBU/yOTEga+/46r7+iVnmfQGcW81NHQA1rlIYvuBqXGDo9yo1B3eRr8vTj3fzEE3K8jjchHQUlgRdUum3DNKeZwACodV2fpj9ZslyoX4HRpWg3ctqvB0R7/4NwtXnXrOw8hHDF8OrQK3JiCxAoZnA16/Fwc0d8yN4Or10N1XiWbNdLFek+Y3nVTdGRUZjsqp/VhvgIwzmtnuiCeF2iuMCpYy6C9SAFG4Tyn5VLmFzEqXMrbxuMBp8c2GCcFQb0jxEiWKsT0Nufqc1pYlUSl2S12D8yokEo5H9/NcH/2p2b5zqzcWzFe1c5YEn0Ktj8d/01GDYfkuPyoQ0UmjC6h68iozk5mogPT0t7eUf7i0wll72v4kGB2xOK3VY+53LA7DS+f/0HeDi47tXgPkA8bg2dGZTTD+JHXcqyMTt9Ey96a42cauLQ4PGfujc6fPJUw31sxx2IURj1USdxut/a5PEa+LL+xGrKKgOW4GMUwjrYMnLf9e3Y/uR4EoHmYYwsoNtD0g6bEt7C83JZrQd5Sp3mN6gEU0sjp2/iBPqS+tB3z6eRUur8ctnk6EC82WHmRwZHeoKLVOktAPCKumBnWY="
95
- secure: "04af3/9b67O5xd1U8GDhCqRQedHM3RP5HokdsOwAe8vN3EyyyKWXQafBkKsPvmDh5Uu/CYQppOYS4pQxB9ikweTfj34DbyyxpqJmjYE4KFvdQuFd0msyXhLCg6xfvS4KO6zjUQ8/c3rNQap4hx/icQ50/NES4rkUkxIZ/VKQ4jPXcBzPegEC6Le50Vw2tR8FT4erdNuABnGf1WnWGUUa3i6xdQQPyw8kdTIun08HxE6M9F+JJRH8jH3b7KizQhGdACAk4fnCOmFSgu7pm6ACXRJYqAfg055i5mr77yZXfeUIcIY3l45uY1uR8sxEbLUE/KwwlLGLVZWDI4xU6JIGisbrmMce+vz6YKUT9gHF3iAEJ5e4N18nJcRyHVrqcuRzv5Py0rFPZ70dr7aW/tk0JrTz6+FZ4FNIOdvIQe4qWy2TVns0EkERdtYGTdsigWfa/sKF/P5+/2foUOlnR06p55NHpIjaHRKy/XFVV1gyURUlRUGExVoIMX21bAMxGYMFMH7LfddRsly028lXwibRMkQGBeyVRYKQmqJvN3mTPbuAWmZZdaVpqn1jkgETlT6/qz43zv9y8jAOzZ22SeHEXe3NiexChqkAJWIH3cBYshMhy8H1fmYAIVYHvI+BPsbi+qDYSnAlAUDqoLWXPAvWUX89dAIXYRNcKplzpFsjWvM="
10-
script:
11-
- mvn test
12-
- mvn package && mvn test -Dtest=com.builtamont.cassandra.migration.CassandraMigrationIT
6+
matrix:
7+
include:
8+
- jdk: openjdk7
9+
script: mvn test
10+
- jdk: oraclejdk7
11+
script: mvn test
12+
- jdk: oraclejdk8
13+
script:
14+
- mvn test
15+
- mvn verify
1316
deploy:
1417
provider: script
1518
script: ./scripts/deploy.sh

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Import this library as a dependency (Maven example):
2525
</dependency>
2626
```
2727

28+
***NOTE:** Integration test in Travis CI is only run against Oracle JDK 1.8, due to embedded Cassandra's dependencies on JDK 1.8*
29+
2830
### Migration version table
2931

3032
``` shell
@@ -164,9 +166,9 @@ There are various reasons why Kotlin was chosen, but three main reasons are:
164166
165167
Run `mvn test` to run the unit tests.
166168
167-
Run `mvn package` to package the jars, then `mvn test -Dtest=com.builtamont.cassandra.migration.CassandraMigrationIT` to run the integration tests.
169+
Run `mvn verify` to run the integration tests.
168170
169-
***NOTE:** The integration test might complain about some missing SIGAR binaries in OSX / macOS with Java 8, this can be safely ignored. If you wish, you can download the missing binaries and set `java.library.path` parameter to point to the containing folder (e.g. `mvn test -Dtest=com.builtamont.cassandra.migration.CassandraMigrationIT -Djava.library.path=lib` where `lib` is the `/lib` folder relative to the project root).*
171+
***NOTE:** The integration test might complain about some missing SIGAR binaries, this can be safely ignored. If you wish, you can download the missing binaries and set `java.library.path` parameter to point to the containing folder (e.g. `mvn verify -Djava.library.path=lib` where `lib` is the `/lib` folder relative to the project root).*
170172
171173
## Contributing
172174

pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,21 @@
191191
</execution>
192192
</executions>
193193
</plugin>
194+
<plugin>
195+
<groupId>org.apache.maven.plugins</groupId>
196+
<artifactId>maven-surefire-plugin</artifactId>
197+
<version>2.19.1</version>
198+
<!-- NOTE: Configuration as per http://stackoverflow.com/a/33757854 -->
199+
<configuration>
200+
<forkCount>3</forkCount>
201+
<reuseForks>true</reuseForks>
202+
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
203+
</configuration>
204+
</plugin>
194205
<plugin>
195206
<groupId>org.apache.maven.plugins</groupId>
196207
<artifactId>maven-failsafe-plugin</artifactId>
197-
<version>2.19</version>
208+
<version>2.19.1</version>
198209
<executions>
199210
<execution>
200211
<goals>

src/main/java/com/builtamont/cassandra/migration/internal/util/VersionPrinter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public static void printVersion(ClassLoader classLoader) {
3636
}
3737
printed = true;
3838
String version = new ClassPathResource("version.txt", classLoader).loadAsString("UTF-8");
39-
LOG.info("Cassandra Migration " + version + " by Contrast Security");
39+
LOG.info("Cassandra Migration " + version);
4040
}
4141
}

0 commit comments

Comments
 (0)