From 945562435b56ad3399439ea4beb5fe07914a21b4 Mon Sep 17 00:00:00 2001 From: Timothy Stone Date: Sat, 28 Nov 2020 11:32:53 -0500 Subject: [PATCH 01/14] Update GitHub Maven docs Super POM and context The GitHub Maven configuration overrides default behaviors of the Maven Super POM on central releases. It additionally makes notes on configuring user settings out of context of consuming projects of packages. --- ...ache-maven-for-use-with-github-packages.md | 98 +++++++++++++------ ...pache-maven-snapshot-versions-supported.md | 2 +- 2 files changed, 70 insertions(+), 30 deletions(-) diff --git a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md index 0d8c2df1cca7..98dd77b5d023 100644 --- a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md +++ b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md @@ -37,7 +37,7 @@ If you want to interact with multiple repositories, you can add each repository If your instance has subdomain isolation enabled: {% endif %} -``` +```xml - - + + + central + https://repo1.maven.org/maven2 + + + github + GitHub OWNER Apache Maven Packages + https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/REPOSITORY + + true + + + true + + + + + - + github @@ -79,7 +99,7 @@ If your instance has subdomain isolation enabled: {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: -``` +```xml @@ -81,7 +81,7 @@ If your instance has subdomain isolation enabled: true - --> + --> @@ -128,11 +128,11 @@ If your instance has subdomain isolation disabled: true - - + --> From c01d36bf1524ec65936c307216535bf9202ef43e Mon Sep 17 00:00:00 2001 From: Timothy Stone Date: Sat, 28 Nov 2020 12:04:06 -0500 Subject: [PATCH 03/14] Remove XML code fence language hint Attempting to retain comments in documentation. --- ...ache-maven-for-use-with-github-packages.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md index a5bdfaa9e2e9..c7460c551bb0 100644 --- a/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md +++ b/content/packages/using-github-packages-with-your-projects-ecosystem/configuring-apache-maven-for-use-with-github-packages.md @@ -37,7 +37,7 @@ If you want to interact with multiple repositories, you can add each repository If your instance has subdomain isolation enabled: {% endif %} -```xml +``` @@ -81,7 +81,7 @@ If your instance has subdomain isolation enabled: true - --> + --> @@ -99,7 +99,7 @@ If your instance has subdomain isolation enabled: {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: -```xml +``` + https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/REPOSITORY-2 true @@ -81,7 +77,7 @@ If your instance has subdomain isolation enabled: true - --> + @@ -94,12 +90,12 @@ If your instance has subdomain isolation enabled: - +``` {% if enterpriseServerVersions contains currentVersion %} If your instance has subdomain isolation disabled: -
+```xml
 
-            
-              true
-            
             
               true
             

From 07f05ad25cd1781550592420431b51c77d61b127 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale 
Date: Thu, 4 Mar 2021 16:43:57 +0000
Subject: [PATCH 08/14] Use single repository element for owner

---
 ...guring-apache-maven-for-use-with-github-packages.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
index c5526187662c..93baa5c959b3 100644
--- a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
+++ b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
@@ -59,7 +59,7 @@ If your instance has subdomain isolation enabled:
           
             github
             GitHub OWNER Apache Maven Packages
-            https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/REPOSITORY
+            https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/*
             
               true
             
@@ -67,14 +67,6 @@ If your instance has subdomain isolation enabled:
               true
             
           
-          
-            github
-            GitHub OWNER Apache Maven Packages
-            https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/REPOSITORY-2
-            
-              true
-            
-          
         
     
   

From 91c3c106f6bd10927c6489632d541abcd4854ee8 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale 
Date: Thu, 4 Mar 2021 16:44:58 +0000
Subject: [PATCH 09/14] Remove optional repository name

---
 .../configuring-apache-maven-for-use-with-github-packages.md     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
index 93baa5c959b3..ed066fc80922 100644
--- a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
+++ b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
@@ -58,7 +58,6 @@ If your instance has subdomain isolation enabled:
           
           
             github
-            GitHub OWNER Apache Maven Packages
             https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/*
             
               true

From a03b1051b13eaa75eea16b241e09607000fdc311 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale 
Date: Thu, 4 Mar 2021 16:46:50 +0000
Subject: [PATCH 10/14] Remove redundant releases (enabled is default)

---
 .../configuring-apache-maven-for-use-with-github-packages.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
index ed066fc80922..2e1d0e549918 100644
--- a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
+++ b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
@@ -59,9 +59,6 @@ If your instance has subdomain isolation enabled:
           
             github
             https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/*
-            
-              true
-            
             
               true
             
@@ -69,7 +66,7 @@ If your instance has subdomain isolation enabled:
         
     
   
-  
+
   
     
       github

From bb7148b78864d68dbe06a096ade35f2d507e81a8 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale 
Date: Thu, 4 Mar 2021 16:48:58 +0000
Subject: [PATCH 11/14] Fixed spaces

---
 ...ache-maven-for-use-with-github-packages.md | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
index 2e1d0e549918..1083b2acbc13 100644
--- a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
+++ b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
@@ -51,19 +51,19 @@ If your instance has subdomain isolation enabled:
   
     
       github
-        
-          
-            central
-            https://repo1.maven.org/maven2
-          
-          
-            github
-            https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/*
-            
-              true
-            
-          
-        
+      
+        
+          central
+          https://repo1.maven.org/maven2
+        
+        
+          github
+          https://{% if currentVersion == "free-pro-team@latest" %}maven.pkg.github.com{% else %}maven.HOSTNAME{% endif %}/OWNER/*
+          
+            true
+          
+        
+      
     
   
 

From 3a4bec2017c7732865fefc03a2bf4e80bd3df62e Mon Sep 17 00:00:00 2001
From: Jamie Cansdale 
Date: Thu, 4 Mar 2021 16:52:10 +0000
Subject: [PATCH 12/14] Make 2nd example consistent

---
 ...ache-maven-for-use-with-github-packages.md | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
index 1083b2acbc13..1940e97717a8 100644
--- a/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
+++ b/content/packages/guides/configuring-apache-maven-for-use-with-github-packages.md
@@ -93,34 +93,19 @@ If your instance has subdomain isolation disabled:
   
     
       github
-        
-          
-            central
-            https://repo1.maven.org/maven2
-          
-          
-            github
-            GitHub OWNER Apache Maven Packages
-            https://maven.pkg.github.com/OWNER/REPOSITORY
-            
-              true
-            
-            
-              true
-            
-          
-          
-            github
-            GitHub OWNER Apache Maven Packages
-            https://maven.pkg.github.com/OWNER/REPOSITORY-2
-            
-              true
-            
-            
-              true
-            
-          
-        
+      
+        
+          central
+          https://repo1.maven.org/maven2
+        
+        
+          github
+          https://maven.pkg.github.com/OWNER/*
+          
+            true
+          
+        
+      
     
   
 

From 0b2c0b685ce270da82ee682ffd79cd254a38db80 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale 
Date: Thu, 4 Mar 2021 16:54:32 +0000
Subject: [PATCH 13/14] Only one repository element is required per owner

---
 .../apache-maven-snapshot-versions-supported.md                 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/reusables/package_registry/apache-maven-snapshot-versions-supported.md b/data/reusables/package_registry/apache-maven-snapshot-versions-supported.md
index f47f807ca974..2ce728734784 100644
--- a/data/reusables/package_registry/apache-maven-snapshot-versions-supported.md
+++ b/data/reusables/package_registry/apache-maven-snapshot-versions-supported.md
@@ -1,3 +1 @@
 {% data variables.product.prodname_registry %} supports `SNAPSHOT` versions of Apache Maven. To use the GitHub Package repository for downloading `SNAPSHOT` artifacts, enable SNAPSHOTS in the POM of the consuming project or your  *~/.m2/settings.xml* file.
-
-EACH package should be in a separate repository due to a limitation on group/organization level package resolution. This may lead to numerous `repository` definitions that are different in `REPOSITORY` only.

From 5c9a66ef87ef5c3f5a64d100d1def28febbc4c49 Mon Sep 17 00:00:00 2001
From: jmarlena <6732600+jmarlena@users.noreply.github.com>
Date: Thu, 4 Mar 2021 11:24:25 -0800
Subject: [PATCH 14/14] Apply suggestions from code review

---
 .../apache-maven-snapshot-versions-supported.md                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/reusables/package_registry/apache-maven-snapshot-versions-supported.md b/data/reusables/package_registry/apache-maven-snapshot-versions-supported.md
index 2ce728734784..8728373612c1 100644
--- a/data/reusables/package_registry/apache-maven-snapshot-versions-supported.md
+++ b/data/reusables/package_registry/apache-maven-snapshot-versions-supported.md
@@ -1 +1 @@
-{% data variables.product.prodname_registry %} supports `SNAPSHOT` versions of Apache Maven. To use the GitHub Package repository for downloading `SNAPSHOT` artifacts, enable SNAPSHOTS in the POM of the consuming project or your  *~/.m2/settings.xml* file.
+{% data variables.product.prodname_registry %} supports `SNAPSHOT` versions of Apache Maven. To use the {% data variables.product.prodname_registry %} repository for downloading `SNAPSHOT` artifacts, enable SNAPSHOTS in the POM of the consuming project or your  *~/.m2/settings.xml* file.