From 1407348045de016eed992f742e5c33e93a7a1f42 Mon Sep 17 00:00:00 2001
From: silveruser <devteam@silverpeas.net>
Date: Wed, 10 Jun 2020 14:41:19 +0000
Subject: [PATCH 1/6] Release of 6.1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9bfb695..c6e4872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<groupId>org.silverpeas</groupId>
<artifactId>silverpeas-distribution</artifactId>
- <version>6.1-SNAPSHOT</version>
+ <version>6.1</version>
<name>Distribution of Silverpeas ${project.version}</name>
<description>
It generates a distribution of Silverpeas ${project.version} for both Unix-like and Windows
@@ -42,7 +42,7 @@
<developerConnection>scm:git:git@github.com:Silverpeas/Silverpeas-Distribution.git</developerConnection>
<connection>scm:git:git@github.com:Silverpeas/Silverpeas-Distribution.git</connection>
<url>http://github.com/Silverpeas/Silverpeas-Distribution.git</url>
- <tag>HEAD</tag>
+ <tag>6.1</tag>
</scm>
<repositories>
From a01833a62fe9274b0153ef96c3692c04f10c5476 Mon Sep 17 00:00:00 2001
From: silveruser <devteam@silverpeas.net>
Date: Wed, 10 Jun 2020 14:41:36 +0000
Subject: [PATCH 2/6] Prepare branch 6.1.x for bug fixes
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index c6e4872..2c74198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<groupId>org.silverpeas</groupId>
<artifactId>silverpeas-distribution</artifactId>
- <version>6.1</version>
+ <version>6.1.1-SNAPSHOT</version>
<name>Distribution of Silverpeas ${project.version}</name>
<description>
It generates a distribution of Silverpeas ${project.version} for both Unix-like and Windows
@@ -42,7 +42,7 @@
<developerConnection>scm:git:git@github.com:Silverpeas/Silverpeas-Distribution.git</developerConnection>
<connection>scm:git:git@github.com:Silverpeas/Silverpeas-Distribution.git</connection>
<url>http://github.com/Silverpeas/Silverpeas-Distribution.git</url>
- <tag>6.1</tag>
+ <tag>HEAD</tag>
</scm>
<repositories>
@@ -81,7 +81,7 @@
<properties>
<!-- property used by the CI to both deploy a build version and release the next stable version -->
- <next.release>6.1</next.release>
+ <next.release>6.1.1</next.release>
<server.distribution>wildfly18</server.distribution>
</properties>
From 1b5c781bc999080e257fbea180f6814811d981b6 Mon Sep 17 00:00:00 2001
From: Miguel Moquillon <miguel.moquillon@gmail.com>
Date: Tue, 8 Sep 2020 14:30:25 +0200
Subject: [PATCH 3/6] Update the POM by setting the repo access through HTTPS
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2c74198..428f7b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<scm>
<developerConnection>scm:git:git@github.com:Silverpeas/Silverpeas-Distribution.git</developerConnection>
<connection>scm:git:git@github.com:Silverpeas/Silverpeas-Distribution.git</connection>
- <url>http://github.com/Silverpeas/Silverpeas-Distribution.git</url>
+ <url>https://github.com/Silverpeas/Silverpeas-Distribution.git</url>
<tag>HEAD</tag>
</scm>
@@ -50,7 +50,7 @@
<id>Silverpeas</id>
<layout>default</layout>
<name>Silverpeas Repository</name>
- <url>http://www.silverpeas.org/nexus/content/groups/silverpeas</url>
+ <url>https://www.silverpeas.org/nexus/content/groups/silverpeas</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -65,13 +65,13 @@
<id>silverpeas</id>
<name>Repository Silverpeas</name>
<layout>default</layout>
- <url>http://www.silverpeas.org/nexus/content/repositories/releases/</url>
+ <url>https://www.silverpeas.org/nexus/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>silverpeas-snapshots</id>
<name>Snapshots Repository Silverpeas</name>
<layout>default</layout>
- <url>http://www.silverpeas.org/nexus/content/repositories/snapshots/</url>
+ <url>https://www.silverpeas.org/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
<site>
<id>silverpeas_repository</id>
From a7550d85a167bf5a9e252ed1d543c1dc730b4f3e Mon Sep 17 00:00:00 2001
From: silveruser <devteam@silverpeas.net>
Date: Tue, 15 Dec 2020 14:04:16 +0000
Subject: [PATCH 4/6] 6.1.1 has been released from commit
1b5c781bc999080e257fbea180f6814811d981b6 (build version 6.1.1-build201215).
Prepare for development iteration of next version 6.1.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 428f7b8..9a4cc55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<groupId>org.silverpeas</groupId>
<artifactId>silverpeas-distribution</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>6.1.2-SNAPSHOT</version>
<name>Distribution of Silverpeas ${project.version}</name>
<description>
It generates a distribution of Silverpeas ${project.version} for both Unix-like and Windows
@@ -81,7 +81,7 @@
<properties>
<!-- property used by the CI to both deploy a build version and release the next stable version -->
- <next.release>6.1.1</next.release>
+ <next.release>6.1.2</next.release>
<server.distribution>wildfly18</server.distribution>
</properties>
From 2c1de09b276e4aa8622563451ebd70a4f24759ce Mon Sep 17 00:00:00 2001
From: silveruser <devteam@silverpeas.net>
Date: Wed, 27 Jan 2021 19:37:44 +0000
Subject: [PATCH 5/6] 6.1.2 has been released from commit
a7550d85a167bf5a9e252ed1d543c1dc730b4f3e (build version 6.1.2-build210127).
Prepare for development iteration of next version 6.1.3
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9a4cc55..3b62a78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<groupId>org.silverpeas</groupId>
<artifactId>silverpeas-distribution</artifactId>
- <version>6.1.2-SNAPSHOT</version>
+ <version>6.1.3-SNAPSHOT</version>
<name>Distribution of Silverpeas ${project.version}</name>
<description>
It generates a distribution of Silverpeas ${project.version} for both Unix-like and Windows
@@ -81,7 +81,7 @@
<properties>
<!-- property used by the CI to both deploy a build version and release the next stable version -->
- <next.release>6.1.2</next.release>
+ <next.release>6.1.3</next.release>
<server.distribution>wildfly18</server.distribution>
</properties>
From e6979666d6ecce4be4a9b4b56ba00dad4eff4861 Mon Sep 17 00:00:00 2001
From: silveruser <devteam@silverpeas.net>
Date: Thu, 29 Apr 2021 09:34:49 +0000
Subject: [PATCH 6/6] 6.1.3 has been released from commit
2c1de09b276e4aa8622563451ebd70a4f24759ce (build version 6.1.3-build210428).
Prepare for development iteration of next version 6.1.4
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3b62a78..630e6d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<groupId>org.silverpeas</groupId>
<artifactId>silverpeas-distribution</artifactId>
- <version>6.1.3-SNAPSHOT</version>
+ <version>6.1.4-SNAPSHOT</version>
<name>Distribution of Silverpeas ${project.version}</name>
<description>
It generates a distribution of Silverpeas ${project.version} for both Unix-like and Windows
@@ -81,7 +81,7 @@
<properties>
<!-- property used by the CI to both deploy a build version and release the next stable version -->
- <next.release>6.1.3</next.release>
+ <next.release>6.1.4</next.release>
<server.distribution>wildfly18</server.distribution>
</properties>