The remote 3.6.0 branch stays at 3.6.0-SNAPSHOT until release is complete.
The tag has the release version.

Your local branch obviously needs to be same as you create the tag from it.

Perhaps we need to word this differently in the instructions.

Thomas


On Fri, Apr 28, 2017 at 12:57 PM, Tushar Gosavi <tus...@datatorrent.com>
wrote:

> I am executing following command to prepare an RC for ApexCore 3.6.0.
>
> git checkout -b release-3.6 master
>  git checkout master
>  dv=3.6.0-SNAPSHOT
>  rv=3.7.0-SNAPSHOT
>  for a in `git grep -l "${dv}"`; do echo $a; sed -i
> 's/'"${dv}"'/'"${rv}"'/g' $a; done
>  git commit --author "Apex Dev <dev@apex.apache.org>" -am "Preparing for
> 3.7.0 development"
>  git push origin master
>  git checkout release-3.6
>  ruby ~/add-since.rb `pwd` -s 3.6.0
>  # update changelog
>  cp /tmp/CHANGELOG.md CHANGELOG.md
>  git commit --author "Apex Dev <dev@apex.apache.org>" -am "Add @since tags
> and update change log for release 3.6.0"
>  dv=3.6.0-SNAPSHOT
>  rv=3.6.0
>  for a in `git grep -l "${dv}"`; do echo $a; sed -i
> 's/'"${dv}"'/'"${rv}"'/g' $a; done
>  git commit --author "Apex Dev <dev@apex.apache.org>" -am "Preparing to
> release 3.6.0-RC1"
>  git tag -a v3.6.0-RC1 -m "Release 3.6.0-RC1"
>  git push origin v3.6.0-RC1
>
>
> At this point git diff gives empty output between the tag and branch.
> git diff v3.6.0-RC1 release-3.6
>
>
> Also git log is same for tag and branch, but a comment on release page just
> after  *git push origin v3.6.0-RC1* is
>
> The only difference between release branch and tag is this final version
> number change. The branch stays at -SNAPSHOT version.
>
>
> Is any step missing in above commands?
>
> Thanks & Regards,
> -Tushar.
>
>
>
> On Thu, Apr 27, 2017 at 2:29 PM, Tushar Gosavi <tus...@datatorrent.com>
> wrote:
>
> > All the issues marked as 3.6 have been resolved. I will go ahead and
> > prepare RC1 candidate.
> >
> > Thanks,
> > - Tushar.
> >
> > On Wed, Apr 26, 2017 at 2:30 PM, Tushar Gosavi <tus...@datatorrent.com>
> > wrote:
> >
> >> These errors went away after switching to 1.7 version of java for build.
> >>
> >> Thanks,
> >> -Tushar.
> >>
> >>
> >> On Wed, Apr 26, 2017 at 12:50 PM, Tushar Gosavi <tus...@datatorrent.com
> >
> >> wrote:
> >>
> >>> I am following process specified at http://apex.apache.org/
> release.html to
> >>> prepare a release candidate for 3.6.
> >>>
> >>> I am getting error while executing command
> >>> mvn clean apache-rat:check deploy -Papache-release -DskipTests
> >>>
> >>>
> >>> 100 warnings
> >>> [INFO] ------------------------------------------------------------
> >>> ------------
> >>> [INFO] Reactor Summary:
> >>> [INFO]
> >>> [INFO] Apache Apex ........................................ SUCCESS
> >>> [06:51 min]
> >>> [INFO] Apache Apex API .................................... FAILURE [
> >>>  5.255 s]
> >>> [INFO] Apache Apex Common Library ......................... SKIPPED
> >>> [INFO] Apache Apex Buffer Server .......................... SKIPPED
> >>> [INFO] Apache Apex Stream Processing Engine ............... SKIPPED
> >>> [INFO] Apache Apex Application Maven Archetype ............ SKIPPED
> >>> [INFO] Apache Apex App Configuration Maven Archetype ...... SKIPPED
> >>> [INFO] ------------------------------------------------------------
> >>> ------------
> >>> [INFO] BUILD FAILURE
> >>> [INFO] ------------------------------------------------------------
> >>> ------------
> >>> [INFO] Total time: 06:56 min
> >>> [INFO] Finished at: 2017-04-26T12:41:35+05:30
> >>> [INFO] Final Memory: 74M/903M
> >>> [INFO] ------------------------------------------------------------
> >>> ------------
> >>> [ERROR] Failed to execute goal org.apache.maven.plugins:
> maven-javadoc-plugin:2.9:jar
> >>> (attach-javadocs) on project apex-api: MavenReportException: Error
> while
> >>> creating archive:
> >>> [ERROR] Exit code: 1 - /home/tushar/work/apex/core/ap
> >>> i/src/main/java/com/datatorrent/api/Attribute.java:116: warning: no
> >>> description for @param
> >>> [ERROR] * @param <T>
> >>> [ERROR] ^
> >>> [ERROR] /home/tushar/work/apex/core/api/src/main/java/com/
> datatorrent/api/Attribute.java:117:
> >>> warning: no description for @param
> >>> [ERROR] * @param key
> >>> [ERROR] ^
> >>> [ERROR] /home/tushar/work/apex/core/api/src/main/java/com/
> datatorrent/api/Attribute.java:146:
> >>> warning: no description for @throws
> >>> [ERROR] * @throws java.lang.CloneNotSupportedException
> >>> [ERROR] ^
> >>> [ERROR] /home/tushar/work/apex/core/api/src/main/java/com/
> datatorrent/api/AutoMetric.java:59:
> >>> error: self-closing element not allowed
> >>> [ERROR] * It aggregates metrics from multiple physical partitions of an
> >>> operator to a logical one.<br/>
> >>> [ERROR] ^
> >>>
> >>> What is the correct command to build the release.
> >>>
> >>> Thanks,
> >>> - Tushar.
> >>>
> >>>
> >>
> >
>

Reply via email to