Skip to content

Commit 49edff2

Browse files
dondonzdzhou-atlassian
dondonz
authored and
dzhou-atlassian
committed
Merge branch 'master' into dependabot/npm_and_yarn/follow-redirects-1.14.8
2 parents da43c64 + 5e0c7be commit 49edff2

26 files changed

Lines changed: 3408 additions & 53 deletions

‎documentation/getting-started.md‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ public class HelloWorld {
8181
## Using the latest development build
8282
----------------------------------
8383

84-
The latest development build is available on Bintray.
84+
The latest development build is available on Maven Central.
8585

86-
Please look at [Latest Build](https://bintray.com/andimarek/graphql-java/graphql-java/_latestVersion>) for the
86+
Please look at [Latest Build](https://search.maven.org/artifact/com.graphql-java/graphql-java>) for the
8787
latest version value.
8888

8989
### How to use the latest build with Gradle
@@ -93,7 +93,6 @@ Add the repositories:
9393
```groovy
9494
repositories {
9595
mavenCentral()
96-
maven { url "https://dl.bintray.com/andimarek/graphql-java" }
9796
}
9897
```
9998

@@ -107,19 +106,6 @@ dependencies {
107106

108107
### How to use the latest build with Maven
109108

110-
Add the repository:
111-
112-
```xml
113-
<repository>
114-
<snapshots>
115-
<enabled>false</enabled>
116-
</snapshots>
117-
<id>bintray-andimarek-graphql-java</id>
118-
<name>bintray</name>
119-
<url>https://dl.bintray.com/andimarek/graphql-java</url>
120-
</repository>
121-
```
122-
123109
Dependency:
124110

125111
```xml

‎documentation/sdl-directives.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "SDL Directives"
2+
title: "SDL directives"
33
date: 2018-09-09T12:52:46+10:00
44
description: How SDL Directives can be used to adjust the behavior of your graphql API
55
---

‎docusaurus.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const config = {
2525
routeBasePath: 'documentation',
2626
sidebarPath: require.resolve('./sidebars.js'),
2727
editUrl: 'https://github.com/graphql-java/graphql-java-page/edit/master/',
28-
lastVersion: "v17",
28+
lastVersion: "v18",
2929
versions: {
3030
current: {
3131
label: "master",

‎readme.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,17 @@ Preview build files locally with
3333
```
3434
$ yarn run serve
3535
```
36+
37+
## How to create a new release
38+
39+
Create a new release with
40+
```
41+
$ yarn run docusaurus docs:version v18
42+
```
43+
44+
Then update `lastVersion` inside `docusaurus.config.js`
45+
```
46+
lastVersion: "v18",
47+
```
48+
49+
For more, see the [Docusaurus versioning documentation](https://docusaurus.io/docs/versioning).

‎src/pages/tutorials/getting-started-with-spring-boot.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ We've barely scratched the surface of what's possible with GraphQL. Further info
8282
# GraphQL Java Overview
8383

8484
[GraphQL Java](https://www.graphql-java.com) is the Java (server) implementation for GraphQL.
85-
The are several repositories in the GraphQL Java Github org. The most important one is the [GraphQL Java Engine](https://github.com/graphql-java/graphql-java) which is the basis for everything else.
85+
There are several repositories in the GraphQL Java Github org. The most important one is the [GraphQL Java Engine](https://github.com/graphql-java/graphql-java) which is the basis for everything else.
8686

8787
GraphQL Java Engine itself is only concerned with executing queries. It doesn't deal with any HTTP or JSON related topics. For these aspects, we will use the [GraphQL Java Spring Boot](https://github.com/graphql-java/graphql-java-spring) adapter which takes care of exposing our API via Spring Boot over HTTP.
8888

‎versioned_docs/version-v16/getting-started.md‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ public class HelloWorld {
8585
## Using the latest development build
8686
----------------------------------
8787

88-
The latest development build is available on Bintray.
88+
The latest development build is available on Maven Central.
8989

90-
Please look at [Latest Build](https://bintray.com/andimarek/graphql-java/graphql-java/_latestVersion>) for the
90+
Please look at [Latest Build](https://search.maven.org/artifact/com.graphql-java/graphql-java) for the
9191
latest version value.
9292

9393

@@ -98,7 +98,6 @@ Add the repositories:
9898
```groovy
9999
repositories {
100100
mavenCentral()
101-
maven { url "https://dl.bintray.com/andimarek/graphql-java" }
102101
}
103102
```
104103

@@ -114,20 +113,6 @@ dependencies {
114113

115114
### How to use the latest build with Maven
116115

117-
118-
Add the repository:
119-
120-
```xml
121-
<repository>
122-
<snapshots>
123-
<enabled>false</enabled>
124-
</snapshots>
125-
<id>bintray-andimarek-graphql-java</id>
126-
<name>bintray</name>
127-
<url>https://dl.bintray.com/andimarek/graphql-java</url>
128-
</repository>
129-
```
130-
131116
Dependency:
132117

133118
```xml

‎versioned_docs/version-v17/getting-started.md‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ public class HelloWorld {
8585
## Using the latest development build
8686
----------------------------------
8787

88-
The latest development build is available on Bintray.
88+
The latest development build is available on Maven Central.
8989

90-
Please look at [Latest Build](https://bintray.com/andimarek/graphql-java/graphql-java/_latestVersion>) for the
90+
Please look at [Latest Build](https://search.maven.org/artifact/com.graphql-java/graphql-java) for the
9191
latest version value.
9292

9393

@@ -98,7 +98,6 @@ Add the repositories:
9898
```groovy
9999
repositories {
100100
mavenCentral()
101-
maven { url "https://dl.bintray.com/andimarek/graphql-java" }
102101
}
103102
```
104103

@@ -114,20 +113,6 @@ dependencies {
114113

115114
### How to use the latest build with Maven
116115

117-
118-
Add the repository:
119-
120-
```xml
121-
<repository>
122-
<snapshots>
123-
<enabled>false</enabled>
124-
</snapshots>
125-
<id>bintray-andimarek-graphql-java</id>
126-
<name>bintray</name>
127-
<url>https://dl.bintray.com/andimarek/graphql-java</url>
128-
</repository>
129-
```
130-
131116
Dependency:
132117

133118
```xml

0 commit comments

Comments
 (0)