Skip to content

Commit

Permalink
new version
Browse files Browse the repository at this point in the history
  • Loading branch information
llsand committed May 16, 2022
1 parent dd4dff4 commit 3fb46df
Show file tree
Hide file tree
Showing 15 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion examples/gradle_custom_build/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/gradle_domain_extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/gradle_encoding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/gradle_hsqldb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion examples/gradle_mariadb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/gradle_multi_schema/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/gradle_postgres/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion examples/gradle_simple/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion orcas_core/build_source/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion orcas_core/build_source/orcas_gradle_plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down
6 changes: 3 additions & 3 deletions orcas_core/release_orcas_step1.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

new_orcas_version=7.7.1
new_orcas_version=7.8.0

cd ..

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions orcas_core/upload_maven_central/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 11 additions & 10 deletions orcas_core/upload_maven_central/mcupload.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion orcas_integrationstest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down

0 comments on commit 3fb46df

Please sign in to comment.