From 4db7df42d89d1b622dfc1af5fe4209c50e69a6a5 Mon Sep 17 00:00:00 2001 From: Frank Sanders Date: Fri, 29 Nov 2024 13:42:34 +0100 Subject: [PATCH] release --- 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 +- examples/maven_domain_extension/pom.xml | 4 ++-- examples/maven_extension_demo/pom.xml | 2 +- examples/maven_simple/pom.xml | 2 +- orcas_core/build_source/build.gradle | 8 ++++++-- orcas_core/build_source/extension_build_plugin.gradle | 10 +++++----- .../orcas_xtext_extension.generator/build.gradle | 10 +++++----- .../build_source/xtext_generator_build_plugin.gradle | 10 +++++----- orcas_core/release_orcas_step1.sh | 2 +- orcas_core/release_orcas_step2.sh | 2 +- orcas_core/upload_maven_central/build.gradle | 2 +- orcas_integrationstest/build.gradle | 2 +- orcas_maven_plugin/pom.xml | 8 ++++---- 20 files changed, 41 insertions(+), 37 deletions(-) diff --git a/examples/gradle_custom_build/build.gradle b/examples/gradle_custom_build/build.gradle index 85113573..e4c85f33 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: '8.5.1' + version: '8.6.4' 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 fdbcc301..2679ec45 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: '8.5.1' + version: '8.6.4' 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 11a020e7..fbd4d29b 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: '8.5.1' + version: '8.6.4' 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 fb1a98f1..a64baebb 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: '8.5.1' + version: '8.6.4' 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 c62f51e2..0dc21376 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: '8.5.1' + version: '8.6.4' 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 362e3c6c..27a7d538 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: '8.5.1' + version: '8.6.4' 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 e0d9ba4d..aa385605 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: '8.5.1' + version: '8.6.4' 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 489081e0..fdfe6961 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: '8.5.1' + version: '8.6.4' classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' } diff --git a/examples/maven_domain_extension/pom.xml b/examples/maven_domain_extension/pom.xml index af53c81d..6a3c384b 100644 --- a/examples/maven_domain_extension/pom.xml +++ b/examples/maven_domain_extension/pom.xml @@ -13,14 +13,14 @@ com.opitzconsulting.orcas orcas-maven-plugin - 8.5.1 + 8.6.4 true com.opitzconsulting.orcas orcas-domainextension-main-extensionhandler - 8.5.1 + 8.6.4 diff --git a/examples/maven_extension_demo/pom.xml b/examples/maven_extension_demo/pom.xml index c423d440..5cf23cbb 100644 --- a/examples/maven_extension_demo/pom.xml +++ b/examples/maven_extension_demo/pom.xml @@ -16,7 +16,7 @@ com.opitzconsulting.orcas orcas-maven-plugin - 8.5.1 + 8.6.4 true diff --git a/examples/maven_simple/pom.xml b/examples/maven_simple/pom.xml index 303607f7..33b3ff64 100644 --- a/examples/maven_simple/pom.xml +++ b/examples/maven_simple/pom.xml @@ -16,7 +16,7 @@ com.opitzconsulting.orcas orcas-maven-plugin - 8.5.1 + 8.6.4 true diff --git a/orcas_core/build_source/build.gradle b/orcas_core/build_source/build.gradle index 21faecdd..49c52b29 100644 --- a/orcas_core/build_source/build.gradle +++ b/orcas_core/build_source/build.gradle @@ -1,10 +1,14 @@ subprojects { project.ext.xtext_version = "2.6.1" - project.ext.emf_version = "2.11.+" + project.ext.emf_ecore_version = "2.11.2" + project.ext.emf_common_version = "2.11.0" + project.ext.emf_ecore_xmi_version = "2.11.1" + project.ext.emf_codegen_ecore_version = "2.11.0" + project.ext.emf_codegen_version = "2.11.0" project.group = "com.opitzconsulting.orcas" - project.version = "8.5.2-SNAPSHOT" + project.version = "8.6.4" repositories { diff --git a/orcas_core/build_source/extension_build_plugin.gradle b/orcas_core/build_source/extension_build_plugin.gradle index ea9c3883..b20693f5 100644 --- a/orcas_core/build_source/extension_build_plugin.gradle +++ b/orcas_core/build_source/extension_build_plugin.gradle @@ -6,11 +6,11 @@ dependencies { compile "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:${project.ext.xtext_version}" compile "org.eclipse.xtext:org.eclipse.xtext.xtext:${project.ext.xtext_version}" - compile "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_version}" - compile "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_version}" - compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_version}" - compile "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_version}" - compile "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_version}" + compile "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_ecore_version}" + compile "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_common_version}" + compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_ecore_xmi_version}" + compile "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_codegen_ecore_version}" + compile "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_codegen_version}" } class SyncWithDeleteTask extends DefaultTask diff --git a/orcas_core/build_source/orcas_xtext_extension.generator/build.gradle b/orcas_core/build_source/orcas_xtext_extension.generator/build.gradle index 123ad21e..9839a05e 100644 --- a/orcas_core/build_source/orcas_xtext_extension.generator/build.gradle +++ b/orcas_core/build_source/orcas_xtext_extension.generator/build.gradle @@ -20,11 +20,11 @@ dependencies xtextConfiguration project(':orcas_syntax_extensions') xtextConfiguration "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:${project.ext.xtext_version}" xtextConfiguration "org.eclipse.xtext:org.eclipse.xtext.xtext:${project.ext.xtext_version}" - xtextConfiguration "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_version}" - xtextConfiguration "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_version}" - xtextConfiguration "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_version}" - xtextConfiguration "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_version}" - xtextConfiguration "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_version}" + xtextConfiguration "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_ecore_version}" + xtextConfiguration "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_common_version}" + xtextConfiguration "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_ecore_xmi_version}" + xtextConfiguration "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_codegen_ecore_version}" + xtextConfiguration "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_codegen_version}" } task(build, type: JavaExec) diff --git a/orcas_core/build_source/xtext_generator_build_plugin.gradle b/orcas_core/build_source/xtext_generator_build_plugin.gradle index b3ea84db..19dad117 100644 --- a/orcas_core/build_source/xtext_generator_build_plugin.gradle +++ b/orcas_core/build_source/xtext_generator_build_plugin.gradle @@ -18,11 +18,11 @@ dependencies { compile "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:${project.ext.xtext_version}" compile "org.eclipse.xtext:org.eclipse.xtext.xtext:${project.ext.xtext_version}" - compile "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_version}" - compile "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_version}" - compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_version}" - compile "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_version}" - compile "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_version}" + compile "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_ecore_version}" + compile "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_common_version}" + compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_ecore_xmi_version}" + compile "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_codegen_ecore_version}" + compile "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_codegen_version}" } task(copyFilesToBuild, type: Copy) diff --git a/orcas_core/release_orcas_step1.sh b/orcas_core/release_orcas_step1.sh index 837e9b43..6011279f 100644 --- a/orcas_core/release_orcas_step1.sh +++ b/orcas_core/release_orcas_step1.sh @@ -1,6 +1,6 @@ #!/bin/sh -new_orcas_version=8.5.1 +new_orcas_version=8.6.4 cd .. diff --git a/orcas_core/release_orcas_step2.sh b/orcas_core/release_orcas_step2.sh index 738c59f9..1b486c97 100644 --- a/orcas_core/release_orcas_step2.sh +++ b/orcas_core/release_orcas_step2.sh @@ -1,6 +1,6 @@ #!/bin/sh -new_orcas_snapshot_version=8.5.2-SNAPSHOT +new_orcas_snapshot_version=8.6.5-SNAPSHOT cd .. diff --git a/orcas_core/upload_maven_central/build.gradle b/orcas_core/upload_maven_central/build.gradle index c029b2ec..e3d4a45a 100644 --- a/orcas_core/upload_maven_central/build.gradle +++ b/orcas_core/upload_maven_central/build.gradle @@ -3,7 +3,7 @@ project.buildDir = ".gradle/build" apply from: 'mcupload.gradle' project.group = "com.opitzconsulting.orcas" -project.version = "8.5.1" +project.version = "8.6.4" project.ext.mcupload.publish("orcas-db-objects") project.ext.mcupload.publish("orcas-orig") diff --git a/orcas_integrationstest/build.gradle b/orcas_integrationstest/build.gradle index be00fadb..dbe43040 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: '8.5.1' + version: '8.6.4' compile group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' compile "com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre8" diff --git a/orcas_maven_plugin/pom.xml b/orcas_maven_plugin/pom.xml index 1f9e13e6..5f6a2496 100644 --- a/orcas_maven_plugin/pom.xml +++ b/orcas_maven_plugin/pom.xml @@ -4,7 +4,7 @@ com.opitzconsulting.orcas orcas-maven-plugin - 8.5.2-SNAPSHOT + 8.6.4 maven-plugin com.opitzconsulting.orcas:orcas-maven-plugin @@ -43,17 +43,17 @@ com.opitzconsulting.orcas orcas-main - 8.5.2-SNAPSHOT + 8.6.4 com.opitzconsulting.orcas orcas-main-extensionhandler - 8.5.2-SNAPSHOT + 8.6.4 com.opitzconsulting.orcas orcas-db-objects - 8.5.2-SNAPSHOT + 8.6.4