Merge pull request #4 from Nosto/upgrade-nosto

Upgrade nosto

Author: manikandan-ravikumar

.github/workflows/build.yml

@@ -0,0 +1,26 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v2
+        if: always() # always run even if the previous step fails
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'

.github/workflows/publish.yml

@@ -0,0 +1,30 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Publish
+
+on:
+  workflow_dispatch:
+    branches: [ master ]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    environment: prod
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
+    - name: Publish with Gradle
+      run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+      env:
+        MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
+        MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+        MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }}

README.md

@@ -37,7 +37,7 @@ If you would like to use a tool that creates a graphql spring boot server using
 
 ```groovy
 dependencies {
-  compile "io.github.graphql-java:graphql-java-annotations:8.3"
+  compile "io.github.graphql-java:graphql-java-annotations:9.1-nosto"
 }
 ```
 
@@ -47,7 +47,7 @@ dependencies {
 <dependency>
     <groupId>io.github.graphql-java</groupId>
     <artifactId>graphql-java-annotations</artifactId>
-    <version>8.3</version>
+    <version>9.1-nosto</version>
 </dependency>
 ```
 

azure-pipelines.yml

@@ -2,28 +2,26 @@ import aQute.bnd.gradle.Bundle
 
 buildscript {
     repositories {
-        jcenter()
         mavenCentral()
     }
     dependencies {
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2'
+        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:latest.release"
     }
 }
 plugins {
-    id 'com.jfrog.bintray' version '1.8.5'
     id 'net.researchgate.release' version '2.8.1'
     id 'com.github.hierynomus.license' version '0.15.0'
+    id 'maven-publish'
+    id 'signing'
+    id "io.github.gradle-nexus.publish-plugin" version "1.0.0"
 }
 
 apply plugin: 'java'
 apply plugin: 'idea'
-
 apply plugin: 'biz.aQute.bnd.builder'
-apply plugin: 'com.jfrog.bintray'
 apply plugin: 'maven-publish'
 
-//def releaseVersion = System.properties.RELEASE_VERSION
-//version = releaseVersion ? releaseVersion : new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date())
 
 // custom tasks for creating source/javadoc jars
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -56,18 +54,17 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:16.2'
-    implementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2"
-    implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2"
-
+    compile 'com.graphql-java:graphql-java:17.4'
+    compile 'com.graphql-java:graphql-java-extended-scalars:17.0'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2'
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'
     compileOnly 'org.osgi:org.osgi.service.cm:1.5.0'
     compileOnly 'org.osgi:org.osgi.service.component:1.3.0'
     compileOnly 'biz.aQute.bnd:biz.aQute.bndlib:3.2.0'
 
-    testCompile 'org.testng:testng:6.9.10'
+    testCompile 'org.testng:testng:7.4.0'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
     testCompile 'org.mockito:mockito-core:2.+'
     testCompile 'com.google.guava:guava:30.0-jre'
@@ -144,36 +141,24 @@ publishing {
     }
 }
 
-afterReleaseBuild.dependsOn bintrayUpload
-
-bintray {
-    user = System.getenv('BINTRAY_USER') ?: project.findProperty('BINTRAY_USER') ?: ''
-    key = System.getenv('BINTRAY_KEY') ?: project.findProperty('BINTRAY_KEY') ?: ''
-    publications = ['maven']
-    publish = true
-    pkg {
-        desc = 'This library offers an annotations-based syntax for GraphQL schema definition.'
-        repo = 'graphql-java-annotations'
-        name = 'graphql-java-annotations'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://github.com/graphql-java/graphql-java-annotations'
-        version {
-            name = project.version
-            released = new Date()
-            gpg {
-                sign = false
-            }
-            mavenCentralSync {
-                sync = true //[Default: true] Determines whether to sync the version to Maven Central..
-                user = System.getenv('OSS_USER') ?: project.findProperty('OSS_USER') ?: ''
-                password = System.getenv('OSS_PASS') ?: project.findProperty('OSS_PASS') ?: ''
-                close = '1'
-                //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
-            }
+afterReleaseBuild.dependsOn nexusPublishing
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            username = System.getenv("MAVEN_CENTRAL_USER")
+            password = System.getenv("MAVEN_CENTRAL_PASSWORD")
         }
     }
 }
 
+// to publish to local maven repo skip signing: ./gradlew publishToMavenLocal  -x signGraphqlJavaPublication
+signing {
+    def signingKey = System.getenv("MAVEN_CENTRAL_PGP_KEY")
+    useInMemoryPgpKeys(signingKey, "")
+    sign publishing.publications
+}
+
 task bundle(type: Bundle) {
     from sourceSets.main.output
     bndfile = file('bundle.bnd')

build.gradle

@@ -5,4 +5,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
-version = 8.3-nosto2
+version = 9.1-nosto

gradle.properties

@@ -1,6 +1,5 @@
-#Mon Nov 30 23:20:00 EET 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -12,15 +12,39 @@
  */
 package graphql.annotations.dataFetchers;
 
+import graphql.schema.GraphQLList;
 import graphql.schema.GraphQLSchemaElement;
 import graphql.schema.GraphQLType;
 import graphql.schema.GraphQLTypeVisitor;
+import graphql.schema.SchemaElementChildrenContainer;
 import graphql.util.TraversalControl;
 import graphql.util.TraverserContext;
 
+import java.util.List;
+
 public class GraphQLUndefined implements GraphQLType {
+    @Override
+    public List<GraphQLSchemaElement> getChildren() {
+        return GraphQLType.super.getChildren();
+    }
+
+    @Override
+    public SchemaElementChildrenContainer getChildrenWithTypeReferences() {
+        return GraphQLType.super.getChildrenWithTypeReferences();
+    }
+
+    @Override
+    public GraphQLSchemaElement withNewChildren(SchemaElementChildrenContainer newChildren) {
+        return GraphQLType.super.withNewChildren(newChildren);
+    }
+
     @Override
     public TraversalControl accept(TraverserContext<GraphQLSchemaElement> context, GraphQLTypeVisitor visitor) {
         return null;
     }
+
+    @Override
+    public GraphQLSchemaElement copy() {
+        return new GraphQLUndefined();
+    }
 }