Skip to content

Commit 6f85c6b

Browse files
gscheibeldariuszkuc
authored andcommitted
Add JDK11 build step (ExpediaGroup#168)
* Add JDK11 build step * Switch to openjdk 8 instead of oracle jdk 8 * Switch default build to openjdks * Only activate the dokka plugin when the JDK8 is used
1 parent 516c25d commit 6f85c6b

File tree

2 files changed

+32
-16
lines changed

2 files changed

+32
-16
lines changed

.travis.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
dist: trusty
22

33
language: java
4-
jdk: oraclejdk8
4+
jdk:
5+
- openjdk8
6+
- openjdk11
57

68
cache:
79
directories:
@@ -23,15 +25,19 @@ deploy:
2325
on:
2426
repo: ExpediaDotCom/graphql-kotlin
2527
branch: master
26-
jdk: oraclejdk8
28+
jdk:
29+
- openjdk8
30+
- openjdk11
2731
-
2832
provider: script
2933
script: .travis/deploy.sh
3034
skip_cleanup: true
3135
on:
3236
repo: ExpediaDotCom/graphql-kotlin
3337
tags: true
34-
jdk: oraclejdk8
38+
jdk:
39+
- openjdk8
40+
- openjdk11
3541

3642
after_deploy:
3743
- .travis/update-version.sh

pom.xml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,19 +105,6 @@
105105
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
106106
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
107107
<plugins>
108-
<plugin>
109-
<groupId>org.jetbrains.dokka</groupId>
110-
<artifactId>dokka-maven-plugin</artifactId>
111-
<version>${dokka-maven-plugin.version}</version>
112-
<executions>
113-
<execution>
114-
<phase>prepare-package</phase>
115-
<goals>
116-
<goal>javadocJar</goal>
117-
</goals>
118-
</execution>
119-
</executions>
120-
</plugin>
121108
<plugin>
122109
<groupId>org.jetbrains.kotlin</groupId>
123110
<artifactId>kotlin-maven-plugin</artifactId>
@@ -410,5 +397,28 @@
410397
</plugins>
411398
</build>
412399
</profile>
400+
<profile>
401+
<id>jdk8</id>
402+
<activation>
403+
<jdk>1.8</jdk>
404+
</activation>
405+
<build>
406+
<plugins>
407+
<plugin>
408+
<groupId>org.jetbrains.dokka</groupId>
409+
<artifactId>dokka-maven-plugin</artifactId>
410+
<version>${dokka-maven-plugin.version}</version>
411+
<executions>
412+
<execution>
413+
<phase>prepare-package</phase>
414+
<goals>
415+
<goal>javadocJar</goal>
416+
</goals>
417+
</execution>
418+
</executions>
419+
</plugin>
420+
</plugins>
421+
</build>
422+
</profile>
413423
</profiles>
414424
</project>

0 commit comments

Comments
 (0)