From 0849b3295fe33b007fb8cb4d543ae5c5d49dc706 Mon Sep 17 00:00:00 2001 From: Joshua B Date: Tue, 2 Aug 2022 18:34:00 -0600 Subject: [PATCH 1/7] cleanup --- Makefile | 2 +- api-messages/gradle.properties | 2 +- .../groovy/yakworks/api/ResultUtils.groovy | 2 +- .../yakworks/message/{ => spi}/MsgService.kt | 5 ++++- build.gradle | 18 +----------------- groovy-commons/gradle.properties | 4 ++-- groovy-json/gradle.properties | 4 ++-- version.properties | 4 ++-- 8 files changed, 14 insertions(+), 27 deletions(-) rename api-messages/src/main/kotlin/yakworks/message/{ => spi}/MsgService.kt (95%) diff --git a/Makefile b/Makefile index d54b862..4389a61 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ publish: $(logr) "publishing to repo.9ci" $(gradlew) publishJavaLibraryPublicationToMavenRepository $(logr) "publishing to Sonatype Maven Central" - $(gradlew) publishToSonatype closeAndReleaseSonatypeStagingRepository + #$(gradlew) publishToSonatype closeAndReleaseSonatypeStagingRepository fi $(logr.done) "published" fi diff --git a/api-messages/gradle.properties b/api-messages/gradle.properties index 36502d7..3938be0 100644 --- a/api-messages/gradle.properties +++ b/api-messages/gradle.properties @@ -1,2 +1,2 @@ -description=Core i18n java and groovy models +description=Models and SPI for message service, api results and problems. isPublishable=true diff --git a/api-messages/src/main/groovy/yakworks/api/ResultUtils.groovy b/api-messages/src/main/groovy/yakworks/api/ResultUtils.groovy index 71b0453..3a1b9a1 100644 --- a/api-messages/src/main/groovy/yakworks/api/ResultUtils.groovy +++ b/api-messages/src/main/groovy/yakworks/api/ResultUtils.groovy @@ -6,7 +6,7 @@ package yakworks.api import groovy.transform.CompileStatic -import yakworks.message.MsgService +import yakworks.message.spi.MsgService @CompileStatic class ResultUtils { diff --git a/api-messages/src/main/kotlin/yakworks/message/MsgService.kt b/api-messages/src/main/kotlin/yakworks/message/spi/MsgService.kt similarity index 95% rename from api-messages/src/main/kotlin/yakworks/message/MsgService.kt rename to api-messages/src/main/kotlin/yakworks/message/spi/MsgService.kt index 196bd30..1101a58 100644 --- a/api-messages/src/main/kotlin/yakworks/message/MsgService.kt +++ b/api-messages/src/main/kotlin/yakworks/message/spi/MsgService.kt @@ -1,6 +1,9 @@ -package yakworks.message +package yakworks.message.spi +import yakworks.message.MsgContext +import yakworks.message.MsgKey import yakworks.message.MsgKey.Companion.ofCode +import yakworks.message.MsgMultiKey /** * Similiar to org.springframework.context.MessageSource but no dependencies diff --git a/build.gradle b/build.gradle index 1aeac9e..52bed85 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,3 @@ -//It all starts here -// buildscript { -// repositories { -// mavenLocal() -// maven { url "https://plugins.gradle.org/m2/" } -// } -// dependencies { -// // classpath "org.yakworks:gradle-plugins:$vShipyak" -// classpath "io.github.gradle-nexus:publish-plugin:$vMavenNexus" -// } -// } - plugins { id "org.jetbrains.kotlin.jvm" version "1.7.0" apply false id "yakworks.shipyak" version "$vShipyak" @@ -19,10 +7,6 @@ plugins { group = "org.yakworks" -//our opinionated defaults for gradle groovy & grails projects -// apply plugin: 'yakworks.shipyak' -// apply plugin: "io.github.gradle-nexus.publish-plugin" - if(!isSnapshot) { nexusPublishing { repositories { @@ -52,7 +36,7 @@ subprojects { subprj -> ext { // see gradle.properties in sub-projects //default true for isGormLibrary and isPublishable, set to false in gradle.props - isPublishable = getProp('isPublishable', true) + isPublishable = getProp('isPublishable', false) isExample = getProp('isExample', false) } diff --git a/groovy-commons/gradle.properties b/groovy-commons/gradle.properties index 01143f1..e80aba0 100644 --- a/groovy-commons/gradle.properties +++ b/groovy-commons/gradle.properties @@ -1,2 +1,2 @@ -description=commons groovy and java utils -isGormLibrary=false +description=common groovy and java utils +isPublishable=true diff --git a/groovy-json/gradle.properties b/groovy-json/gradle.properties index 01143f1..4eee8ee 100644 --- a/groovy-json/gradle.properties +++ b/groovy-json/gradle.properties @@ -1,2 +1,2 @@ -description=commons groovy and java utils -isGormLibrary=false +description=groovy json and jackson services +isPublishable=true diff --git a/version.properties b/version.properties index d96e4d8..7d8c27e 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ # Version of the produced binaries. This file is intended to be checked-in. used by https://github.com/yakworks/shipkit.git # the version in development that will be released, gets -SNAPSHOT added when release=false, see below -version=22.0.0 +version=3.1 # publishedVersion is the last production version that was released, should have a matching vX.Y.Z tag in github, # used for changelog and diffs during release. Set to false if new project and first release @@ -8,4 +8,4 @@ publishedVersion=false # when this is false will append -SNAPSHOT to version and if on publishable branch will 'publish' to snapshotUrl when true # IS_RELEASEBALE will be set and will go through full release process cycle to automatically bump version and push a v tag to github -release=false +release=true From 72bb4f80804d7c3922d404ffdaf9bdf497b2f4c9 Mon Sep 17 00:00:00 2001 From: Joshua B Date: Tue, 2 Aug 2022 18:39:58 -0600 Subject: [PATCH 2/7] comment out verifyNoSnapshots --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4389a61..02581a0 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ publish: $(logr) "publishing SNAPSHOT" $(gradlew) publishJavaLibraryPublicationToMavenRepository else - ${gradlew} rally-domain:verifyNoSnapshots + # ${gradlew} rally-domain:verifyNoSnapshots $(logr) "publishing to repo.9ci" $(gradlew) publishJavaLibraryPublicationToMavenRepository $(logr) "publishing to Sonatype Maven Central" From 639018e85ceb0846eed6fb85cf6ed9c34da6584e Mon Sep 17 00:00:00 2001 From: Joshua B Date: Tue, 2 Aug 2022 18:44:41 -0600 Subject: [PATCH 3/7] rename readme --- readme.md => README1.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename readme.md => README1.md (100%) diff --git a/readme.md b/README1.md similarity index 100% rename from readme.md rename to README1.md From 703c3b6efdd6879c0cc02bad85e62fc75cc007b3 Mon Sep 17 00:00:00 2001 From: Joshua B Date: Tue, 2 Aug 2022 18:45:08 -0600 Subject: [PATCH 4/7] rename readme --- README1.md => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README1.md => README.md (100%) diff --git a/README1.md b/README.md similarity index 100% rename from README1.md rename to README.md From 36d289b0dc09d719cf42c9d52e40dc78cffbce01 Mon Sep 17 00:00:00 2001 From: 9cibot <9cibot@9ci.com> Date: Wed, 3 Aug 2022 00:46:34 +0000 Subject: [PATCH 5/7] v3.1 changelog, version bump [ci skip] --- CHANGELOG.md | 5 +++++ version.properties | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29..101b8ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +### v3.1 + +Initial Release + + diff --git a/version.properties b/version.properties index 7d8c27e..b76d141 100644 --- a/version.properties +++ b/version.properties @@ -1,11 +1,11 @@ # Version of the produced binaries. This file is intended to be checked-in. used by https://github.com/yakworks/shipkit.git # the version in development that will be released, gets -SNAPSHOT added when release=false, see below -version=3.1 +version=3.2 # publishedVersion is the last production version that was released, should have a matching vX.Y.Z tag in github, # used for changelog and diffs during release. Set to false if new project and first release -publishedVersion=false +publishedVersion=3.1 # when this is false will append -SNAPSHOT to version and if on publishable branch will 'publish' to snapshotUrl when true # IS_RELEASEBALE will be set and will go through full release process cycle to automatically bump version and push a v tag to github -release=true +release=false From e72794a6a5b8b0f2dfee245dd0a4cf2ca72cd1ca Mon Sep 17 00:00:00 2001 From: Joshua B Date: Tue, 2 Aug 2022 18:51:25 -0600 Subject: [PATCH 6/7] reset --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index b76d141..6d3d272 100644 --- a/version.properties +++ b/version.properties @@ -1,10 +1,10 @@ # Version of the produced binaries. This file is intended to be checked-in. used by https://github.com/yakworks/shipkit.git # the version in development that will be released, gets -SNAPSHOT added when release=false, see below -version=3.2 +version=3.1 # publishedVersion is the last production version that was released, should have a matching vX.Y.Z tag in github, # used for changelog and diffs during release. Set to false if new project and first release -publishedVersion=3.1 +publishedVersion=false # when this is false will append -SNAPSHOT to version and if on publishable branch will 'publish' to snapshotUrl when true # IS_RELEASEBALE will be set and will go through full release process cycle to automatically bump version and push a v tag to github From d031f7fe599d94d66f345efd47a3476a0c36bd93 Mon Sep 17 00:00:00 2001 From: Joshua B Date: Tue, 2 Aug 2022 18:51:59 -0600 Subject: [PATCH 7/7] turn nexus back on --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 02581a0..6fffe6d 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ publish: $(logr) "publishing to repo.9ci" $(gradlew) publishJavaLibraryPublicationToMavenRepository $(logr) "publishing to Sonatype Maven Central" - #$(gradlew) publishToSonatype closeAndReleaseSonatypeStagingRepository + $(gradlew) publishToSonatype closeAndReleaseSonatypeStagingRepository fi $(logr.done) "published" fi