Skip to content

Commit 85bf9b2

Browse files
committed
Update travis build configuration
1 parent 6522ce2 commit 85bf9b2

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ language: java
22
jdk:
33
- oraclejdk8
44
sudo: false
5-
script: mvn clean verify
5+
script:
6+
- ./travis-build.sh

pom.xml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

5-
<groupId>com.graphql-java</groupId>
6+
<groupId>com.graphql-java-kickstart</groupId>
67
<artifactId>graphql-java-tools</artifactId>
78
<version>5.3.0-SNAPSHOT</version>
89
<packaging>jar</packaging>
@@ -14,7 +15,7 @@
1415
<properties>
1516
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1617
<java.version>1.8</java.version>
17-
<kotlin.version>1.2.60</kotlin.version>
18+
<kotlin.version>1.2.71</kotlin.version>
1819
<jackson.version>2.9.6</jackson.version>
1920

2021
<!--This contends with dokka and creates two javadoc jars...-->
@@ -211,19 +212,6 @@
211212
</execution>
212213
</executions>
213214
</plugin>
214-
<plugin>
215-
<groupId>org.jetbrains.dokka</groupId>
216-
<artifactId>dokka-maven-plugin</artifactId>
217-
<version>0.9.14</version>
218-
<executions>
219-
<execution>
220-
<phase>package</phase>
221-
<goals>
222-
<goal>javadocJar</goal>
223-
</goals>
224-
</execution>
225-
</executions>
226-
</plugin>
227215
</plugins>
228216
</build>
229217
</profile>
@@ -246,19 +234,21 @@
246234
<distributionManagement>
247235
<snapshotRepository>
248236
<id>bintray</id>
249-
<url>https://api.bintray.com/maven/apottere/maven/graphql-java-tools</url>
237+
<name>graphql-java-kickstart-graphql-java-tools</name>
238+
<url>https://api.bintray.com/maven/graphql-java-kickstart/graphql-java-tools/graphql-java-tools/</url>
250239
</snapshotRepository>
251240

252241
<!-- Released with: mvn release:clean release:prepare release:perform -B -e -Pbintray -->
253242
<repository>
254243
<id>bintray</id>
255-
<url>https://api.bintray.com/maven/apottere/maven/graphql-java-tools/;publish=1</url>
244+
<name>graphql-java-kickstart-graphql-java-tools</name>
245+
<url>https://api.bintray.com/maven/graphql-java-kickstart/graphql-java-tools/graphql-java-tools/;publish=1</url>
256246
</repository>
257247
</distributionManagement>
258248
<scm>
259-
<connection>scm:git:git://github.com/graphql-java/graphql-java-tools.git</connection>
260-
<developerConnection>scm:git:git@github.com:graphql-java/graphql-java-tools.git</developerConnection>
261-
<url>http://github.com/graphql-java/graphql-java-tools</url>
262-
<tag>HEAD</tag>
263-
</scm>
249+
<connection>scm:git:git://github.com/graphql-java-kickstart/graphql-java-tools.git</connection>
250+
<developerConnection>scm:git:git@github.com:graphql-java-kickstart/graphql-java-tools.git</developerConnection>
251+
<url>http://github.com/graphql-javakickstart/graphql-java-tools</url>
252+
<tag>HEAD</tag>
253+
</scm>
264254
</project>

travis-build.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
set -ev
3+
echo "current git hash:"
4+
git rev-parse --short HEAD
5+
6+
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && [ "${RELEASE}" = "true" ]; then
7+
echo "Building on master"
8+
echo ${MAVEN_SETTINGS} >> $HOME/.m2/settings.xml
9+
mvn release:clean release:prepare release:perform -B -e -Pbintray
10+
else
11+
echo "Building branch"
12+
mvn -B clean verify
13+
fi

0 commit comments

Comments
 (0)