From 4f57f46027b01611cdfa2bab35cee5edd3e547ef Mon Sep 17 00:00:00 2001 From: Alexander Rymasheusky Date: Thu, 19 Sep 2024 14:29:16 +0200 Subject: [PATCH 1/8] set release version --- frontend-maven-plugin/pom.xml | 2 +- frontend-plugin-core/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend-maven-plugin/pom.xml b/frontend-maven-plugin/pom.xml index df38f20db..f4a2fdaad 100644 --- a/frontend-maven-plugin/pom.xml +++ b/frontend-maven-plugin/pom.xml @@ -4,7 +4,7 @@ frontend-plugins com.github.eirslett - 1.15.0-atlassian-1-SNAPSHOT + 1.15.0-atlassian-testrelease-1 frontend-maven-plugin diff --git a/frontend-plugin-core/pom.xml b/frontend-plugin-core/pom.xml index e0c95979d..cbae941a8 100644 --- a/frontend-plugin-core/pom.xml +++ b/frontend-plugin-core/pom.xml @@ -3,7 +3,7 @@ frontend-plugins com.github.eirslett - 1.15.0-atlassian-1-SNAPSHOT + 1.15.0-atlassian-testrelease-1 4.0.0 diff --git a/pom.xml b/pom.xml index 74de0721b..ac93dc86b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.github.eirslett frontend-plugins - 1.15.0-atlassian-1-SNAPSHOT + 1.15.0-atlassian-testrelease-1 pom From f34cad6ea0643b6050979c76c1cb44e3ed896b8f Mon Sep 17 00:00:00 2001 From: Alexander Rymasheusky Date: Thu, 19 Sep 2024 15:08:49 +0200 Subject: [PATCH 2/8] remove mentions of maven-source-plugin With these mentions, the `mvn clean source:jar javadoc:jar install` command fails with ``` [ERROR] Failed to execute goal org.apache.maven.plugins:maven-source-plugin:3.3.0:jar-no-fork (attach-sources) on project frontend-plugin-core: Presumably you have configured maven-source-plugn to execute twice times in your build. You have to configure a classifier for at least on of them. -> [Help 1] ``` Without them, it executes fine, and in the local Maven repository I see the `-javadoc.jar` and `-sources.jar` generated, for both frontend-maven-plugin and frontend-plugin-core, so I consider removing it to be correct. --- frontend-maven-plugin/pom.xml | 4 ---- frontend-plugin-core/pom.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/frontend-maven-plugin/pom.xml b/frontend-maven-plugin/pom.xml index f4a2fdaad..9266340d4 100644 --- a/frontend-maven-plugin/pom.xml +++ b/frontend-maven-plugin/pom.xml @@ -79,10 +79,6 @@ - - org.apache.maven.plugins - maven-source-plugin - org.apache.maven.plugins maven-javadoc-plugin diff --git a/frontend-plugin-core/pom.xml b/frontend-plugin-core/pom.xml index cbae941a8..12d3c2ae1 100644 --- a/frontend-plugin-core/pom.xml +++ b/frontend-plugin-core/pom.xml @@ -75,10 +75,6 @@ - - org.apache.maven.plugins - maven-source-plugin - org.apache.maven.plugins maven-javadoc-plugin From c035270396abb34dbd78944a1f90df09fad58f85 Mon Sep 17 00:00:00 2001 From: Alexander Rymasheusky Date: Thu, 19 Sep 2024 15:19:23 +0200 Subject: [PATCH 3/8] remove mentions of oss.sonatype.org from the deploy step We don't want to publish to that repository. --- pom.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pom.xml b/pom.xml index ac93dc86b..547ce0894 100644 --- a/pom.xml +++ b/pom.xml @@ -72,26 +72,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - - default-deploy - deploy - - - deploy - - - - - https://oss.sonatype.org/ - ossrh - true - - From e4a42eaa884d23ef9416d083b4a990c921ab9668 Mon Sep 17 00:00:00 2001 From: Alexander Rymasheusky Date: Fri, 20 Sep 2024 11:02:53 +0200 Subject: [PATCH 4/8] correct scm section Even though it doesn't matter (there's a redirect from atlassian/fmp to attlassian-forks/fmp), it's worth it. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 547ce0894..be93eb958 100644 --- a/pom.xml +++ b/pom.xml @@ -32,9 +32,9 @@ - https://github.com/atlassian/frontend-maven-plugin - scm:git:https://github.com/atlassian/frontend-maven-plugin.git - scm:git:git@github.com:atlassian/frontend-maven-plugin.git + https://github.com/atlassian-forks/frontend-maven-plugin + scm:git:https://github.com/atlassian-forks/frontend-maven-plugin.git + scm:git:git@github.com:atlassian-forks/frontend-maven-plugin.git From 01f283ce5ba7e25334a25fa4d723f15c51a033a1 Mon Sep 17 00:00:00 2001 From: Alexander Rymasheusky Date: Fri, 20 Sep 2024 11:08:09 +0200 Subject: [PATCH 5/8] attempt to correct the repositories in distributionManagement --- pom.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index be93eb958..a1707732c 100644 --- a/pom.xml +++ b/pom.xml @@ -119,12 +119,14 @@ - atlassian-3rdparty - https://maven.atlassian.com/3rdparty + maven-atlassian-com + Atlassian Central Repository + https://packages.atlassian.com/maven/central - atlassian-3rdparty-snapshot - https://maven.atlassian.com/3rdparty-snapshot + maven-atlassian-com + Atlassian Central Snapshot Repository + https://packages.atlassian.com/maven/central-snapshot From ca1b6996905e323a6a2af6e91ea107c99b2cf80d Mon Sep 17 00:00:00 2001 From: Alexander Rymasheusky Date: Fri, 20 Sep 2024 11:09:37 +0200 Subject: [PATCH 6/8] remove distributionManagement and add parent on central-pom --- pom.xml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index a1707732c..817518940 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,12 @@ 1.15.0-atlassian-testrelease-1 pom + + central-pom + com.atlassian.pom + 6.3.8 + + UTF-8 true @@ -116,18 +122,4 @@ - - - - maven-atlassian-com - Atlassian Central Repository - https://packages.atlassian.com/maven/central - - - maven-atlassian-com - Atlassian Central Snapshot Repository - https://packages.atlassian.com/maven/central-snapshot - - - From 07f6cbff7b4756abc9bba433c6abe1f953f155ab Mon Sep 17 00:00:00 2001 From: Alexander Rymasheusky Date: Fri, 20 Sep 2024 12:01:06 +0200 Subject: [PATCH 7/8] replace groupId to com.atlassian.frontend-maven-plugin-fork Per https://hello.atlassian.net/wiki/spaces/OSP/pages/791250012/HOWTO+Publish+an+open+source+project+on+Maven+Central, we can publish something to Maven Central only if groupId starts with `com.atlassian` or `io.atlassian`. --- frontend-maven-plugin/pom.xml | 4 ++-- frontend-maven-plugin/src/it/bun-integration/pom.xml | 2 +- .../src/it/custom-install-directory/pom.xml | 2 +- .../src/it/custom-working-directory/pom.xml | 2 +- frontend-maven-plugin/src/it/example project/pom.xml | 2 +- frontend-maven-plugin/src/it/node-provided-npm/pom.xml | 2 +- frontend-maven-plugin/src/it/npx-integration/pom.xml | 2 +- frontend-maven-plugin/src/it/pnpm-integration/pom.xml | 2 +- .../src/it/yarn-berry-integration/pom.xml | 2 +- frontend-maven-plugin/src/it/yarn-integration/pom.xml | 2 +- frontend-plugin-core/pom.xml | 2 +- pom.xml | 10 +--------- 12 files changed, 13 insertions(+), 21 deletions(-) diff --git a/frontend-maven-plugin/pom.xml b/frontend-maven-plugin/pom.xml index 9266340d4..161b3ae4c 100644 --- a/frontend-maven-plugin/pom.xml +++ b/frontend-maven-plugin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 frontend-plugins - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork 1.15.0-atlassian-testrelease-1 @@ -24,7 +24,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-plugin-core ${project.parent.version} diff --git a/frontend-maven-plugin/src/it/bun-integration/pom.xml b/frontend-maven-plugin/src/it/bun-integration/pom.xml index 95122ece6..d46e3da93 100644 --- a/frontend-maven-plugin/src/it/bun-integration/pom.xml +++ b/frontend-maven-plugin/src/it/bun-integration/pom.xml @@ -10,7 +10,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-maven-plugin/src/it/custom-install-directory/pom.xml b/frontend-maven-plugin/src/it/custom-install-directory/pom.xml index 0a47dcebd..897cb2393 100644 --- a/frontend-maven-plugin/src/it/custom-install-directory/pom.xml +++ b/frontend-maven-plugin/src/it/custom-install-directory/pom.xml @@ -10,7 +10,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-maven-plugin/src/it/custom-working-directory/pom.xml b/frontend-maven-plugin/src/it/custom-working-directory/pom.xml index 5daac9184..c32ba4aa4 100644 --- a/frontend-maven-plugin/src/it/custom-working-directory/pom.xml +++ b/frontend-maven-plugin/src/it/custom-working-directory/pom.xml @@ -10,7 +10,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-maven-plugin/src/it/example project/pom.xml b/frontend-maven-plugin/src/it/example project/pom.xml index 9deb065ba..a9d96a9a0 100644 --- a/frontend-maven-plugin/src/it/example project/pom.xml +++ b/frontend-maven-plugin/src/it/example project/pom.xml @@ -11,7 +11,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-maven-plugin/src/it/node-provided-npm/pom.xml b/frontend-maven-plugin/src/it/node-provided-npm/pom.xml index a67f387c0..714d8dd25 100644 --- a/frontend-maven-plugin/src/it/node-provided-npm/pom.xml +++ b/frontend-maven-plugin/src/it/node-provided-npm/pom.xml @@ -10,7 +10,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-maven-plugin/src/it/npx-integration/pom.xml b/frontend-maven-plugin/src/it/npx-integration/pom.xml index afe8f3cc9..df084d58e 100644 --- a/frontend-maven-plugin/src/it/npx-integration/pom.xml +++ b/frontend-maven-plugin/src/it/npx-integration/pom.xml @@ -10,7 +10,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-maven-plugin/src/it/pnpm-integration/pom.xml b/frontend-maven-plugin/src/it/pnpm-integration/pom.xml index 6ec0b5a92..a507fac1f 100644 --- a/frontend-maven-plugin/src/it/pnpm-integration/pom.xml +++ b/frontend-maven-plugin/src/it/pnpm-integration/pom.xml @@ -10,7 +10,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-maven-plugin/src/it/yarn-berry-integration/pom.xml b/frontend-maven-plugin/src/it/yarn-berry-integration/pom.xml index 3a1a604ef..01b3c6660 100644 --- a/frontend-maven-plugin/src/it/yarn-berry-integration/pom.xml +++ b/frontend-maven-plugin/src/it/yarn-berry-integration/pom.xml @@ -10,7 +10,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-maven-plugin/src/it/yarn-integration/pom.xml b/frontend-maven-plugin/src/it/yarn-integration/pom.xml index c446ecf57..88d67965a 100644 --- a/frontend-maven-plugin/src/it/yarn-integration/pom.xml +++ b/frontend-maven-plugin/src/it/yarn-integration/pom.xml @@ -10,7 +10,7 @@ - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-maven-plugin @project.version@ diff --git a/frontend-plugin-core/pom.xml b/frontend-plugin-core/pom.xml index 12d3c2ae1..5236b6806 100644 --- a/frontend-plugin-core/pom.xml +++ b/frontend-plugin-core/pom.xml @@ -2,7 +2,7 @@ frontend-plugins - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork 1.15.0-atlassian-testrelease-1 4.0.0 diff --git a/pom.xml b/pom.xml index 817518940..117f3224b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.github.eirslett + com.atlassian.frontend-maven-plugin-fork frontend-plugins 1.15.0-atlassian-testrelease-1 pom @@ -70,14 +70,6 @@ deploy - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.1 - - true - - From b29e3ef3ce9ba19c46fba78d65cc4d9ab217ee2a Mon Sep 17 00:00:00 2001 From: Alexander Rymasheusky Date: Fri, 20 Sep 2024 13:19:02 +0200 Subject: [PATCH 8/8] return to the snapshot version after the test release --- frontend-maven-plugin/pom.xml | 2 +- frontend-plugin-core/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend-maven-plugin/pom.xml b/frontend-maven-plugin/pom.xml index 161b3ae4c..fa07e052f 100644 --- a/frontend-maven-plugin/pom.xml +++ b/frontend-maven-plugin/pom.xml @@ -4,7 +4,7 @@ frontend-plugins com.atlassian.frontend-maven-plugin-fork - 1.15.0-atlassian-testrelease-1 + 1.15.0-atlassian-1-SNAPSHOT frontend-maven-plugin diff --git a/frontend-plugin-core/pom.xml b/frontend-plugin-core/pom.xml index 5236b6806..df0018bf0 100644 --- a/frontend-plugin-core/pom.xml +++ b/frontend-plugin-core/pom.xml @@ -3,7 +3,7 @@ frontend-plugins com.atlassian.frontend-maven-plugin-fork - 1.15.0-atlassian-testrelease-1 + 1.15.0-atlassian-1-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 117f3224b..f5b27e9af 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.atlassian.frontend-maven-plugin-fork frontend-plugins - 1.15.0-atlassian-testrelease-1 + 1.15.0-atlassian-1-SNAPSHOT pom