From f877a50d70d90067ce6d243face49c2dd52d17ce Mon Sep 17 00:00:00 2001
From: atl-mk <47995834+atl-mk@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:11:31 +0200
Subject: [PATCH] DCA11Y-1145 Make project releaseable (#11)
* DCA11Y-1145: Update SCM URLs to reflect Atlassian Forks org
* DCA11Y-1145: Remove skipping of deploy plugin
* DCA11Y-1145: Remove Sonatype deploy plugin
* DCA11Y-1145: Remove Javadoc and Source plugin
Our release scripts run this and this will cause warnings
* DCA11Y-1145: Make the Java version consistent
Avoid mixed releases
* DCA11Y-1145: Update the Maven repos
* chore: set version to 0b42a3b for release
* DCA11Y-1145: Add base pom to use artifactory release config
* chore: Make the version settable by Maven version plugin
* DCA11Y-1145: Fix clash with artifactory plugin
As per https://hello.atlassian.net/wiki/spaces/RELENG/pages/967261876/
* DCA11Y-1145: Remove parent POM
Get a 409 when trying to deploy otherwise
* chore: Prepare for release of 1.15.0-atlassian-1-e31f82ca
* chore: Reset version to 1.15.0-atlassian-1-SNAPSHOT
* DCA11Y-1145: Bundle the license
---
frontend-maven-plugin/pom.xml | 10 +---
frontend-plugin-core/pom.xml | 13 -----
pom.xml | 100 ++++++++++++++--------------------
3 files changed, 42 insertions(+), 81 deletions(-)
diff --git a/frontend-maven-plugin/pom.xml b/frontend-maven-plugin/pom.xml
index df38f20db..a3d75bbce 100644
--- a/frontend-maven-plugin/pom.xml
+++ b/frontend-maven-plugin/pom.xml
@@ -26,7 +26,7 @@
com.github.eirslett
frontend-plugin-core
- ${project.parent.version}
+ compile
@@ -79,14 +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 e0c95979d..5f5677e83 100644
--- a/frontend-plugin-core/pom.xml
+++ b/frontend-plugin-core/pom.xml
@@ -73,17 +73,4 @@
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 74de0721b..791128bd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,6 @@
UTF-8
true
1.8
- 1.8
- 1.8
Frontend Plugins
@@ -32,9 +30,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
@@ -50,6 +48,21 @@
frontend-maven-plugin
+
+
+
+ com.github.eirslett
+ frontend-plugin-core
+ ${project.version}
+
+
+ com.github.eirslett
+ frontend-maven-plugin
+ ${project.version}
+
+
+
+
@@ -64,34 +77,6 @@
deploy
-
- org.apache.maven.plugins
- maven-deploy-plugin
- 3.1.1
-
- true
-
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.13
-
-
- default-deploy
- deploy
-
-
- deploy
-
-
-
-
- https://oss.sonatype.org/
- ossrh
- true
-
-
@@ -100,36 +85,33 @@
maven-compiler-plugin
3.11.0
-
- 1.8
+
+ ${java.version}
org.apache.maven.plugins
- maven-source-plugin
- 3.3.0
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 3.5.0
-
-
-
+ maven-resources-plugin
- attach-javadocs
+ copy-license
+ process-sources
- jar
+ copy-resources
+
+ ${project.build.outputDirectory}/META-INF
+ true
+
+
+ ${user.dir}
+
+ LICENSE
+
+ true
+
+
+
@@ -139,12 +121,12 @@
- atlassian-3rdparty
- https://maven.atlassian.com/3rdparty
+ maven-atlassian-com
+ https://packages.atlassian.com/maven/3rdparty
- atlassian-3rdparty-snapshot
- https://maven.atlassian.com/3rdparty-snapshot
+ maven-atlassian-com
+ https://packages.atlassian.com/maven/3rdparty-snapshot