From 3fb46df2cefc854866ee4933fab15d1468bc2c96 Mon Sep 17 00:00:00 2001 From: Frank Sanders Date: Mon, 16 May 2022 13:07:46 +0200 Subject: [PATCH] new version --- examples/gradle_custom_build/build.gradle | 2 +- examples/gradle_domain_extension/build.gradle | 2 +- examples/gradle_encoding/build.gradle | 2 +- examples/gradle_hsqldb/build.gradle | 2 +- examples/gradle_mariadb/build.gradle | 2 +- examples/gradle_multi_schema/build.gradle | 2 +- examples/gradle_postgres/build.gradle | 2 +- examples/gradle_simple/build.gradle | 2 +- orcas_core/build_source/build.gradle | 2 +- .../orcas_gradle_plugin/build.gradle | 2 +- orcas_core/release_orcas_step1.sh | 6 +++--- orcas_core/upload_maven_central/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../upload_maven_central/mcupload.gradle | 21 ++++++++++--------- orcas_integrationstest/build.gradle | 2 +- 15 files changed, 28 insertions(+), 27 deletions(-) diff --git a/examples/gradle_custom_build/build.gradle b/examples/gradle_custom_build/build.gradle index 715a4e4d..0da6dc48 100644 --- a/examples/gradle_custom_build/build.gradle +++ b/examples/gradle_custom_build/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin', - version: '7.7.1' + version: '7.8.0' classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' } diff --git a/examples/gradle_domain_extension/build.gradle b/examples/gradle_domain_extension/build.gradle index bbe0322d..179bfd8e 100644 --- a/examples/gradle_domain_extension/build.gradle +++ b/examples/gradle_domain_extension/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'com.opitzconsulting.orcas', name: 'orcas-domainextension-gradle-plugin', - version: '7.7.1' + version: '7.8.0' classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' } diff --git a/examples/gradle_encoding/build.gradle b/examples/gradle_encoding/build.gradle index 05538c18..113bfc4b 100644 --- a/examples/gradle_encoding/build.gradle +++ b/examples/gradle_encoding/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin', - version: '7.7.1' + version: '7.8.0' classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' } diff --git a/examples/gradle_hsqldb/build.gradle b/examples/gradle_hsqldb/build.gradle index 0fef2440..9221f252 100644 --- a/examples/gradle_hsqldb/build.gradle +++ b/examples/gradle_hsqldb/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin', - version: '7.7.1' + version: '7.8.0' classpath group: 'org.hsqldb', name: 'hsqldb', version: '2.4.0' diff --git a/examples/gradle_mariadb/build.gradle b/examples/gradle_mariadb/build.gradle index 3539695d..dff07b33 100644 --- a/examples/gradle_mariadb/build.gradle +++ b/examples/gradle_mariadb/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin', - version: '7.7.1' + version: '7.8.0' classpath group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '1.1.7' } } diff --git a/examples/gradle_multi_schema/build.gradle b/examples/gradle_multi_schema/build.gradle index 8242f8a1..13ea1dc3 100644 --- a/examples/gradle_multi_schema/build.gradle +++ b/examples/gradle_multi_schema/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin', - version: '7.7.1' + version: '7.8.0' classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' } diff --git a/examples/gradle_postgres/build.gradle b/examples/gradle_postgres/build.gradle index 2ab248a6..9c70a97f 100644 --- a/examples/gradle_postgres/build.gradle +++ b/examples/gradle_postgres/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin', - version: '7.7.1' + version: '7.8.0' classpath group: 'org.postgresql', name: 'postgresql', version: '42.2.9' } diff --git a/examples/gradle_simple/build.gradle b/examples/gradle_simple/build.gradle index ef47e457..a7de9d1f 100644 --- a/examples/gradle_simple/build.gradle +++ b/examples/gradle_simple/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin', - version: '7.7.1' + version: '7.8.0' classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' } diff --git a/orcas_core/build_source/build.gradle b/orcas_core/build_source/build.gradle index cd14687a..4ed2f7f7 100644 --- a/orcas_core/build_source/build.gradle +++ b/orcas_core/build_source/build.gradle @@ -3,7 +3,7 @@ subprojects project.ext.xtext_version = "2.6.1" project.group = "com.opitzconsulting.orcas" - project.version = "7.7.2-SNAPSHOT" + project.version = "7.8.0" repositories { diff --git a/orcas_core/build_source/orcas_gradle_plugin/build.gradle b/orcas_core/build_source/orcas_gradle_plugin/build.gradle index 572236f4..732d27c6 100644 --- a/orcas_core/build_source/orcas_gradle_plugin/build.gradle +++ b/orcas_core/build_source/orcas_gradle_plugin/build.gradle @@ -12,7 +12,7 @@ buildscript { } } dependencies { - classpath "com.gradle.publish:plugin-publish-plugin:0.10.0" + classpath "com.gradle.publish:plugin-publish-plugin:0.11.0" } } diff --git a/orcas_core/release_orcas_step1.sh b/orcas_core/release_orcas_step1.sh index b10fe6c9..31dddd6f 100644 --- a/orcas_core/release_orcas_step1.sh +++ b/orcas_core/release_orcas_step1.sh @@ -1,6 +1,6 @@ #!/bin/sh -new_orcas_version=7.7.1 +new_orcas_version=7.8.0 cd .. @@ -14,9 +14,9 @@ cd orcas_core/build_source ./gradlew publishToMavenLocal ./gradlew publishPlugins -cd ../../orcas_maven_plugin +#cd ../../orcas_maven_plugin -mvn clean install +#./mvnw clean install cd ../orcas_core/upload_maven_central diff --git a/orcas_core/upload_maven_central/build.gradle b/orcas_core/upload_maven_central/build.gradle index 0adb765e..48f94893 100644 --- a/orcas_core/upload_maven_central/build.gradle +++ b/orcas_core/upload_maven_central/build.gradle @@ -3,14 +3,14 @@ project.buildDir = ".gradle/build" apply from: 'mcupload.gradle' project.group = "com.opitzconsulting.orcas" -project.version = "7.7.1" +project.version = "7.8.0" project.ext.mcupload.publish("orcas-db-objects") project.ext.mcupload.publish("orcas-orig") project.ext.mcupload.publish("orcas-main") project.ext.mcupload.publish("orcas-generated") -project.ext.mcupload.publish("orcas-maven-plugin") +//project.ext.mcupload.publish("orcas-maven-plugin") project.ext.mcupload.publish("orcas-extenions") project.ext.mcupload.publish("orcas-gradle-plugin") diff --git a/orcas_core/upload_maven_central/gradle/wrapper/gradle-wrapper.properties b/orcas_core/upload_maven_central/gradle/wrapper/gradle-wrapper.properties index 4bb7a26a..2f06a3d7 100644 --- a/orcas_core/upload_maven_central/gradle/wrapper/gradle-wrapper.properties +++ b/orcas_core/upload_maven_central/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip diff --git a/orcas_core/upload_maven_central/mcupload.gradle b/orcas_core/upload_maven_central/mcupload.gradle index 7b33736c..f8d4e321 100644 --- a/orcas_core/upload_maven_central/mcupload.gradle +++ b/orcas_core/upload_maven_central/mcupload.gradle @@ -29,19 +29,20 @@ publishing { } } +afterEvaluate { // The generatePom-Tasks are genearted by the maven-publish-plugin, they are modified here -tasks.withType(GenerateMavenPom) { Task generatePom -> - def artifactId = getName().replace("generatePomFileFor","").replace("Publication","").toLowerCase() - - generatePom.doLast { - //overwrite the generated pom with the pom from maven-local - copyFile file("${project.ext.folder}/"+artifactId+"-"+project.version+".pom"), getDestination() - } + tasks.withType(GenerateMavenPom) { Task generatePom -> + def artifactId = getName().replace("generatePomFileFor", "").replace("Publication", "").toLowerCase() - //set dependency for the sign task, just to make sure it is executed (isnt needed for the generatePomFileFor.. task itself). Note, taht the pom is signed before it is generated, that is no problem, because the generated pom is ignored anyways - dependsOn tasks.getByName("sign-"+artifactId) -} + generatePom.doLast { + //overwrite the generated pom with the pom from maven-local + copyFile file("${project.ext.folder}/" + artifactId + "-" + project.version + ".pom"), getDestination() + } + //set dependency for the sign task, just to make sure it is executed (isnt needed for the generatePomFileFor.. task itself). Note, taht the pom is signed before it is generated, that is no problem, because the generated pom is ignored anyways + dependsOn tasks.getByName("sign-" + artifactId) + } +} project.ext.mcupload = new CallMe(project) class CallMe { diff --git a/orcas_integrationstest/build.gradle b/orcas_integrationstest/build.gradle index d9124ffb..89898543 100644 --- a/orcas_integrationstest/build.gradle +++ b/orcas_integrationstest/build.gradle @@ -9,7 +9,7 @@ dependencies { compile 'junit:junit:4.12' compile group: 'com.opitzconsulting.orcas', name: 'orcas-main-extensionhandler', - version: '7.7.1' + version: '7.8.0' compile group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' }