You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/05/01 15:59:13 UTC
[plc4x] branch develop updated (b448eae -> 195df3b)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from b448eae - Updated the RELEASE_NOTES in preparation of the next release
new a1fe24c - Made the OKs appear alligned with the rest.
new 195df3b - Made the autoVersionSubmodules a default setting for the release plugin - Removed the autoVersionSubmodules property from the documentation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 ++
src/main/script/prerequisiteCheck.groovy | 8 ++++----
src/site/asciidoc/developers/release/build-tools.adoc | 9 +++------
src/site/asciidoc/developers/release/release.adoc | 13 +++++--------
4 files changed, 14 insertions(+), 18 deletions(-)
[plc4x] 02/02: - Made the autoVersionSubmodules a default setting
for the release plugin - Removed the autoVersionSubmodules property from
the documentation
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 195df3b8dfd935daa146482d1910c973ad2d7f53
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri May 1 17:58:51 2020 +0200
- Made the autoVersionSubmodules a default setting for the release plugin
- Removed the autoVersionSubmodules property from the documentation
---
pom.xml | 2 ++
src/site/asciidoc/developers/release/build-tools.adoc | 9 +++------
src/site/asciidoc/developers/release/release.adoc | 13 +++++--------
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index be50c70..6932577 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1364,6 +1364,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
+ <!-- Tell the plugin to always release all modules using the same version -->
+ <autoVersionSubmodules>true</autoVersionSubmodules>
<!-- Set the line separator to the unix style separator (Needed for reproducible builds -->
<arguments>-Papache-release -Dline.separator='\n' ${arguments}</arguments>
</configuration>
diff --git a/src/site/asciidoc/developers/release/build-tools.adoc b/src/site/asciidoc/developers/release/build-tools.adoc
index 8433b55..781f922 100644
--- a/src/site/asciidoc/developers/release/build-tools.adoc
+++ b/src/site/asciidoc/developers/release/build-tools.adoc
@@ -45,17 +45,14 @@ This can and should be automated by the `maven-release-plugin`.
Per default the plugin will ask for the working copy version during the build execution.
This is the version the `develop` branch will be changed to.
-The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
-Otherwise we would have to define the working copy version for each module.
-
- mvn release:branch -DbranchName=rel/code-generation/{minor-version} -DautoVersionSubmodules=true
+ mvn release:branch -DbranchName=rel/code-generation/{minor-version}
Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
So in case of preparing the release branch for `{project.version}` the command would be the following:
[subs="verbatim,attributes"]
----
- mvn release:branch -DbranchName=rel/code-generation/{current-short-version} -DautoVersionSubmodules=true
+ mvn release:branch -DbranchName=rel/code-generation/{current-short-version}
----
The plugin will then aks for the version:
@@ -120,7 +117,7 @@ In order to prepare a release-candidate, the first step is switching to the corr
After that, the following command will to all preparation steps for the release:
- mvn release:prepare -DautoVersionSubmodules=true
+ mvn release:prepare
In general the plugin will now ask you 3 questions:
diff --git a/src/site/asciidoc/developers/release/release.adoc b/src/site/asciidoc/developers/release/release.adoc
index c45c354..f08b54a 100644
--- a/src/site/asciidoc/developers/release/release.adoc
+++ b/src/site/asciidoc/developers/release/release.adoc
@@ -29,14 +29,14 @@ IMPORTANT: Please be sure to execute the release with a Java version between 1.8
* [ ] Create release branch:
[subs="verbatim,attributes"]
----
- mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{current-short-version} -DautoVersionSubmodules=true
+ mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{current-short-version}
----
[%interactive]
* [ ] Add a new section to the `RELEASE_NOTES` on `develop`
* [ ] Prepare the release:
[subs="verbatim,attributes"]
----
- mvn release:prepare -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DautoVersionSubmodules=true
+ mvn release:prepare -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash
----
[%interactive]
* [ ] Perform the release:
@@ -142,17 +142,14 @@ This is the version the `develop` branch will be changed to.
In contrast to normal builds, it is important to enable all profiles when creating the branch as only this way will all modules versions be updated.
Otherwise the non-default modules on develop will reference the old version which will cause problems when building.
-The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
-Otherwise we would have to define the working copy version for each module.
-
- mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
+ mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{minor-version}
Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
So in case of preparing the release branch for `{current-full-version}-SNAPSHOT` the command would be the following:
[subs="verbatim,attributes"]
----
- mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{current-short-version} -DautoVersionSubmodules=true
+ mvn release:branch -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DbranchName=rel/{current-short-version}
----
The plugin will then aks for the version:
@@ -217,7 +214,7 @@ In order to prepare a release-candidate, the first step is switching to the corr
After that, the following command will to all preparation steps for the release:
- mvn release:prepare -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash -DautoVersionSubmodules=true
+ mvn release:prepare -P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash
(The `-P with-sandbox,with-cpp,with-boost,with-dotnet,with-python,with-proxies,with-logstash` tells maven to activate the all profiles that partition the build and makes sure the versions of all modules are updated as part of the release)
In general the plugin will now ask you 3 questions:
[plc4x] 01/02: - Made the OKs appear alligned with the rest.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit a1fe24cae0c297e3f4f92d56de2a0f473d008149
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri May 1 17:55:41 2020 +0200
- Made the OKs appear alligned with the rest.
---
src/main/script/prerequisiteCheck.groovy | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index 4ef1424..6ae5d01 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -34,10 +34,10 @@ def checkVersionAtLeast(String current, String minimum) {
def currentSegment = currentSegments[i].toInteger()
def minimumSegment = minimumSegments[i].toInteger()
if(currentSegment < minimumSegment) {
- println current.padRight(14) + "FAILED (required min " + minimum + " but got " + current + ")"
+ println current.padRight(14) + " FAILED (required min " + minimum + " but got " + current + ")"
return false
} else if(currentSegment > minimumSegment) {
- println current.padRight(14) + "OK"
+ println current.padRight(14) + " OK"
return true
}
}
@@ -58,10 +58,10 @@ def checkVersionAtMost(String current, String maximum) {
def currentSegment = currentSegments[i].toInteger()
def maximumSegment = maximumSegments[i].toInteger()
if(currentSegment > maximumSegment) {
- println current.padRight(14) + "FAILED (required max " + maximum + " but got " + current + ")"
+ println current.padRight(14) + " FAILED (required max " + maximum + " but got " + current + ")"
return false
} else if(currentSegment < maximumSegment) {
- println current.padRight(14) + "OK"
+ println current.padRight(14) + " OK"
return true
}
}