diff --git a/.idea/openapi-plugin.iml b/.idea/openapi-plugin.iml index 3cc6132..542a08e 100644 --- a/.idea/openapi-plugin.iml +++ b/.idea/openapi-plugin.iml @@ -1,4 +1,5 @@ - + + @@ -17,11 +18,11 @@ - + - + diff --git a/jeka/def/Build.java b/jeka/def/Build.java index f7cffc3..dfc13bd 100644 --- a/jeka/def/Build.java +++ b/jeka/def/Build.java @@ -1,5 +1,4 @@ import dev.jeka.core.api.crypto.gpg.JkGpg; -import dev.jeka.core.api.depmanagement.JkRepo; import dev.jeka.core.api.depmanagement.JkRepoSet; import dev.jeka.core.api.depmanagement.publication.JkNexusRepos; import dev.jeka.core.api.file.JkPathTree; @@ -12,7 +11,6 @@ import dev.jeka.core.tool.JkJekaVersionCompatibilityChecker; import dev.jeka.core.tool.builtins.git.JkVersionFromGit; import dev.jeka.core.tool.builtins.project.ProjectJkBean; -import dev.jeka.core.tool.builtins.repos.NexusJkBean; @JkInjectClasspath("org.projectlombok:lombok:1.18.24") class Build extends JkBean { @@ -26,10 +24,7 @@ class Build extends JkBean { @JkInjectProperty("JEKA_GPG_PASSPHRASE") public String secretRingPassword; - Build() { - getBean(ProjectJkBean.class).lately(this::configure); - getBean(NexusJkBean.class); // load Nexus KBean to handle Nexus repo - } + final ProjectJkBean projectJkBean = getBean(ProjectJkBean.class).lately(this::configure); private void configure(JkProject project) { JkPathTreeSet sources = JkPathTree.of(this.getBaseDir().resolve("jeka/def")) @@ -44,6 +39,12 @@ private void configure(JkProject project) { .minus(JkLocator.getJekaJarPath()) .minus("org.projectlombok:lombok") ); + + JkJekaVersionCompatibilityChecker.setCompatibilityRange(project.packaging.manifest, + "0.10.38", + "https://raw.githubusercontent.com/jeka-dev/openapi-plugin/master/breaking_versions.txt"); + + // Publish on ossrh project.publication.maven .setModuleId("dev.jeka:openapi-plugin") .setPublishRepos(publishRepos()) @@ -55,20 +56,11 @@ private void configure(JkProject project) { .addApache2License(); JkVersionFromGit.of().handleVersioning(project); JkNexusRepos.handleAutoRelease(project); - - JkJekaVersionCompatibilityChecker.setCompatibilityRange(project.packaging.manifest, - "0.10.37", - "https://raw.githubusercontent.com/jeka-dev/openapi-plugin/master/breaking_versions.txt"); } private JkRepoSet publishRepos() { - JkRepo snapshotRepo = JkRepo.ofMavenOssrhDownloadAndDeploySnapshot(ossrhUser, ossrhPwd); - JkGpg gpg = JkGpg.ofSecretRing(getBaseDir().resolve("jeka/secring.gpg"), secretRingPassword); - - JkRepo releaseRepo = JkRepo.ofMavenOssrhDeployRelease(ossrhUser, ossrhPwd, gpg.getSigner("")); - releaseRepo.publishConfig.setVersionFilter(version -> !version.isSnapshot()); - - return JkRepoSet.of(snapshotRepo, releaseRepo); + JkGpg gpg = JkGpg.ofStandardProject(getBaseDir()); + return JkRepoSet.ofOssrhSnapshotAndRelease(ossrhUser, ossrhPwd, gpg.getSigner("")); } } \ No newline at end of file diff --git a/jeka/wrapper/wrapper.properties b/jeka/wrapper/wrapper.properties index 341b771..df5d998 100644 --- a/jeka/wrapper/wrapper.properties +++ b/jeka/wrapper/wrapper.properties @@ -4,7 +4,7 @@ # The distribution will be downloaded from a Maven repository according the pattern [REPO URL]/dev/jeka/jeka-core/[jeka.version]/jeka-core-[jeka.version]-distrib.zip . # By default [REPO URL] is https://repo.maven.apache.org/maven2 . You can switch to another repository by editing repo.download.url property # located in [JEKA USER HOME DIR]/options.properties file. By default [JEKA USER HOME DIR] is [USER HOME]/.jeka . -#jeka.version=0.10.28 +jeka.version=0.10.38 # By default, Jeka distribution are fetched from maven central repo. The central repo contains only official releases. # It's possible to use another repository to fetch Jeka distribution using following property as: @@ -18,5 +18,5 @@ # The filesystem location of Jeka distribution to be used by the wrapper. This feature is only useful in very special cases. # When this property is set, jeka.version is ignored. It can be absolute or relative path to the root of the project to build. -jeka.distrib.location=/Users/jerome/IdeaProjects/jeka/dev.jeka.core/jeka/output/distrib +#jeka.distrib.location=/Users/jerome/IdeaProjects/jeka/dev.jeka.core/jeka/output/distrib diff --git a/sample-prog/.idea/sample-prog.iml b/sample-prog/.idea/sample-prog.iml index 59e3749..7e6fd69 100644 --- a/sample-prog/.idea/sample-prog.iml +++ b/sample-prog/.idea/sample-prog.iml @@ -665,11 +665,11 @@ - + - + @@ -685,7 +685,7 @@ - + diff --git a/sample-props/.idea/sample-props.iml b/sample-props/.idea/sample-props.iml index 5a05ae9..345718e 100644 --- a/sample-props/.idea/sample-props.iml +++ b/sample-props/.idea/sample-props.iml @@ -415,18 +415,18 @@ - + - + - +