You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/06/13 14:47:19 UTC

[1/3] ant-ivyde git commit: Update year in copyright message

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 2e88175b9 -> 89a3ebcc7


Update year in copyright message


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/d733ac80
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/d733ac80
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/d733ac80

Branch: refs/heads/master
Commit: d733ac804e35fc319fa539431af0f09cd4a88574
Parents: 2e88175
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Wed Jun 13 20:04:55 2018 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Wed Jun 13 20:04:55 2018 +0530

----------------------------------------------------------------------
 doc/templates/articles/document.html.slim | 2 +-
 doc/templates/book/document.html.slim     | 2 +-
 doc/templates/eclipse/document.html.slim  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/d733ac80/doc/templates/articles/document.html.slim
----------------------------------------------------------------------
diff --git a/doc/templates/articles/document.html.slim b/doc/templates/articles/document.html.slim
index b5d7131..8c1ffe2 100644
--- a/doc/templates/articles/document.html.slim
+++ b/doc/templates/articles/document.html.slim
@@ -78,7 +78,7 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
       div id="footer-message" class="footer"
         hr/
         i
-          | Copyright &#169; 2017 The Apache Software Foundation, Licensed under the
+          | Copyright &#169; 2018 The Apache Software Foundation, Licensed under the
           a href="http://www.apache.org/licenses/" Apache License, Version 2.0
           | .
         br/

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/d733ac80/doc/templates/book/document.html.slim
----------------------------------------------------------------------
diff --git a/doc/templates/book/document.html.slim b/doc/templates/book/document.html.slim
index 126676e..fe33ed1 100644
--- a/doc/templates/book/document.html.slim
+++ b/doc/templates/book/document.html.slim
@@ -42,7 +42,7 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
       div id="footer-message" class="footer"
         hr/
         i
-          | Copyright &#169; 2017 The Apache Software Foundation, Licensed under the
+          | Copyright &#169; 2018 The Apache Software Foundation, Licensed under the
           a href="http://www.apache.org/licenses/" Apache License, Version 2.0
           | .
         br/

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/d733ac80/doc/templates/eclipse/document.html.slim
----------------------------------------------------------------------
diff --git a/doc/templates/eclipse/document.html.slim b/doc/templates/eclipse/document.html.slim
index f64412f..f19792c 100644
--- a/doc/templates/eclipse/document.html.slim
+++ b/doc/templates/eclipse/document.html.slim
@@ -32,7 +32,7 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
       div id="footer-message" class="footer"
         hr/
         i
-          | Copyright &#169; 2017 The Apache Software Foundation, Licensed under the
+          | Copyright &#169; 2018 The Apache Software Foundation, Licensed under the
           a href="http://www.apache.org/licenses/" Apache License, Version 2.0
           | .
         br/


[3/3] ant-ivyde git commit: Update release instructions

Posted by ja...@apache.org.
Update release instructions


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/89a3ebcc
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/89a3ebcc
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/89a3ebcc

Branch: refs/heads/master
Commit: 89a3ebcc75e3dde10f989dc5f60fb398b82d63a2
Parents: b7a80d3
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Wed Jun 13 20:10:24 2018 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Wed Jun 13 20:10:24 2018 +0530

----------------------------------------------------------------------
 doc/src/dev/release.adoc    | 78 +++++++++++++---------------------------
 doc/src/dev/updatesite.adoc | 26 +++++++-------
 2 files changed, 37 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/89a3ebcc/doc/src/dev/release.adoc
----------------------------------------------------------------------
diff --git a/doc/src/dev/release.adoc b/doc/src/dev/release.adoc
index d1daa97..f3802c5 100644
--- a/doc/src/dev/release.adoc
+++ b/doc/src/dev/release.adoc
@@ -18,7 +18,7 @@
 ////
 
 This documentation is defining every steps that needs to be accomplished when releasing Apache IvyDE.
-In this doc, the released version is denoted as $VERSION, so it HAVE to be replaced in the command line argument accordingly. There is also some $LOGIN which is referencing your login on the Apache machines.
+In this doc, the released version is denoted as $VERSION, so it HAS to be replaced in the command line argument accordingly. There is also some $LOGIN which is referencing your login on the Apache machines.
 
 == Prepare
 
@@ -28,88 +28,58 @@ First in link:https://issues.apache.org/jira/browse/IVYDE[Jira] make sure that n
 
 === Release notes
 
-Make sure the release notes and the annoucement are up to date. Look at doc/release-notes.html. Remove there anything which refers to a draft status.
+Make sure the release notes and the annoucement are up to date in doc/src/release-notes.adoc.
 
 === Last checks
 
-Make sure that there is no missing ASL header in the source files. The build of IvyDE generate a report there: https://builds.apache.org/job/IvyDE/lastSuccessfulBuild/artifact/trunk/work/rat/report.txt
+Make sure that there is no missing ASL header in the source files. The build of IvyDE generate a report there: https://builds.apache.org/job/IvyDE/lastSuccessfulBuild/artifact/work/rat/report.txt
 
 Make sure the copyright year in the NOTICE file is the current year.
 
-Make sure the copyright year in the html template is the current year; the 3 template files to check are: `template.html`, `template-eclipse.html` and `printTemplate.html`.
+Make sure the copyright year in the asciidoc template files is the current year; the 3 template files to check are:
+  - `doc/templates/book/document.html.slim`
+  - `doc/templates/articles/document.html.slim`
+  - `doc/templates/eclipse/document.html.slim`
 
-=== Release branch
 
-Some modifications of the branch are need to do the release. So a new branch is needed:
+== Building for release
 
-[source]
-----
-svn copy https://svn.apache.org/repos/asf/ant/ivy/ivyde/trunk \
-           https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION \
-      -m "Creating a release branch for IvyDE $VERSION"
-----
-
-and then checkout it:
+Make sure you have a proper working copy with a `git status`. You should have no modification.
 
-[source]
-----
-svn co https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION ivyde-$VERSION
-----
+Edit the `build.properties` and update the value of the `version.qualifier` property to an appropriate qualifier. For example, if you want to release the `Final` version of `2.3.0` then the `version.qualifier` value is expected to be `Final`. Similarly, if you are releasing `rc1` of `2.3.0` then the value for this property will be `rc1`
 
-=== Documentation release
-
-The documentation have to specify the correct version number:
-In the files:
+Then launch the build:
 
-* doc/template.html +
-The header should look like this
 [source]
 ----
-<title>${title} | Apache IvyDE $VERSION Documentation</title>
+ant /release clean dist -DbaseLocation=/home/me/...../eclipse/
 ----
 
-You'll need to fix the revision of the svn:external in doc. Edit the svn:external property on the folder doc and set it to the latest revision. It should look like:
+And sign the artifacts:
 
 [source]
 ----
-xooki -r1306546 https://svn.apache.org/repos/asf/ant/site/xooki/
-style -r1306546 https://svn.apache.org/repos/asf/ant/site/ivyde/sources/style/
+./signArtifacts.sh
 ----
 
-=== Commit your changes
-
-Don't forget to commit the changes you've done into the release branch.
-
-== Building
-
-Make sure you have a proper working copy with a `svn status`. You should have no modification.
-
-Then launch the build:
+Then it is time to tag the release as soon as you are happy with your artifacts:
 
 [source]
 ----
-ant /release clean dist -DbaseLocation=/home/me/...../eclipse/
+git tag $VERSION -m "Tag IvyDE release $VERSION"
 ----
 
-And sign the artifacts:
+For example, for tagging the `2.3.0-rc1` release, use:
 
 [source]
 ----
-./signArtifacts.sh
+git tag 2.3.0-rc1 -m "Tag IvyDE release 2.3.0-rc1"
 ----
 
-Then it is time to tag the release as soon as you are happy with your artifacts:
-
-[source]
-----
-svn copy https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION \
-           https://svn.apache.org/repos/asf/ant/ivy/ivyde/tags/$VERSION \
-      -m "Tag IvyDE release $VERSION"
-----
 
 == Prepare the updatesite
 
-The instructions to build the updatesite are link:updatesite{outfilesuffix}[there].
+The instructions to build the updatesite are in `doc/src/dev/updatesite.adoc`.
 
 == Vote for the released artifacts
 
@@ -125,7 +95,7 @@ Subject: [VOTE] IvyDE $VERSION Release
 
 I have built a release candidate for Apache IvyDE $VERSION
 
-The tag is here: http://svn.apache.org/repos/asf/ant/ivy/ivyde/tags/$VERSION
+The tag is here: https://git1-us-west.apache.org/repos/asf?p=ant-ivyde.git;a=commit;h=refs/tags/$VERSION
 
 You can download the distribution from this URL: https://dist.apache.org/repos/dist/dev/ant/ivyde/$VERSION
 
@@ -166,7 +136,7 @@ Follow the instructions of that link:updatesite{outfilesuffix}#deployment[page].
 
 The annoucement should have been already prepared and reviewed by other committers. Its content can be found in doc/release-notes.html.
 
-With that content, send a mail to announce@apache.org, ivy-user@ant.apache.org and dev@ant.apache.org with the title "[ANNOUNCE] Apache IvyDE $VERSION released", and with your apache email as sender (announce@ requires it). 
+With that content, send a mail to announce@apache.org, ivy-user@ant.apache.org and dev@ant.apache.org with the title "[ANNOUNCE] Apache IvyDE $VERSION released", and with your apache email as sender (announce@ requires it).
 
 == Update the documentation
 
@@ -181,17 +151,17 @@ First we need to update the external links. In svn/site/ivyde/sources/history:
 svn pe svn:externals .
 ----
 
-And: 
+And:
 * update latest-milestone:
 [source]
 ----
-latest-milestone https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION/doc 
+latest-milestone https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION/doc
 ----
 
 * add an entry:
 [source]
 ----
-$VERSION https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION/doc 
+$VERSION https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION/doc
 ----
 
 Then we need to edit svn/site/ivyde/sources/toc.json:

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/89a3ebcc/doc/src/dev/updatesite.adoc
----------------------------------------------------------------------
diff --git a/doc/src/dev/updatesite.adoc b/doc/src/dev/updatesite.adoc
index baf77be..e6c773e 100644
--- a/doc/src/dev/updatesite.adoc
+++ b/doc/src/dev/updatesite.adoc
@@ -25,14 +25,9 @@ Important note: in this doc, the released version is denoted as $VERSION (and ha
 
 == [[setup]]Build a p2 repository
 
-The svn location of the updatesite builder is there: https://svn.apache.org/repos/asf/ant/ivy/updatesite/trunk . We will build the p2 repository dedicated to the version to release.
+The svn location of the updatesite builder is at: https://svn.apache.org/repos/asf/ant/ivy/updatesite/trunk .
 
-* For an Ivy release:
-As you have a build jar for Ivy, just do:
-[source]
-----
-ant build-ivy-p2-repo -Divy.jar=...../path/to/ivy.jar
-----
+Checkout that SVN repo and `cd` to the `trunk` directory. We will build the p2 repository dedicated to the version to release.
 
 * For an IvyDE release:
 The zip distribution needs to be unpacked into the updatesite directory:
@@ -43,22 +38,27 @@ ant build-ivyde-p2-repo -Divyde.zip=...../path/to/org.apache.ivyde.feature-${VER
 
 Now the binary files need to be signed.
 
-* For an Ivy release:
+* For an IvyDE release:
 [source]
 ----
-./signArtifacts.sh ivy-${VERSION}
+./signArtifacts.sh ivyde-${VERSION}
 ----
-* For an IvyDE release:
+
+Example:
+
 [source]
 ----
-./signArtifacts.sh ivyde-${VERSION}
+./signArtifacts.sh ivyde-2.3.0.beta1-201806131514-RELEASE
 ----
 
+
 And finally commit your changes in `dist/dev` (this will put the p2 repository in the dev space of the dist repository).
 
 === Test the updatesite
 
-The updatesite is ready to be tested at: `https://dist.apache.org/repos/dist/dev/ant/ivyde/updatesite/ivyde-${VERSION} `
+The updatesite is ready to be tested at: `https://dist.apache.org/repos/dist/dev/ant/ivyde/updatesite/ivyde-${VERSION}`
+
+*NOTE*: It's now time to wait for the release VOTE to pass before deciding on and following the rest of the steps in this document.
 
 === In case of an unaccepted release
 
@@ -96,7 +96,7 @@ NB: adding or removing lines in `versions.xml` infer that you should edit the `s
 
 === Publish the p2 repository data
 
-It is just about moving data (svn rm is not allowed, the two steps are required): 
+It is just about moving data (svn rm is not allowed, the two steps are required):
 [source]
 ----
 svn mv https://dist.apache.org/repos/dist/dev/ant/ivyde/updatesite/ivyde-$VERSION https://dist.apache.org/repos/dist/release/ant/ivyde/updatesite/ -m 'publishing the p2 repo of the release of IvyDE $VERSION'


[2/3] ant-ivyde git commit: Update release notes in preparation of release

Posted by ja...@apache.org.
Update release notes in preparation of release


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/b7a80d39
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/b7a80d39
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/b7a80d39

Branch: refs/heads/master
Commit: b7a80d393e4fe0aa3645e070025b78e131bd8688
Parents: d733ac8
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Wed Jun 13 20:10:12 2018 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Wed Jun 13 20:10:12 2018 +0530

----------------------------------------------------------------------
 doc/src/release-notes.adoc | 79 +++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/b7a80d39/doc/src/release-notes.adoc
----------------------------------------------------------------------
diff --git a/doc/src/release-notes.adoc b/doc/src/release-notes.adoc
index e597bc6..920fcd4 100644
--- a/doc/src/release-notes.adoc
+++ b/doc/src/release-notes.adoc
@@ -18,63 +18,72 @@
 ////
 
 . link:#annoucement[Release Annoucement]
-. link:#what[What is Apache IvyDE?]    
-. link:#status[Status of this release]
+. link:#what[What is Apache IvyDE?]
 . link:#majorchanges[Major Changes in this Release]
-. link:#contrib[Committers and Contributors for this Release]
 . link:#changes[List of Changes in this Release]
+. link:#contrib[Committers and Contributors for this Release]
 
 == [[annoucement]]Release Annoucement
 
-[source]
-----
-The Apache IvyDE project is pleased to announce its 2.3.0 release.
+The Apache IvyDE project is pleased to announce its 2.3.0-rc1 release.
 
 The Apache IvyDE Eclipse plugin integrates Apache Ivy's dependency management into Eclipse. It lets you manage your dependencies declared in an ivy.xml in your Java Eclipse projects, or any other kind of project which needs dependency management. Apache IvyDE will contribute to the classpath of your Java project or you can make it retrieve your dependencies directly into your project. Last but not least Apache IvyDE offer editors of ivy.xml and ivysettings.xml files with completion. Get some preview here: http://ant.apache.org/ivy/ivyde/screenshots.html
 
-Major changes in this release:
+== [[what]]What is Apache IvyDE?
+
+Apache IvyDE is the Eclipse plugin which integrates Apache Ivy's dependency management into Eclipse(TM).
+
+Apache IvyDE lets you manage your dependencies declared in an ivy.xml in your Java Eclipse projects, or any other kind of project which needs dependency management. Apache IvyDE will contribute to the classpath of your Java project or you can make it retrieve your dependencies directly into your project. Last but not least Apache IvyDE offer editors of ivy.xml and ivysettings.xml files with completion. Get some preview here: http://ant.apache.org/ivy/ivyde/screenshots.html.
+
+=== [[majorchanges]]Major changes in this release:
 
-IvyDE can now manage credentials stored in a secured store. Rather than putting passwords for HTTP Authentication in a property file, IvyDE allow you to use the secure storage capability of Eclipse and your OS to store them. See the new "Security" panel in the global preferences of IvyDE.
+IvyDE can now manage credentials stored in a secured store. Rather than putting passwords for HTTP Authentication in a property file, IvyDE allows you to use the secure storage capability of Eclipse and your OS to store them. See the new "Security" panel in the global preferences of IvyDE.
 
-Compatibility:
+=== Compatibility:
 
 IvyDE now requires Java 7 and Eclipse 4.3 aka Eclipse Kepler as minimum.
 
-A more detailed release notes can be read there:
+A more detailed release notes can be read at:
 http://ant.apache.org/ivy/ivyde/history/latest-milestone/release-notes.html
 
-Download the 2.3.0 release at:
+Download the release at:
 http://ant.apache.org/ivy/ivyde/download.cgi
 
 Or use directly the Apache IvyDE's updatesite:
 http://www.apache.org/dist/ant/ivyde/updatesite
 
-Issues should be reported to:
+Issues should be reported at:
 https://issues.apache.org/jira/browse/IVYDE
 
 More information can be found on the Apache IvyDE website:
 http://ant.apache.org/ivy/ivyde/
-----
-
-== [[what]]What is Apache IvyDE?
-
-Apache IvyDE is the Eclipse plugin which integrates Apache Ivy's dependency management into Eclipse(TM).
 
-Apache IvyDE lets you manage your dependencies declared in an ivy.xml in your Java Eclipse projects, or any other kind of project which needs dependency management. Apache IvyDE will contribute to the classpath of your Java project or you can make it retrieve your dependencies directly into your project. Last but not least Apache IvyDE offer editors of ivy.xml and ivysettings.xml files with completion. Get some preview here: http://ant.apache.org/ivy/ivyde/screenshots.html.
+== [[changes]]List of Changes in this Release
 
-== [[status]]Status of this release
+List of changes since link:/ivy/ivyde/history/2.2.0.final/release-notes.html[Apache IvyDE 2.2.0 final]:
 
-!!!! TODO !!!!
+* FIX: xml bomb in workspace causes hang in Ivy code during Search or Synchronize operations (jira:IVYDE-354[]) (thanks to Matt Hillsdon)
+* FIX: Deadlock in classpath container (jira:IVYDE-361[]) (thanks to Carsten Pfeiffer)
+* FIX: Typo in IvyResolveJob (jira:IVYDE-362[]) (thanks to Nicolas Gavalda)
+* FIX: User-selected configurations not checked in the viewer (jira:IVYDE-378[]) (thanks to Carsten Pfeiffer)
+* FIX: Fix ClassCastException (jira:IVYDE-386[])
 
-== [[majorchanges]]Major Changes in this Release
+* NEW: add support for OSGi 'Bundle-Classpath' directive (Ivy 2.4.0-rc1 is required)
+* NEW: basic support for the workspace resolver to find OSGi bundles managed by Ivy in the workspace (Ivy 2.4.0-rc2 is required)
+* NEW: Add support for storing securely credentials (thanks to Alexander Blaas)
 
-!!!! TODO !!!!
+////
+ samples
+* NEW: new new new (jira:IVYDE-XXX[]) (thanks to XXX)
+* IMPROVE: improve improve improve (jira:IVYDE-XXX[]) (thanks to XXX)
+* FIX: fix fix fix (jira:IVYDE-XXX[]) (thanks to XXX)
+////
 
 == [[contrib]]Committers and Contributors
 
 Here is the list of people who have contributed source code and documentation up to this release. Many thanks to all of them, and also to the whole IvyDE community contributing ideas and feedback, and promoting the use of Apache IvyDE !
 
-Committers:
+=== Committers:
 
 * Maarten Coene
 * Xavier Hanin
@@ -82,7 +91,7 @@ Committers:
 * Jon Schneider
 * Gilles Scokart
 
-Contributors:
+=== Contributors:
 
 * Daniel Becheanu
 * Alexander Blaas
@@ -113,25 +122,3 @@ Contributors:
 * James Wilkins
 * Anton Zagorulko
 
-== [[changes]]List of Changes in this Release
-
-List of changes since link:/ivy/ivyde/history/2.2.0.final/release-notes.html[Apache IvyDE 2.2.0 final]:
-
-* FIX: xml bomb in workspace causes hang in Ivy code during Search or Synchronize operations (jira:IVYDE-354[]) (thanks to Matt Hillsdon)
-* FIX: Deadlock in classpath container (jira:IVYDE-361[]) (thanks to Carsten Pfeiffer)
-* FIX: Typo in IvyResolveJob (jira:IVYDE-362[]) (thanks to Nicolas Gavalda)
-* FIX: User-selected configurations not checked in the viewer (jira:IVYDE-378[]) (thanks to Carsten Pfeiffer)
-    
-* NEW: add support for OSGi 'Bundle-Classpath' directive (Ivy 2.4.0-rc1 is required)
-* NEW: basic support for the workspace resolver to find OSGi bundles managed by Ivy in the workspace (Ivy 2.4.0-rc2 is required)
-* NEW: Add support for storing securely credentials (thanks to Alexander Blaas)
-    
-////
- samples
-* NEW: new new new (jira:IVYDE-XXX[]) (thanks to XXX)
-* IMPROVE: improve improve improve (jira:IVYDE-XXX[]) (thanks to XXX)
-* FIX: fix fix fix (jira:IVYDE-XXX[]) (thanks to XXX)
-////
-
-Most of our changes are logged in our JIRA, where you can find comments and links to our subversion:
-https://issues.apache.org/jira/browse/ivyde