diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 2575e632..0b92666e 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -12,7 +12,7 @@ plugins { dependencies { implementation(libs.com.benjaminsproule.license) - implementation(libs.net.researchgate.release) +// implementation(libs.net.researchgate.release) } repositories { diff --git a/build-logic/src/main/kotlin/de.brendamour.java-conventions.gradle.kts b/build-logic/src/main/kotlin/de.brendamour.java-conventions.gradle.kts index a97fcc95..028173c5 100644 --- a/build-logic/src/main/kotlin/de.brendamour.java-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/de.brendamour.java-conventions.gradle.kts @@ -1,6 +1,6 @@ import java.util.* -import net.researchgate.release.ReleaseExtension -import net.researchgate.release.tasks.CommitNewVersion +//import net.researchgate.release.ReleaseExtension +//import net.researchgate.release.tasks.CommitNewVersion /* * This file was generated by the Gradle 'init' task. * @@ -46,6 +46,8 @@ publishing { pom { description = "Java Library for Apple PassBook Web Service API (PARENT POM)" url.set("https://github.com/drallgood/jpasskit") + name.set(project.displayName) + description.set(project.description) inceptionYear.set("2012") licenses { license { @@ -102,6 +104,7 @@ license { excludes(arrayListOf("*pom.xml","*.checkstyle","**/*.cer","**/*.pem","**/*.p12","**/*.ignored_file","site/*","**/*.json","**/*.png")) } +/* apply(plugin = "net.researchgate.release") configure { @@ -113,4 +116,4 @@ configure { tasks.withType { dependsOn("publishToSonatype") dependsOn("closeAndReleaseSonatypeStagingRepository") -} \ No newline at end of file +}*/ diff --git a/build.gradle.kts b/build.gradle.kts index 8f4e1650..11cc64a1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,15 @@ import org.gradle.tooling.GradleConnector +import net.researchgate.release.ReleaseExtension +import net.researchgate.release.tasks.UpdateVersion plugins { alias(libs.plugins.io.github.gradle.nexus.publish.plugin) alias(libs.plugins.net.researchgate.release) + `maven-publish` } allprojects { group = "de.brendamour" - version = "0.4.0-SNAPSHOT" } nexusPublishing { @@ -25,6 +27,14 @@ subprojects { } +configure { + with(git) { + requireBranch.set("master") + } +} + + + // Workaround for https://github.com/researchgate/gradle-release/issues/184 configure(listOf(tasks.release, tasks.runBuildTasks)) { configure { @@ -48,4 +58,4 @@ configure(listOf(tasks.release, tasks.runBuildTasks)) { } } } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..9f286542 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +version=0.4.1-SNAPSHOT \ No newline at end of file diff --git a/jpasskit.server/build.gradle.kts b/jpasskit.server/build.gradle.kts index bb851a5c..938be551 100644 --- a/jpasskit.server/build.gradle.kts +++ b/jpasskit.server/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { api(libs.org.restlet.jse.org.restlet.ext.simple) } -description = "jPasskit Server" +description = "Java Server Example for Apple PassBook Web Service API" java { withJavadocJar() diff --git a/jpasskit.server/pom.xml b/jpasskit.server/pom.xml deleted file mode 100644 index 59922ab9..00000000 --- a/jpasskit.server/pom.xml +++ /dev/null @@ -1,135 +0,0 @@ - - 4.0.0 - - - de.brendamour - jpasskit-parent - 0.4.0-SNAPSHOT - - - jpasskit.server - - jPasskit Server - Java Server Example for Apple PassBook Web Service API - - - - de.brendamour - jpasskit - ${project.version} - - - org.restlet.jse - org.restlet - - - org.restlet.jse - org.restlet.ext.simple - - - - - - maven-restlet - Restlet repository - https://maven.restlet.talend.com - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - true - 3000 - - - - com.mycila - license-maven-plugin - -
header.txt
- - Patrice Brend'amour - ${current.year} - patrice@brendamour.net - - - *pom.xml - site/* - -
- - - - check - - - -
- - org.apache.maven.plugins - maven-release-plugin - - - default - - perform - - - false - release - deploy - - - - default-prepare - - prepare - - - true - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - -
- - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-2 - - -
- -
diff --git a/jpasskit/build.gradle.kts b/jpasskit/build.gradle.kts index f5e7503e..6995dab1 100644 --- a/jpasskit/build.gradle.kts +++ b/jpasskit/build.gradle.kts @@ -6,7 +6,6 @@ plugins { id("de.brendamour.java-conventions") - id("net.researchgate.release") } dependencies { @@ -23,10 +22,9 @@ dependencies { testImplementation(libs.org.assertj.assertj.core) testImplementation(libs.org.mockito.mockito.core) testImplementation(libs.org.testng.testng) - implementation(libs.net.researchgate.release) } -description = "jPasskit" +description = "Java Library for Apple PassBook Web Service API<" java { withJavadocJar() diff --git a/jpasskit/pom.xml b/jpasskit/pom.xml deleted file mode 100644 index acb29619..00000000 --- a/jpasskit/pom.xml +++ /dev/null @@ -1,160 +0,0 @@ - - 4.0.0 - - de.brendamour - jpasskit-parent - 0.4.0-SNAPSHOT - - - jpasskit - - jPasskit - Java Library for Apple PassBook Web Service API - - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.google.guava - guava - - - com.eatthepath - pushy - - - commons-codec - commons-codec - - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - - - org.bouncycastle - bcpkix-jdk18on - - - org.slf4j - slf4j-api - - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - - org.assertj - assertj-core - test - - - org.mockito - mockito-core - test - - - org.testng - testng - test - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - true - 3000 - - - - com.mycila - license-maven-plugin - -
header.txt
- - Patrice Brend'amour - ${current.year} - patrice@brendamour.net - - - *pom.xml - *.checkstyle - **/*.cer - **/*.pem - **/*.p12 - **/*.ignored_file - site/* - -
- - - - check - - - -
- - org.apache.maven.plugins - maven-release-plugin - - - default-perform - - perform - - - jpasskit/pom.xml - false - signgpg release - deploy - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - -
-
-