Ready for release 2.0RC1

Author: etienne-sf

Diff for: build.gradle

@@ -75,20 +75,4 @@ subprojects {
 		    mustRunAfter cleanSamplesCode
 		}
 	}
-}
-
-
-
-/*
-//Let's include the documentation in the distribution archive
-distZip {
-    from project(':graphql-gradle-plugin-docs').asciidoctor, { 
-        into "${project.name}-${version}"
-    }
-}
-distTar {
-    from project(':graphql-gradle-plugin-docs').asciidoctor, {
-        into "${project.name}-${version}"
-    }
-}
-*/
+}

Diff for: graphql-gradle-plugin-samples-Forum-client/build.gradle

@@ -16,14 +16,15 @@ buildscript {
 }
 
 plugins {
-	id 'java-library'
+	id 'java'
 	id 'application'
 	id 'com.graphql_java_generator.graphql-gradle-plugin'
 	id 'org.springframework.boot' version "${spring3_springBootVersion}"
 	id 'io.spring.dependency-management' version "${spring3_DependencyManagementPluginVersion}"
 }
 sourceCompatibility = '17'
-
+mainClassName = 'com.graphql_java_generator.samples.forum.SpringMain'
+ 
 repositories {
 	mavenCentral()
 	// The plugin depends on the graphql-maven-plugin, whose snapshot versions are on the local maven repository.
@@ -34,7 +35,7 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-graphql'
 	// The graphql-java-client-dependencies module agregates all dependencies for the generated code
-    implementation "com.graphql-java-generator:graphql-java-client-dependencies:${project.version}"
+    implementation "com.graphql-java-generator:graphql-java-client-runtime:${project.version}"
 
 	// Dependencies for tests
 	testImplementation "org.springframework.boot:spring-boot-starter-test" 
@@ -46,6 +47,7 @@ sourceSets.main.java.srcDirs += '/build/generated/sources/graphqlGradlePlugin'
 // Let's configure the GraphQL Gradle Plugin
 // (the plugin will automatically add it as a dependency to compileJava and processResources) 
 graphql {
+	copyRuntimeSources = false
 	mode = "client"  //This line is here only for the demo, as client is the default mode
 	packageName = "com.graphql_java_generator.samples.forum.client.graphql.forum.client"
 	skipGenerationIfSchemaHasNotChanged = true

Diff for: graphql-gradle-plugin-samples-Forum-server/build.gradle

@@ -22,7 +22,7 @@ buildscript {
 
 plugins {
 	id 'java-library'
-	id 'application'
+	// id 'application'
 	id 'com.graphql_java_generator.graphql-gradle-plugin'
 	id 'org.springframework.boot' version "${spring3_springBootVersion}"
 	id 'io.spring.dependency-management' version "${spring3_DependencyManagementPluginVersion}"
@@ -64,6 +64,7 @@ generateServerCodeConf {
 	scanBasePackages = "org.forum.server.jpa ,  org.forum.server.specific_code"
 	schemaPersonalizationFile = "src/main/graphql/forum_personalization.json"
 	skipGenerationIfSchemaHasNotChanged = true
+	useJakartaEE9 = true
 	customScalars = [ [
 			graphQLTypeName: "Date",
 			javaType: "java.util.Date",

Diff for: graphql-gradle-plugin-samples-allGraphQLCases-pojo-client-jackson/build.gradle

@@ -17,12 +17,19 @@ buildscript {
 
 plugins {
 	id 'java-library'
-	id 'application'
 	id 'com.graphql_java_generator.graphql-gradle-plugin'
 	id 'org.springframework.boot' version "${springBootVersion}"
 	id 'io.spring.dependency-management' version "${springDependencyManagementPluginVersion}"
 }
 
+// The two configurations below are mandatory, as there is no main class in this module
+bootJar {
+    enabled = false
+}
+jar {
+    enabled = true
+}
+
 repositories {
 	mavenCentral()
 	// The plugin depends on the graphql-maven-plugin, whose snapshot versions are on the local maven repository.
@@ -33,6 +40,8 @@ repositories {
 dependencies {
 	// And the Jackson annotations
 	implementation "com.fasterxml.jackson.core:jackson-databind"
+    // This project uses some custom scalars from the graphql-java-extended-scalars module
+    implementation "com.graphql-java:graphql-java-extended-scalars:${graphqlJavaExtendedScalarsVersion}"
 
 	// Dependencies for tests
 	testImplementation "org.springframework.boot:spring-boot-starter-test" 

Diff for: graphql-gradle-plugin-samples-allGraphQLCases-pojo-client/build.gradle

@@ -17,12 +17,19 @@ buildscript {
 
 plugins {
 	id 'java-library'
-	id 'application'
 	id 'com.graphql_java_generator.graphql-gradle-plugin'
 	id 'org.springframework.boot' version "${springBootVersion}"
 	id 'io.spring.dependency-management' version "${springDependencyManagementPluginVersion}"
 }
 
+// The two configurations below are mandatory, as there is no main class in this module
+bootJar {
+    enabled = false
+}
+jar {
+    enabled = true
+}
+
 repositories {
 	mavenCentral()
 	// The plugin depends on the graphql-maven-plugin, whose snapshot versions are on the local maven repository.

Diff for: graphql-gradle-plugin-samples-allGraphQLCases-pojo-server/build.gradle

@@ -17,12 +17,19 @@ buildscript {
 
 plugins {
 	id 'java-library'
-	id 'application'
 	id 'com.graphql_java_generator.graphql-gradle-plugin'
 	id 'org.springframework.boot' version "${springBootVersion}"
 	id 'io.spring.dependency-management' version "${springDependencyManagementPluginVersion}"
 }
 
+// The two configurations below are mandatory, as there is no main class in this module
+bootJar {
+    enabled = false
+}
+jar {
+    enabled = true
+}
+
 repositories {
 	mavenCentral()
 	// The plugin depends on the graphql-maven-plugin, whose snapshot versions are on the local maven repository.
@@ -31,6 +38,8 @@ repositories {
 }
 
 dependencies {
+    // This project uses some custom scalars from the graphql-java-extended-scalars module
+    implementation "com.graphql-java:graphql-java-extended-scalars:${graphqlJavaExtendedScalarsVersion}"
 
 	// Dependencies for tests
 	testImplementation "org.springframework.boot:spring-boot-starter-test" 

Diff for: graphql-gradle-plugin/src/main/java/com/graphql_java_generator/gradleplugin/GenerateCodeCommonExtension.java

@@ -145,7 +145,7 @@ public class GenerateCodeCommonExtension extends CommonExtension implements Gene
 	 * (since 2.0RC) If false, it uses jakarta EE8 imports (that begins by javax.). If true, it uses jakarta EE8 imports
 	 * (that begins by jakarta.).
 	 */
-	protected boolean useJakartaEE9;
+	protected boolean useJakartaEE9 = GenerateCodeCommonConfiguration.DEFAULT_USE_JAKARTA_EE9.equals("true");
 
 	public GenerateCodeCommonExtension(Project project) {
 		super(project);

Diff for: graphql-gradle-plugin/src/main/java/com/graphql_java_generator/gradleplugin/GenerateCodeCommonTask.java

@@ -159,7 +159,7 @@ public class GenerateCodeCommonTask extends CommonTask implements GenerateCodeCo
 	 * (since 2.0RC) If false, it uses jakarta EE8 imports (that begins by javax.). If true, it uses jakarta EE8 imports
 	 * (that begins by jakarta.).
 	 */
-	protected boolean useJakartaEE9;
+	protected Boolean useJakartaEE9;
 
 	@Inject
 	public GenerateCodeCommonTask(Class<? extends GenerateCodeCommonExtension> extensionClazz) {