You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2018/02/21 20:16:42 UTC

[1/3] incubator-edgent git commit: [maven-release-plugin] prepare branch release/9.11

Repository: incubator-edgent
Updated Branches:
  refs/heads/develop 805d94302 -> 188dac1d7


[maven-release-plugin] prepare branch release/9.11


Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/4d42d2b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/4d42d2b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/4d42d2b1

Branch: refs/heads/develop
Commit: 4d42d2b1157fc1d7348ad321f16d48153f33784c
Parents: 805d943
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Feb 21 09:44:47 2018 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Feb 21 09:44:47 2018 -0500

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/4d42d2b1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bbe6867..782d42a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-edgent.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-edgent.git</developerConnection>
     <url>https://github.com/apache/incubator-edgent</url>
-    <tag>HEAD</tag>
+    <tag>release/9.11</tag>
   </scm>
 
   <properties>


[3/3] incubator-edgent git commit: release doc tweaks

Posted by dl...@apache.org.
release doc tweaks

Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/188dac1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/188dac1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/188dac1d

Branch: refs/heads/develop
Commit: 188dac1d7309a0cd1905a51c2e7d7a0ee46af25f
Parents: 866ed69
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Feb 21 14:45:37 2018 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Feb 21 14:45:37 2018 -0500

----------------------------------------------------------------------
 src/site/asciidoc/releasing.adoc | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/188dac1d/src/site/asciidoc/releasing.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/releasing.adoc b/src/site/asciidoc/releasing.adoc
index efa0a75..3615483 100644
--- a/src/site/asciidoc/releasing.adoc
+++ b/src/site/asciidoc/releasing.adoc
@@ -111,16 +111,17 @@ Notes:
 
 In this phase on the release branch, the poms Edgent versions are changed to the specified release version, a full build with all tests is run, and a commit is done with this state and tagged. After that the release branch poms Edgent versions are set to the first/next specified `major.minor.bugfix-SNAPSHOT` bugfix development version and this update is committed.  The commits are automatically pushed.
 
-WARNING: at this moment the new edgent-deployment-filter-maven-plugin (EDGENT-440) is not yet released and the release:prepare below will fail with `There are still some remaining snapshot dependencies.`  To work around that for the moment, add `-DignoreSnapshots` to the `mvn release:prepare` below.  I'm not sure but prior to doing the prepare you may need to build the plugin and install it in your maven cache (`cd utils/edgent-deployment-filter-maven-plugin; mvn install`).
-
 Prepare the release branch:
 
     git checkout release/1.2  # the branch from "Creating the Release Branch"
     
+    # see note below for -DignoreSnapshots=true
     mvn release:prepare -DreleaseVersion=1.2.0 -Dtag=edgent-1.2.0 -DdevelopmentVersion=1.2.1-SNAPSHOT -DautoVersionSubmodules=true -P platform-android,platform-java7,distribution 
     
     git status  # should report nothing ahead/behind. Do 'git push' if needed.
 
+NOTE: the new edgent-deployment-filter-maven-plugin (EDGENT-440) is not yet released and the release:prepare will fail with `There are still some remaining snapshot dependencies.`  Add `-DignoreSnapshots=true` to the `mvn release:prepare` to workaround that.  Build the plugin first if there seem to be other issues (`cd utils/edgent-deployment-filter-maven-plugin; mvn install`).
+
 Now would be a good time to update the "[DISCUSS]" thread with the branch and tag info if you so choose.
 
 If you need to restart because of error or the process is cancelled, then run the `release:prepare` again to pick up where it left off.
@@ -157,9 +158,6 @@ Create the release candidate:
 
     git checkout release/1.2  # the branch from "Creating the release branch"
     
-    # Hmm... does -DskipTests work with the following?  Tests take a long
-    # time and normally one has just gone through them all in the Prepare step.
-    
     mvn release:perform -DreleaseProfiles=platform-android,platform-java7
 
 After this step is successful, a Nexus staging repository named `orgapacheedgent-####` will have been created at at https://repository.apache.org and populated with all of the release candidate's artifacts. The last four digits are generated by Nexus.
@@ -168,9 +166,6 @@ After this step is successful, a Nexus staging repository named `orgapacheedgent
 
 The `release:perform` stages some undesired artifacts.  See EDGENT-440.
 
-TODO: what's needed to manually delete these? "Delete" each via the UI?
-What about the state of the metadata artifacts, do they reference those deleted items?
-
 Minimally, log into Nexus and select the staging repository as described below in `Close the Staging Repository`, and manually select and delete the various `source-release` files in `org/apache/edgent/edgent-parent` using the browser UI.
 
 === Nexus Authentication Setup
@@ -204,7 +199,7 @@ Close the Nexus staging repository:
     login to https://repository.apache.org/  with your Apache credentials
     select "Staging Repositories" in the section "Build Promotion"
     click on the orgapacheedgent-#### staging repository
-    click on the Close button
+    click on the Close button  #  set the description to "Apache Edgent X.Y.Z-RC<n>"
 
 A number of pre-configured tests are executed automatically:
 


[2/3] incubator-edgent git commit: [maven-release-plugin] prepare for next development iteration

Posted by dl...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/866ed691
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/866ed691
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/866ed691

Branch: refs/heads/develop
Commit: 866ed691d3a51263c17db98d7081e13c1176d09e
Parents: 4d42d2b
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Feb 21 09:44:54 2018 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Feb 21 09:44:54 2018 -0500

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/866ed691/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 782d42a..bbe6867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-edgent.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-edgent.git</developerConnection>
     <url>https://github.com/apache/incubator-edgent</url>
-    <tag>release/9.11</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>