Skip to content

Commit 2902ee7

Browse files
donbeavedonbeave
committed
Merge branch 'graphql-java-kickstart-master'
2 parents 315b77f + bc93099 commit 2902ee7

File tree

22 files changed

+415
-175
lines changed

22 files changed

+415
-175
lines changed

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Question
4+
url: https://spectrum.chat/graphql-java-kick
5+
about: Anything you are not sure about? Ask the community on Spectrum!

‎.github/workflows/pull-request.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: "Pull request"
2+
on:
3+
push:
4+
branches-ignore:
5+
- master
6+
pull_request:
7+
8+
jobs:
9+
validation:
10+
name: Gradle Wrapper Validation
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: gradle/wrapper-validation-action@v1
15+
test:
16+
name: Test run
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
os: [ubuntu-latest, macos-latest, windows-latest]
21+
java: [8, 11, 15]
22+
needs: validation
23+
runs-on: ${{ matrix.os }}
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v2
27+
- name: Setup Java
28+
uses: actions/setup-java@v1
29+
with:
30+
java-version: ${{ matrix.java }}
31+
- name: Cache Gradle
32+
uses: actions/cache@v2
33+
env:
34+
java-version: ${{ matrix.java }}
35+
with:
36+
path: |
37+
~/.gradle/caches
38+
~/.gradle/wrapper
39+
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
40+
restore-keys: |
41+
${{ runner.os }}-${{ env.java-version }}-gradle-
42+
- name: Make gradlew executable (non-Windows only)
43+
if: matrix.os != 'windows-latest'
44+
run: chmod +x ./gradlew
45+
- name: Gradle Check (non-Windows)
46+
if: matrix.os != 'windows-latest'
47+
run: ./gradlew --info check
48+
- name: Gradle Check (Windows)
49+
if: matrix.os == 'windows-latest'
50+
shell: cmd
51+
run: gradlew --info check

‎.github/workflows/release.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: "Publish release"
2+
on: [workflow_dispatch]
3+
4+
jobs:
5+
validation:
6+
name: Gradle Wrapper Validation
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- uses: gradle/wrapper-validation-action@v1
11+
test:
12+
name: Test run
13+
needs: validation
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
- name: Setup Java
19+
uses: actions/setup-java@v1
20+
with:
21+
java-version: 8
22+
- name: Cache Gradle
23+
uses: actions/cache@v2
24+
env:
25+
java-version: 8
26+
with:
27+
path: |
28+
~/.gradle/caches
29+
~/.gradle/wrapper
30+
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
31+
restore-keys: |
32+
${{ runner.os }}-${{ env.java-version }}-gradle-
33+
- name: Make gradlew executable
34+
run: chmod +x ./gradlew
35+
- name: Gradle Check
36+
run: ./gradlew --info check
37+
build:
38+
name: Publish release
39+
needs: test
40+
runs-on: ubuntu-latest
41+
steps:
42+
- name: Checkout
43+
uses: actions/checkout@v2
44+
- name: Setup Java
45+
uses: actions/setup-java@v1
46+
with:
47+
java-version: 8
48+
- name: Cache Gradle
49+
uses: actions/cache@v2
50+
env:
51+
java-version: 8
52+
with:
53+
path: |
54+
~/.gradle/caches
55+
~/.gradle/wrapper
56+
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
57+
restore-keys: |
58+
${{ runner.os }}-${{ env.java-version }}-gradle-
59+
- name: Make gradlew executable
60+
run: chmod +x ./gradlew
61+
- name: Publish release
62+
env:
63+
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
64+
BINTRAY_PASS: ${{ secrets.BINTRAY_PASSWORD }}
65+
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
66+
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
67+
run: bash github-build.sh

‎.github/workflows/snapshot.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "Publish snapshot"
2+
on:
3+
push:
4+
branches:
5+
- master
6+
7+
jobs:
8+
validation:
9+
name: Gradle Wrapper Validation
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: gradle/wrapper-validation-action@v1
14+
test:
15+
name: Test run
16+
needs: validation
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
- name: Setup Java
22+
uses: actions/setup-java@v1
23+
with:
24+
java-version: 8
25+
- name: Cache Gradle
26+
uses: actions/cache@v2
27+
env:
28+
java-version: 8
29+
with:
30+
path: |
31+
~/.gradle/caches
32+
~/.gradle/wrapper
33+
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
34+
restore-keys: |
35+
${{ runner.os }}-${{ env.java-version }}-gradle-
36+
- name: Make gradlew executable
37+
run: chmod +x ./gradlew
38+
- name: Gradle Check
39+
run: ./gradlew --info check
40+
build:
41+
name: Publish snapshot
42+
needs: test
43+
runs-on: ubuntu-latest
44+
steps:
45+
- name: Checkout
46+
uses: actions/checkout@v2
47+
- name: Setup Java
48+
uses: actions/setup-java@v1
49+
with:
50+
java-version: 8
51+
- name: Cache Gradle
52+
uses: actions/cache@v2
53+
env:
54+
java-version: 8
55+
with:
56+
path: |
57+
~/.gradle/caches
58+
~/.gradle/wrapper
59+
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
60+
restore-keys: |
61+
${{ runner.os }}-${{ env.java-version }}-gradle-
62+
- name: Make gradlew executable
63+
run: chmod +x ./gradlew
64+
- name: Gradle Publish Snapshot
65+
env:
66+
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
67+
BINTRAY_PASS: ${{ secrets.BINTRAY_PASSWORD }}
68+
run: ./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number=${{ env.GITHUB_RUN_NUMBER }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ target/
1010
.project
1111
.settings
1212
bin
13+
.DS_Store

‎.travis.yml

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

‎README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
[![Build Status](https://travis-ci.org/graphql-java-kickstart/graphql-java-servlet.svg?branch=master)](https://travis-ci.org/graphql-java-kickstart/graphql-java-servlet)
1+
# GraphQL Java Servlet
2+
[![Build Status](https://github.com/graphql-java-kickstart/graphql-java-servlet/workflows/Publish%20snapshot/badge.svg)](https://github.com/graphql-java-kickstart/graphql-java-servlet/actions?query=workflow%3A%22Publish+snapshot%22)
23
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.graphql-java-kickstart/graphql-java-servlet/badge.svg?service=github)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java-kickstart/graphql-java-servlet)
3-
[![Chat on Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/graphql-java-kickstart/Lobby)
4+
[![Chat on Spectrum](https://img.shields.io/badge/spectrum-join%20the%20community-%23800080)](https://spectrum.chat/graphql-java-kick)
45

5-
# GraphQL Servlet
6+
## We are looking for contributors!
7+
Are you interested in improving our documentation, working on the codebase, reviewing PRs?
68

9+
[Reach out to us on Spectrum](https://spectrum.chat/graphql-java-kick) and join the team!
10+
11+
## Overview
712
Implementation of GraphQL Java Servlet including support for Relay.js, Apollo and OSGi out of the box.
813
This project wraps the Java implementation of GraphQL provided by [GraphQL Java](https://www.graphql-java.com).
914
See [GraphQL Java documentation](https://www.graphql-java.com/documentation/latest/) for more in depth details

‎build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ plugins {
3636
id 'net.researchgate.release' version '2.7.0'
3737
id 'io.franzbecker.gradle-lombok' version '3.2.0' apply false
3838
id "com.jfrog.artifactory" version "4.11.0" apply false
39-
id "biz.aQute.bnd.builder" version "5.0.0" apply false
39+
id "biz.aQute.bnd.builder" version "5.1.2" apply false
4040
}
4141

4242
subprojects {
@@ -171,8 +171,12 @@ subprojects {
171171
userOrg = 'graphql-java-kickstart'
172172
version {
173173
name = project.version
174+
gpg {
175+
sign = true
176+
}
174177
mavenCentralSync {
175-
close = '1'
178+
user = System.env.OSS_USER_TOKEN_KEY ?: project.findProperty('OSS_USER_TOKEN_KEY') ?: ''
179+
password = System.env.OSS_USER_TOKEN_PASS ?: project.findProperty('OSS_USER_TOKEN_PASS') ?: ''
176180
}
177181
}
178182
}

‎examples/osgi/apache-karaf-feature/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.google.guava</groupId>
4444
<artifactId>guava</artifactId>
45-
<version>24.1.1-jre</version>
45+
<version>[24.1.1,)</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>commons-fileupload</groupId>

‎travis-build.sh renamed to ‎github-build.sh

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
11
#!/bin/bash
22
set -ev
33

4-
saveGitCredentials() {
5-
cat >$HOME/.netrc <<EOL
6-
machine github.com
7-
login ${GITHUB_USERNAME}
8-
password ${GITHUB_TOKEN}
9-
10-
machine api.github.com
11-
login ${GITHUB_USERNAME}
12-
password ${GITHUB_TOKEN}
13-
EOL
14-
chmod 600 $HOME/.netrc
15-
}
16-
174
getVersion() {
18-
./gradlew properties -q | grep "version:" | grep -v "kotlin_version:" | awk '{print $2}' | tr -d '[:space:]'
5+
./gradlew properties -q | grep -E "^version" | awk '{print $2}' | tr -d '[:space:]'
196
}
207

218
removeSnapshots() {
@@ -52,25 +39,15 @@ commitNextVersion() {
5239
git commit -a -m "Update version for release"
5340
}
5441

55-
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
56-
if [ "${RELEASE}" = "true" ]; then
57-
echo "Deploying release to Bintray"
58-
saveGitCredentials
59-
git checkout -f ${TRAVIS_BRANCH}
60-
removeSnapshots
42+
git config --global user.email "[email protected]"
43+
git config --global user.name "GitHub Actions"
6144

62-
./gradlew clean assemble && ./gradlew check --info && ./gradlew bintrayUpload -x check --info
45+
echo "Deploying release to Bintray"
46+
removeSnapshots
6347

64-
commitRelease
65-
bumpVersion
66-
commitNextVersion
67-
git push --follow-tags
68-
else
69-
echo "Deploying snapshot"
70-
saveGitCredentials
71-
./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number="${TRAVIS_BUILD_NUMBER}"
72-
fi
73-
else
74-
echo "Verify"
75-
./gradlew clean assemble && ./gradlew check --info
76-
fi
48+
./gradlew clean assemble && ./gradlew bintrayUpload -x check --info
49+
50+
commitRelease
51+
bumpVersion
52+
commitNextVersion
53+
git push --follow-tags

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 9.2.0-SNAPSHOT
1+
version=10.1.0-SNAPSHOT
22
group = com.graphql-java-kickstart
33

44
PROJECT_NAME = graphql-java-servlet
@@ -9,7 +9,7 @@ PROJECT_LICENSE_URL = https://github.com/graphql-java-kickstart/spring-boot-grap
99
PROJECT_DEV_ID = apottere
1010
PROJECT_DEV_NAME = Andrew Potter
1111

12-
LIB_GRAPHQL_JAVA_VER = 14.0
12+
LIB_GRAPHQL_JAVA_VER = 15.0
1313
LIB_JACKSON_VER = 2.10.0
1414

1515
SOURCE_COMPATIBILITY = 1.8

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Nov 14 18:53:34 CET 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)