Skip to content

Commit

Permalink
Upgrade different aspecs
Browse files Browse the repository at this point in the history
- upgrade gradle plugins
- upgrade testng
- upgrade osgi
- upgrade graphql to 19.4A
- add jaxb
- upgrade to java 17
  • Loading branch information
EugenMayer committed Jan 16, 2023
1 parent b0ce74a commit ef5a6c6
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 30 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
java-version: '17'
distribution: 'temurin'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
environment: prod
steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
java-version: '17'
distribution: 'temurin'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8
17
36 changes: 15 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,24 @@ buildscript {
}
dependencies {
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:latest.release"
}
}
plugins {
id 'com.github.hierynomus.license' version '0.16.1'
id 'java'
id 'idea'
id 'maven-publish'
id 'signing'
id "io.github.gradle-nexus.publish-plugin" version "1.0.0"
id 'com.github.hierynomus.license' version '0.16.1'
id "biz.aQute.bnd.builder" version "6.4.0"
}

apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'biz.aQute.bnd.builder'
apply plugin: 'maven-publish'


// custom tasks for creating source/javadoc jars
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}

Expand All @@ -46,18 +40,18 @@ gradle.projectsEvaluated {
}

dependencies {
implementation 'javax.validation:validation-api:1.1.0.Final'
implementation 'com.graphql-java:graphql-java:17.2'
implementation 'com.graphql-java:graphql-java-extended-scalars:17.0'

implementation 'javax.validation:validation-api:2.0.1.Final'
implementation 'com.graphql-java:graphql-java:19.3'
implementation 'com.graphql-java:graphql-java-extended-scalars:19.1'
implementation 'javax.xml.bind:jaxb-api:2.3.1'

// 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'
compileOnly 'org.osgi:osgi.core:8.0.0'
compileOnly 'org.osgi:org.osgi.service.cm:1.6.0'
compileOnly 'org.osgi:org.osgi.service.component:1.5.1'
compileOnly 'biz.aQute.bnd:biz.aQute.bndlib:3.5.0'

testImplementation 'org.testng:testng:6.9.10'
testImplementation 'org.testng:testng:7.7.1'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
testImplementation 'org.mockito:mockito-core:2.+'
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8

version = 9.1
version = 10.0
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public void queryNameWithFalse_directivesProvidedToRegistry_wiringIsActivated()
this.graphQLAnnotations.getContainer().getDirectiveRegistry().put(upperCase.getName(), new DirectiveAndWiring(upperCase, UpperWiring.class));
GraphQLObjectType object = this.graphQLAnnotations.object(Query.class);
GraphQLCodeRegistry codeRegistry = graphQLAnnotations.getContainer().getCodeRegistryBuilder().build();
GraphQLSchema schema = newSchema().query(object).codeRegistry(codeRegistry).build();
GraphQLSchema schema = newSchema().query(object).additionalDirective(upperCase).codeRegistry(codeRegistry).build();

ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("query { nameWithFalse }");
assertTrue(result.getErrors().isEmpty());
Expand Down

0 comments on commit ef5a6c6

Please sign in to comment.