You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2018/01/17 21:25:12 UTC
[sling-site] branch asf-site updated: release management update
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/sling-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new e2952a6 release management update
e2952a6 is described below
commit e2952a64a3537c2da64b5448f8121193fe2c2b51
Author: Robert Munteanu <ro...@gmail.com>
AuthorDate: Wed Jan 17 23:25:10 2018 +0200
release management update
---
documentation/bundles/models.html | 4 ++--
documentation/development/release-management.html | 22 ++++++++++++----------
.../getting-resources-and-properties-in-sling.html | 4 ++--
downloads.html | 4 ++--
releases.html | 3 ++-
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/documentation/bundles/models.html b/documentation/bundles/models.html
index a013d78..6215ffb 100644
--- a/documentation/bundles/models.html
+++ b/documentation/bundles/models.html
@@ -683,7 +683,7 @@ assert object1 == object2;
</tr>
<tr>
<td><code>ChildResource</code> </td>
- <td>Uses a child resource from the adaptable, assuming the adaptable is a <code>Resource</code>.</td>
+ <td>Uses a child resource from the adaptable, assuming the adaptable is a <code>Resource</code>. In case the adaptable is a <code>SlingHttpServletRequest</code> uses a wrapper overwriting the <code>getResource()</code> to point to the given child resource (<a href="https://issues.apache.org/jira/browse/SLING-7321">SLING-7321</a>).</td>
</tr>
<tr>
<td><code>ForcedResourceType</code> </td>
@@ -705,7 +705,7 @@ assert object1 == object2;
<li><code>getAdaptable()</code> should return the new adaptable or <code>ViaProvider.ORIGINAL</code> to indicate that the original adaptable should be used.</li>
</ul></section></div></div>
<div class="footer">
-<div class="revisionInfo">Last modified by <span class="author">Robert Munteanu</span> on <span class="comment">Fri Nov 17 11:47:07 2017 +0200</span></div> <p>
+<div class="revisionInfo">Last modified by <span class="author">Konrad Windszus</span> on <span class="comment">Mon Jan 15 16:45:21 2018 +0100</span></div> <p>
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
</p><p>
Copyright © 2011-2017 The Apache Software Foundation.
diff --git a/documentation/development/release-management.html b/documentation/development/release-management.html
index 0974e6b..11d959f 100644
--- a/documentation/development/release-management.html
+++ b/documentation/development/release-management.html
@@ -311,17 +311,19 @@ Enjoy!
<li><a href="http://wiki.apache.org/incubator/SigningReleases">http://wiki.apache.org/incubator/SigningReleases</a></li>
</ol>
<h2><a href="#releasing-the-sling-ide-tooling" name="releasing-the-sling-ide-tooling">Releasing the Sling IDE Tooling</a></h2>
-<!-- GIT-TODO - update after releasing the IDE tooling from Git -->
-<p>While the Sling IDE tooling is built using Maven, the toolchain that it is based around does not cooperate well with the maven-release-plugin. As such, the release preparation and execution are slightly different. The whole process is outlined below, assuming that we start with a development version of 1.0.1-SNAPSHOT.</p>
+<p>While the Sling IDE tooling is built using Maven, the toolchain that it is based around does not cooperate well with the maven-release-plugin. As such, the release preparation and execution are slightly different. Also note that we sign release using the Symantec code signing service, see <a href="https://reference.apache.org/pmc/codesigning">Using the code signing service </a> for details.</p>
+<p>The whole process is outlined below, assuming that we start with a development version of 1.0.1-SNAPSHOT.</p>
<ol>
<li>set the fix version as released: <code>mvn tycho-versions:set-version -DnewVersion=1.0.2</code></li>
<li>update the version of the source-bundle project to 1.0.2</li>
- <li>commit the change to svn</li>
- <li>manually tag in svn using <code>svn copy https://svn.apache.org/repos/asf/sling/trunk/tooling/ide https://svn.apache.org/repos/asf/sling/tags/sling-ide-tooling-1.0.2</code></li>
+ <li>commit and push the change</li>
+ <li>Tag the commit using <code>git tag -a -m 'Tag 1.0.2 release' sling-ide-tooling-1.0.2</code></li>
<li>update to next version: <code>mvn tycho-versions:set-version -DnewVersion=1.0.3-SNAPSHOT</code> and also update the version of the source-bundle project</li>
- <li>commit the change to svn</li>
- <li>Checkout the version from the tag and proceed with the build from there <code>https://svn.apache.org/repos/asf/sling/tags/sling-ide-tooling-1.0.2</code></li>
- <li>build the project with p2/gpg signing enabled: <code>mvn clean package -Psign</code></li>
+ <li>commit and push the change</li>
+ <li>checkout the version from the tag and proceed with the build from there <code>git checkout sling-ide-tooling-1.0.2</code>a</li>
+ <li>In <code>p2update/pom.xml</code>, uncomment the <code>codesign-maven-plugin</code> declaration and change the code signing service to 'Java Signing Sha256'</li>
+ <li>build the project with p2/gpg signing enabled: <code>mvn clean package -Pcodesign</code></li>
+ <li>manually build the zipped p2 repository: <code>cd p2update/target/repository-signed && zip -r org.apache.sling.ide.p2update-1.0.2.zip . && cd -</code></li>
<li>build the source bundle from the source-bundle directory: <code>mvn clean package</code></li>
<li>copy the following artifacts to https://dist.apache.org/repos/dist/dev/sling/ide-tooling-1.0.2
<ol>
@@ -329,7 +331,7 @@ Enjoy!
<li>zipped p2 repository ( org.apache.sling.ide.p2update-1.0.2.zip )</li>
</ol>
</li>
- <li>ensure the artifacts are checksummed and gpg-signed by using the <code>tooling/ide/sign.sh</code> script</li>
+ <li>ensure the artifacts are checksummed and gpg-signed by using the <code>sign.sh</code> script</li>
<li>call the vote</li>
</ol>
<p>The format of the release vote should be</p>
@@ -373,7 +375,7 @@ This majority vote is open for at least 72 hours
<ol>
<li>announce the result of the vote, see <a href="#wait-for-the-results">Wait for the results</a></li>
<li>update versions in jira, see <a href="#update-jira">Update JIRA</a></li>
- <li>upload p2update.zip* to https://dist.apache.org/repos/dist/release/sling/</li>
+ <li>upload <em>p2update.zip</em> to https://dist.apache.org/repos/dist/release/sling/</li>
<li>upload unzipped update site to https://dist.apache.org/repos/dist/release/sling/eclipse/1.0.2</li>
<li>upload the source bundle to https://dist.apache.org/repos/dist/release/sling/eclipse/1.0.2
<ol>
@@ -471,7 +473,7 @@ ssb 2048R/226BCE00 2016-01-21
<p>Check the results at <a href="http://sling.apache.org/components/">http://sling.apache.org/components/</a></p></li>
</ol></section></div></div>
<div class="footer">
-<div class="revisionInfo">Last modified by <span class="author">Dan Klco</span> on <span class="comment">Fri Jan 12 20:05:11 2018 -0500</span></div> <p>
+<div class="revisionInfo">Last modified by <span class="author">Robert Munteanu</span> on <span class="comment">Wed Jan 17 23:22:33 2018 +0200</span></div> <p>
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
</p><p>
Copyright © 2011-2017 The Apache Software Foundation.
diff --git a/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html b/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
index 43a300c..7b0d38e 100644
--- a/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
+++ b/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
@@ -81,7 +81,7 @@
<div class="row"><div class="small-12 columns"><section class="wrap"><p>The Resource is one of the central parts of Sling. Extending from JCR's Everything is Content, Sling assumes Everthing is a Resource. Thus Sling is maintaining a virtual tree of resources, which is a merger of the actual contents in the JCR Repository and resources provided by so called resource providers. By doing this Sling fits very well in the paradigm of the REST architecture.</p>
<p>In this article we will explore a few ways to programmatically map a resource path (String) to a resource object (Resource) and its properties in Sling, from within an OSGI service, a servlet and a JSP.</p>
<p>The whole game consists in first getting a <code>ResourceResolver</code> and then getting the <code>Resource</code> itself.</p>
-<h2><a href="#within-an-osgi-service-component" name="within-an-osgi-service-component">Within an OSGI Service/Component</a></h2>
+<h2><a href="#within-an-osgi-service-compoment" name="within-an-osgi-service-compoment">Within an OSGI Service/Compoment</a></h2>
<p>You can access a resource through the <code>ResourceResolverFactory</code> service:</p>
<pre><code><!-- TODO syntax marker (#!java) disabled -->@Reference
private ResourceResolverFactory resolverFactory;
@@ -137,7 +137,7 @@ ValueMap properties = ResourceUtil.getValueMap(res);
</code></pre>
<p>For more details about resources and how to access them in Sling, you can refer to the <a href="/documentation/the-sling-engine/resources.html">Sling documentation about Resources</a>.</p></section></div></div>
<div class="footer">
-<div class="revisionInfo">Last modified by <span class="author">Bertrand Delacretaz</span> on <span class="comment">Fri Jan 5 15:33:28 2018 +0100</span></div> <p>
+<div class="revisionInfo">Last modified by <span class="author">Bertrand Delacretaz</span> on <span class="comment">Fri Sep 29 15:57:01 2017 +0200</span></div> <p>
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
</p><p>
Copyright © 2011-2017 The Apache Software Foundation.
diff --git a/downloads.html b/downloads.html
index 3e67978..381a796 100644
--- a/downloads.html
+++ b/downloads.html
@@ -531,8 +531,8 @@
</td><td><a href="[preferred]sling/maven-launchpad-plugin-2.3.4-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-launchpad-plugin-2.3.4-source-release.zip.md5">md5</a>)
</td></tr><tr><td>Maven Sling Plugin</td><td>2.3.4</td><td><a href="[preferred]sling/maven-sling-plugin-2.3.4.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.4.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.4.jar.md5">md5</a>)
</td><td><a href="[preferred]sling/maven-sling-plugin-2.3.4-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.4-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/maven-sling-plugin-2.3.4-source-release.zip.md5">md5</a>)
- </td></tr><tr><td>Slingstart Maven Plugin</td><td>1.7.14</td><td><a href="[preferred]sling/slingstart-maven-plugin-1.7.14.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.14.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.14.jar.md5">md5</a>)
- </td><td><a href="[preferred]sling/slingstart-maven-plugin-1.7.14-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.14-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.14-source-release.zip.md5">md5</a>)
+ </td></tr><tr><td>Slingstart Maven Plugin</td><td>1.7.16</td><td><a href="[preferred]sling/slingstart-maven-plugin-1.7.16.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.16.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.16.jar.md5">md5</a>)
+ </td><td><a href="[preferred]sling/slingstart-maven-plugin-1.7.16-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.16-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/slingstart-maven-plugin-1.7.16-source-release.zip.md5">md5</a>)
</td></tr><tr><td>HTL Maven Plugin</td><td>1.1.2</td><td><a href="[preferred]sling/htl-maven-plugin-1.1.2.jar">Maven Plugin</a> (<a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.1.2.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.1.2.jar.md5">md5</a>)
</td><td><a href="[preferred]sling/htl-maven-plugin-1.1.2-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.1.2-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/htl-maven-plugin-1.1.2-source-release.zip.md5">md5</a>)
</td></tr></tbody></table></section></div></div>
diff --git a/releases.html b/releases.html
index 98434b2..9e32862 100644
--- a/releases.html
+++ b/releases.html
@@ -80,6 +80,7 @@
</h1><div class="row"><div class="small-12 columns"><section class="wrap"><p>This is a list of all our releases, available from our <a href="/downloads.cgi">downloads</a> page.</p>
<h2><a href="#january-2018" name="january-2018">January 2018</a></h2>
<ul>
+ <li>SlingStart Maven Plugin 1.7.16 (15th)</li>
<li>File System Resource Provider 2.1.10 (15th)</li>
<li>Resource Merger 1.3.6 (15th)</li>
<li>XSS Protection API 2.0.4 (8th)</li>
@@ -1647,7 +1648,7 @@
<li>Commons LogService 2.0.6 (5th)</li>
</ul></section></div></div>
<div class="footer">
-<div class="revisionInfo">Last modified by <span class="author">Julian Sedding</span> on <span class="comment">Mon Jan 15 10:15:28 2018 +0100</span></div> <p>
+<div class="revisionInfo">Last modified by <span class="author">Konrad Windszus</span> on <span class="comment">Mon Jan 15 16:20:01 2018 +0100</span></div> <p>
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
</p><p>
Copyright © 2011-2017 The Apache Software Foundation.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].