From 87aea1936bf4dad9203c2a5d7aca37f00562222d Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 28 Oct 2021 11:00:24 +0200 Subject: [PATCH] Remove www from scm-manager.org url (#1837) --- CHANGELOG.md | 96 +++++++++---------- build.gradle | 2 +- docs/en/administration/workdir_caching.md | 4 +- docs/en/migrate-scm-manager-from-v1/index.md | 2 +- .../sonia/scm/net/ahc/AdvancedHttpClient.java | 4 +- .../scm/repository/HealthCheckFailure.java | 2 +- .../repository/HealthCheckFailureTest.java | 4 +- .../deb/src/main/fs/etc/scm/server-config.xml | 10 +- .../src/main/fs/etc/scm/server-config.xml | 10 +- .../rpm/src/main/fs/etc/scm/server-config.xml | 8 +- scm-packaging/unix/src/main/fs/README.txt | 2 +- .../unix/src/main/fs/conf/server-config.xml | 8 +- scm-packaging/windows/src/main/fs/README.txt | 2 +- .../src/main/fs/conf/server-config.xml | 8 +- .../src/__snapshots__/storyshots.test.ts.snap | 16 ++-- scm-ui/ui-components/src/layout/Footer.tsx | 4 +- .../DefaultAccessTokenCookieIssuer.java | 32 +++---- 17 files changed, 107 insertions(+), 107 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 451c924eee..b552505a0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -746,51 +746,51 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Cache and x-requested-with header to bundle requests - remove public flag from repository and migrate permissions to anonymous user -[2.0.0-rc1]: https://www.scm-manager.org/download/2.0.0-rc1 -[2.0.0-rc2]: https://www.scm-manager.org/download/2.0.0-rc2 -[2.0.0-rc3]: https://www.scm-manager.org/download/2.0.0-rc3 -[2.0.0-rc4]: https://www.scm-manager.org/download/2.0.0-rc4 -[2.0.0-rc5]: https://www.scm-manager.org/download/2.0.0-rc5 -[2.0.0-rc6]: https://www.scm-manager.org/download/2.0.0-rc6 -[2.0.0-rc7]: https://www.scm-manager.org/download/2.0.0-rc7 -[2.0.0-rc8]: https://www.scm-manager.org/download/2.0.0-rc8 -[2.0.0]: https://www.scm-manager.org/download/2.0.0 -[2.1.0]: https://www.scm-manager.org/download/2.1.0 -[2.1.1]: https://www.scm-manager.org/download/2.1.1 -[2.2.0]: https://www.scm-manager.org/download/2.2.0 -[2.3.0]: https://www.scm-manager.org/download/2.3.0 -[2.3.1]: https://www.scm-manager.org/download/2.3.1 -[2.4.0]: https://www.scm-manager.org/download/2.4.0 -[2.4.1]: https://www.scm-manager.org/download/2.4.1 -[2.5.0]: https://www.scm-manager.org/download/2.5.0 -[2.6.0]: https://www.scm-manager.org/download/2.6.0 -[2.6.1]: https://www.scm-manager.org/download/2.6.1 -[2.6.2]: https://www.scm-manager.org/download/2.6.2 -[2.6.3]: https://www.scm-manager.org/download/2.6.3 -[2.7.0]: https://www.scm-manager.org/download/2.7.0 -[2.7.1]: https://www.scm-manager.org/download/2.7.1 -[2.8.0]: https://www.scm-manager.org/download/2.8.0 -[2.9.0]: https://www.scm-manager.org/download/2.9.0 -[2.9.1]: https://www.scm-manager.org/download/2.9.1 -[2.10.0]: https://www.scm-manager.org/download/2.10.0 -[2.10.1]: https://www.scm-manager.org/download/2.10.1 -[2.11.0]: https://www.scm-manager.org/download/2.11.0 -[2.11.1]: https://www.scm-manager.org/download/2.11.1 -[2.12.0]: https://www.scm-manager.org/download/2.12.0 -[2.13.0]: https://www.scm-manager.org/download/2.13.0 -[2.14.0]: https://www.scm-manager.org/download/2.14.0 -[2.14.1]: https://www.scm-manager.org/download/2.14.1 -[2.15.0]: https://www.scm-manager.org/download/2.15.0 -[2.15.1]: https://www.scm-manager.org/download/2.15.1 -[2.16.0]: https://www.scm-manager.org/download/2.16.0 -[2.17.0]: https://www.scm-manager.org/download/2.17.0 -[2.17.1]: https://www.scm-manager.org/download/2.17.1 -[2.18.0]: https://www.scm-manager.org/download/2.18.0 -[2.19.0]: https://www.scm-manager.org/download/2.19.0 -[2.19.1]: https://www.scm-manager.org/download/2.19.1 -[2.20.0]: https://www.scm-manager.org/download/2.20.0 -[2.21.0]: https://www.scm-manager.org/download/2.21.0 -[2.22.0]: https://www.scm-manager.org/download/2.22.0 -[2.23.0]: https://www.scm-manager.org/download/2.23.0 -[2.24.0]: https://www.scm-manager.org/download/2.24.0 -[2.25.0]: https://www.scm-manager.org/download/2.25.0 +[2.0.0-rc1]: https://scm-manager.org/download/2.0.0-rc1 +[2.0.0-rc2]: https://scm-manager.org/download/2.0.0-rc2 +[2.0.0-rc3]: https://scm-manager.org/download/2.0.0-rc3 +[2.0.0-rc4]: https://scm-manager.org/download/2.0.0-rc4 +[2.0.0-rc5]: https://scm-manager.org/download/2.0.0-rc5 +[2.0.0-rc6]: https://scm-manager.org/download/2.0.0-rc6 +[2.0.0-rc7]: https://scm-manager.org/download/2.0.0-rc7 +[2.0.0-rc8]: https://scm-manager.org/download/2.0.0-rc8 +[2.0.0]: https://scm-manager.org/download/2.0.0 +[2.1.0]: https://scm-manager.org/download/2.1.0 +[2.1.1]: https://scm-manager.org/download/2.1.1 +[2.2.0]: https://scm-manager.org/download/2.2.0 +[2.3.0]: https://scm-manager.org/download/2.3.0 +[2.3.1]: https://scm-manager.org/download/2.3.1 +[2.4.0]: https://scm-manager.org/download/2.4.0 +[2.4.1]: https://scm-manager.org/download/2.4.1 +[2.5.0]: https://scm-manager.org/download/2.5.0 +[2.6.0]: https://scm-manager.org/download/2.6.0 +[2.6.1]: https://scm-manager.org/download/2.6.1 +[2.6.2]: https://scm-manager.org/download/2.6.2 +[2.6.3]: https://scm-manager.org/download/2.6.3 +[2.7.0]: https://scm-manager.org/download/2.7.0 +[2.7.1]: https://scm-manager.org/download/2.7.1 +[2.8.0]: https://scm-manager.org/download/2.8.0 +[2.9.0]: https://scm-manager.org/download/2.9.0 +[2.9.1]: https://scm-manager.org/download/2.9.1 +[2.10.0]: https://scm-manager.org/download/2.10.0 +[2.10.1]: https://scm-manager.org/download/2.10.1 +[2.11.0]: https://scm-manager.org/download/2.11.0 +[2.11.1]: https://scm-manager.org/download/2.11.1 +[2.12.0]: https://scm-manager.org/download/2.12.0 +[2.13.0]: https://scm-manager.org/download/2.13.0 +[2.14.0]: https://scm-manager.org/download/2.14.0 +[2.14.1]: https://scm-manager.org/download/2.14.1 +[2.15.0]: https://scm-manager.org/download/2.15.0 +[2.15.1]: https://scm-manager.org/download/2.15.1 +[2.16.0]: https://scm-manager.org/download/2.16.0 +[2.17.0]: https://scm-manager.org/download/2.17.0 +[2.17.1]: https://scm-manager.org/download/2.17.1 +[2.18.0]: https://scm-manager.org/download/2.18.0 +[2.19.0]: https://scm-manager.org/download/2.19.0 +[2.19.1]: https://scm-manager.org/download/2.19.1 +[2.20.0]: https://scm-manager.org/download/2.20.0 +[2.21.0]: https://scm-manager.org/download/2.21.0 +[2.22.0]: https://scm-manager.org/download/2.22.0 +[2.23.0]: https://scm-manager.org/download/2.23.0 +[2.24.0]: https://scm-manager.org/download/2.24.0 +[2.25.0]: https://scm-manager.org/download/2.25.0 diff --git a/build.gradle b/build.gradle index 4b8f9b5c43..9d32cb57d6 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ plugins { } changelog { - versionUrlPattern = "https://www.scm-manager.org/download/{0}" + versionUrlPattern = "https://scm-manager.org/download/{0}" } subprojects { s -> diff --git a/docs/en/administration/workdir_caching.md b/docs/en/administration/workdir_caching.md index 7df2b557e0..437713b035 100644 --- a/docs/en/administration/workdir_caching.md +++ b/docs/en/administration/workdir_caching.md @@ -3,8 +3,8 @@ title: Caching for Working Directories --- SCM-Manager offers commands to modify repositories on the server side. For example this is used by the -[Editor Plugin](https://www.scm-manager.org/plugins/scm-editor-plugin/) and the -[Review Plugin](https://www.scm-manager.org/plugins/scm-review-plugin/). Without further configuration, this is done +[Editor Plugin](https://scm-manager.org/plugins/scm-editor-plugin/) and the +[Review Plugin](https://scm-manager.org/plugins/scm-review-plugin/). Without further configuration, this is done by cloning/checking out the repository temporarily, performing the change, creating a commit and pushing the changes back to the central repository. The larger the repositories, the longer this may take. diff --git a/docs/en/migrate-scm-manager-from-v1/index.md b/docs/en/migrate-scm-manager-from-v1/index.md index 5cbe5f4419..378daa1f2a 100644 --- a/docs/en/migrate-scm-manager-from-v1/index.md +++ b/docs/en/migrate-scm-manager-from-v1/index.md @@ -49,7 +49,7 @@ For version 2 of SCM-Manager we introduced a new way to store data for repositor # Manual plugin installation -If however you have to install plugins manually (for example because you cannot log in without the LDAP plugin), you can download them from the [plugins section](https://www.scm-manager.org/plugins/#categories) on our homepage. The download can be found in the "Releases" section of each plugin. Just store the `smp` file in the `plugin` directory of your SCM home and restart your server. +If however you have to install plugins manually (for example because you cannot log in without the LDAP plugin), you can download them from the [plugins section](https://scm-manager.org/plugins/#categories) on our homepage. The download can be found in the "Releases" section of each plugin. Just store the `smp` file in the `plugin` directory of your SCM home and restart your server. # Huge number of repositories diff --git a/scm-core/src/main/java/sonia/scm/net/ahc/AdvancedHttpClient.java b/scm-core/src/main/java/sonia/scm/net/ahc/AdvancedHttpClient.java index 6c4e992b4a..38e24f86c6 100644 --- a/scm-core/src/main/java/sonia/scm/net/ahc/AdvancedHttpClient.java +++ b/scm-core/src/main/java/sonia/scm/net/ahc/AdvancedHttpClient.java @@ -37,7 +37,7 @@ import java.io.IOException; * Http GET example: * * 

- * AdvancedHttpResponse response = client.get("https://www.scm-manager.org")
+ * AdvancedHttpResponse response = client.get("https://scm-manager.org")
  *                                       .decodeGZip(true)
  *                                       .request();
  *
@@ -48,7 +48,7 @@ import java.io.IOException;
  * Http POST example:
  *
  * 

- * AdvancedHttpResponse response = client.post("https://www.scm-manager.org")
+ * AdvancedHttpResponse response = client.post("https://scm-manager.org")
  *                                       .formContent()
  *                                       .field("firstname", "Tricia")
  *                                       .field("lastname", "McMillan")
diff --git a/scm-core/src/main/java/sonia/scm/repository/HealthCheckFailure.java b/scm-core/src/main/java/sonia/scm/repository/HealthCheckFailure.java
index d53259a6ed..58494618a8 100644
--- a/scm-core/src/main/java/sonia/scm/repository/HealthCheckFailure.java
+++ b/scm-core/src/main/java/sonia/scm/repository/HealthCheckFailure.java
@@ -47,7 +47,7 @@ import java.text.MessageFormat;
 public final class HealthCheckFailure
 {
 
-  private static final String URL_TEMPLATE = "https://www.scm-manager.org/docs/{0}/en/user/repo/health-checks/%s";
+  private static final String URL_TEMPLATE = "https://scm-manager.org/docs/{0}/en/user/repo/health-checks/%s";
   private static final String LATEST_VERSION = "latest";
 
   /**
diff --git a/scm-core/src/test/java/sonia/scm/repository/HealthCheckFailureTest.java b/scm-core/src/test/java/sonia/scm/repository/HealthCheckFailureTest.java
index e25de7d456..0441764d24 100644
--- a/scm-core/src/test/java/sonia/scm/repository/HealthCheckFailureTest.java
+++ b/scm-core/src/test/java/sonia/scm/repository/HealthCheckFailureTest.java
@@ -36,14 +36,14 @@ class HealthCheckFailureTest {
   void shouldCreateTemplatedUrl() {
     HealthCheckFailure failure = new HealthCheckFailure("1", "hyperdrive", urlForTitle("hyperdrive"), "Far too fast");
 
-    assertThat(failure.getUrl()).isEqualTo("https://www.scm-manager.org/docs/latest/en/user/repo/health-checks/hyperdrive");
+    assertThat(failure.getUrl()).isEqualTo("https://scm-manager.org/docs/latest/en/user/repo/health-checks/hyperdrive");
   }
 
   @Test
   void shouldCreateTemplatedUrlForGivenVersion() {
     HealthCheckFailure failure = new HealthCheckFailure("1", "hyperdrive", urlForTitle("hyperdrive"), "Far too fast");
 
-    assertThat(failure.getUrl("1.17.x")).isEqualTo("https://www.scm-manager.org/docs/1.17.x/en/user/repo/health-checks/hyperdrive");
+    assertThat(failure.getUrl("1.17.x")).isEqualTo("https://scm-manager.org/docs/1.17.x/en/user/repo/health-checks/hyperdrive");
   }
 
   @Test
diff --git a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
index 09407daab9..698acc83de 100644
--- a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
@@ -28,11 +28,11 @@
 
 
   
 
   
@@ -44,7 +44,7 @@
       
     
   
-  
+
   
@@ -102,7 +102,7 @@
     
     /var/cache/scm/work/work/docroot
   
-  
+
   
     
       
@@ -117,5 +117,5 @@
       
     
   
-  
+
 
diff --git a/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml b/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
index 09407daab9..698acc83de 100644
--- a/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
@@ -28,11 +28,11 @@
 
 
   
 
   
@@ -44,7 +44,7 @@
       
     
   
-  
+
   
@@ -102,7 +102,7 @@
     
     /var/cache/scm/work/work/docroot
   
-  
+
   
     
       
@@ -117,5 +117,5 @@
       
     
   
-  
+
 
diff --git a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
index 029943983e..698acc83de 100644
--- a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
@@ -28,11 +28,11 @@
 
 
   
 
   
@@ -44,7 +44,7 @@
       
     
   
-  
+
   
@@ -102,7 +102,7 @@
     
     /var/cache/scm/work/work/docroot
   
-  
+
   
     
       
diff --git a/scm-packaging/unix/src/main/fs/README.txt b/scm-packaging/unix/src/main/fs/README.txt
index 6a33ae7b75..d9d130f382 100644
--- a/scm-packaging/unix/src/main/fs/README.txt
+++ b/scm-packaging/unix/src/main/fs/README.txt
@@ -11,4 +11,4 @@ FSupport:
 
  Do you have any questions or do you need support? Have a look at:
 
- https://www.scm-manager.org/support/
+ https://scm-manager.org/support/
diff --git a/scm-packaging/unix/src/main/fs/conf/server-config.xml b/scm-packaging/unix/src/main/fs/conf/server-config.xml
index ca351ab1bc..c7518e97a0 100644
--- a/scm-packaging/unix/src/main/fs/conf/server-config.xml
+++ b/scm-packaging/unix/src/main/fs/conf/server-config.xml
@@ -28,11 +28,11 @@
 
 
   
 
   
@@ -44,7 +44,7 @@
       
     
   
-  
+
   
@@ -106,7 +106,7 @@
       /work/docroot
     
   
-  
+
   
     
       
diff --git a/scm-packaging/windows/src/main/fs/README.txt b/scm-packaging/windows/src/main/fs/README.txt
index 0d916728c7..a9ec879c04 100644
--- a/scm-packaging/windows/src/main/fs/README.txt
+++ b/scm-packaging/windows/src/main/fs/README.txt
@@ -29,4 +29,4 @@ Support:
 
 Do you have any questions or do you need support? Have a look at:
 
-https://www.scm-manager.org/support/
+https://scm-manager.org/support/
diff --git a/scm-packaging/windows/src/main/fs/conf/server-config.xml b/scm-packaging/windows/src/main/fs/conf/server-config.xml
index 5e3a6c8fd9..568134ffdd 100644
--- a/scm-packaging/windows/src/main/fs/conf/server-config.xml
+++ b/scm-packaging/windows/src/main/fs/conf/server-config.xml
@@ -28,11 +28,11 @@
 
 
   
 
   
@@ -44,7 +44,7 @@
       
     
   
-  
+
   
@@ -107,7 +107,7 @@
       /work/docroot
     
   
-  
+
   
     
       
diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
index dcfbed4ded..497cd49332 100644
--- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
@@ -57741,7 +57741,7 @@ exports[`Storyshots Layout|Footer Default 1`] = `
           
  • 
             
@@ -57769,7 +57769,7 @@ exports[`Storyshots Layout|Footer Default 1`] = `
           
  • 
             
@@ -57867,7 +57867,7 @@ exports[`Storyshots Layout|Footer Full 1`] = `
           
  • 
             
@@ -57915,7 +57915,7 @@ exports[`Storyshots Layout|Footer Full 1`] = `
           
  • 
             
@@ -58014,7 +58014,7 @@ exports[`Storyshots Layout|Footer With Avatar 1`] = `
           
  • 
             
@@ -58042,7 +58042,7 @@ exports[`Storyshots Layout|Footer With Avatar 1`] = `
           
  • 
             
@@ -58132,7 +58132,7 @@ exports[`Storyshots Layout|Footer With Plugin Links 1`] = `
           
  • 
             
@@ -58180,7 +58180,7 @@ exports[`Storyshots Layout|Footer With Plugin Links 1`] = `
           
  • 
             
diff --git a/scm-ui/ui-components/src/layout/Footer.tsx b/scm-ui/ui-components/src/layout/Footer.tsx
index bc76bc468b..0d7bd809c4 100644
--- a/scm-ui/ui-components/src/layout/Footer.tsx
+++ b/scm-ui/ui-components/src/layout/Footer.tsx
@@ -109,11 +109,11 @@ const Footer: FC = ({ me, version, links }) => {
             
           ) : null}
           }>
-            
+            
             
           
           }>
-            
+