From 59d617ef9d7a36f2451a15f47ae1f77b3577c4d8 Mon Sep 17 00:00:00 2001 From: Piasecki-grid Date: Sat, 4 Jan 2025 18:40:38 +0100 Subject: [PATCH] Pom should be working now --- pom.xml | 13 +- pom.xml.releaseBackup | 460 ------------------------------------------ release.properties | 15 +- 3 files changed, 17 insertions(+), 471 deletions(-) delete mode 100644 pom.xml.releaseBackup diff --git a/pom.xml b/pom.xml index ca9e95fa7..fb6fda4b4 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,8 @@ - scm:git:git://github.com/Piasecki-grid/maven-project - scm:git:ssh://git@github.com:Piasecki-grid/maven-project + scm:git:git://github.com/Piasecki-grid/maven-project.git + scm:git:ssh://git@github.com:Piasecki-grid/maven-project.git https://github.com/Piasecki-grid/maven-project org.springframework.samples @@ -161,6 +161,15 @@ + + org.apache.maven.plugins + maven-release-plugin + 3.0.1 + + github + + + org.apache.maven.plugins maven-enforcer-plugin diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup deleted file mode 100644 index ca9e95fa7..000000000 --- a/pom.xml.releaseBackup +++ /dev/null @@ -1,460 +0,0 @@ - - - 4.0.0 - - - org.springframework.boot - spring-boot-starter-parent - 3.4.0 - - - - - scm:git:git://github.com/Piasecki-grid/maven-project - scm:git:ssh://git@github.com:Piasecki-grid/maven-project - https://github.com/Piasecki-grid/maven-project - - org.springframework.samples - spring-petclinic - 3.4.0-SNAPSHOT - - petclinic - - - - - 17 - UTF-8 - UTF-8 - - 2024-11-28T14:37:52Z - - - 1.0.1 - 5.3.3 - 4.7.0 - - 10.20.1 - 0.8.12 - 0.2.29 - 1.0.0 - 3.6.0 - 0.0.11 - 0.0.43 - - - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-test - test - - - - io.projectreactor - reactor-core - - - - - com.h2database - h2 - runtime - - - com.mysql - mysql-connector-j - runtime - - - org.postgresql - postgresql - runtime - - - - - javax.cache - cache-api - - - com.github.ben-manes.caffeine - caffeine - - - - - org.webjars - webjars-locator-lite - ${webjars-locator.version} - - - org.webjars.npm - bootstrap - ${webjars-bootstrap.version} - - - org.webjars.npm - font-awesome - ${webjars-font-awesome.version} - - - - org.springframework.boot - spring-boot-devtools - test - - - org.springframework.boot - spring-boot-testcontainers - test - - - org.springframework.boot - spring-boot-docker-compose - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - mysql - test - - - - jakarta.xml.bind - jakarta.xml.bind-api - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - This build requires at least Java ${java.version}, - update your JVM, and - run the build again - ${java.version} - - - - - - - - io.spring.javaformat - spring-javaformat-maven-plugin - ${spring-format.version} - - - - validate - - validate - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - io.spring.nohttp - nohttp-checkstyle - ${nohttp-checkstyle.version} - - - - - nohttp-checkstyle-validation - - check - - validate - - src/checkstyle/nohttp-checkstyle.xml - ${basedir} - **/* - **/.git/**/*,**/.idea/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class - config_loc=${basedir}/src/checkstyle/ - - - - - - org.graalvm.buildtools - native-maven-plugin - - - org.springframework.boot - spring-boot-maven-plugin - - - - - build-info - - - - ${project.build.sourceEncoding} - ${project.reporting.outputEncoding} - ${java.version} - ${java.version} - - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - report - - report - - prepare-package - - - - - - - io.github.git-commit-id - git-commit-id-maven-plugin - - false - false - - - - - - org.cyclonedx - cyclonedx-maven-plugin - - - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - - - - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - - css - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - - unpack - - - generate-resources - - - - org.webjars.npm - bootstrap - ${webjars-bootstrap.version} - - - ${project.build.directory}/webjars - - - - - - - com.gitlab.haynes - libsass-maven-plugin - ${libsass.version} - - ${basedir}/src/main/scss/ - ${basedir}/src/main/resources/static/resources/css/ - ${project.build.directory}/webjars/META-INF/resources/webjars/bootstrap/${webjars-bootstrap.version}/scss/ - - - - - - compile - - generate-resources - - - - - - - - m2e - - - m2e.version - - - - - - - - org.eclipse.m2e - lifecycle-mapping - ${lifecycle-mapping} - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - [1,) - - check - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - [1,) - - build-info - - - - - - - - - io.spring.javaformat - spring-javaformat-maven-plugin - [0,) - - validate - - - - - - - - - - - - - - - - diff --git a/release.properties b/release.properties index 7ba8de1e7..9d193bf7e 100644 --- a/release.properties +++ b/release.properties @@ -1,15 +1,13 @@ #release configuration -#Sat Jan 04 18:03:58 CET 2025 -completedPhase=scm-commit-release +#Sat Jan 04 18:40:21 CET 2025 +completedPhase=check-poms exec.pomFileName=pom.xml exec.snapshotReleasePluginAllowed=false pinExternals=false preparationGoals=clean verify -project.dev.org.springframework.samples\:spring-petclinic=5-SNAPSHOT -project.rel.org.springframework.samples\:spring-petclinic=4 -project.scm.org.springframework.samples\:spring-petclinic.connection=scm\:git\:git\://github.com/Piasecki-grid/maven-project -project.scm.org.springframework.samples\:spring-petclinic.developerConnection=scm\:git\:ssh\://git@github.com\:Piasecki-grid/maven-project -project.scm.org.springframework.samples\:spring-petclinic.tag=spring-petclinic-4 +project.scm.org.springframework.samples\:spring-petclinic.connection=scm\:git\:git\://github.com/Piasecki-grid/maven-project.git +project.scm.org.springframework.samples\:spring-petclinic.developerConnection=scm\:git\:ssh\://git@github.com\:Piasecki-grid/maven-project.git +project.scm.org.springframework.samples\:spring-petclinic.tag=HEAD project.scm.org.springframework.samples\:spring-petclinic.url=https\://github.com/Piasecki-grid/maven-project projectVersionPolicyConfig=${projectVersionPolicyConfig}\n projectVersionPolicyId=default @@ -21,6 +19,5 @@ scm.commentPrefix=[maven-release-plugin] scm.developmentCommitComment=@{prefix} prepare for next development iteration scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} -scm.tag=spring-petclinic-4 scm.tagNameFormat=@{project.artifactId}-@{project.version} -scm.url=scm\:git\:ssh\://git@github.com\:Piasecki-grid/maven-project +scm.url=scm\:git\:ssh\://git@github.com\:Piasecki-grid/maven-project.git