Repository: syncope Updated Branches: refs/heads/2_0_X d8aa10159 -> 77ce29e5f refs/heads/master dd3d4a3db -> e56dbc29d
Site revision towards 2.1.0 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e56dbc29 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e56dbc29 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e56dbc29 Branch: refs/heads/master Commit: e56dbc29dc7715c46c84e7829e37762018fa0dd0 Parents: 027b6bd Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Jul 5 11:22:56 2018 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Jul 5 12:43:01 2018 +0200 ---------------------------------------------------------------------- pom.xml | 25 +---- src/site/.htaccess | 19 ++++ src/site/xdoc/docs/index.xml | 47 +++++--- src/site/xdoc/downloads.xml | 192 ++++++++++++++++++++++----------- src/site/xdoc/release-process.xml | 53 +++++---- 5 files changed, 207 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/e56dbc29/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c011307..3ede96b 100644 --- a/pom.xml +++ b/pom.xml @@ -2369,11 +2369,6 @@ under the License. <artifactId>asciidoctorj-pdf</artifactId> <version>1.5.0-alpha.16</version> </dependency> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj</artifactId> - <version>1.5.6</version> - </dependency> </dependencies> <configuration> <doctype>book</doctype> @@ -2461,18 +2456,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <version>3.7.1</version> - <dependencies> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <version>1.7</version> - </dependency> - </dependencies> <configuration> <locales>en</locales> <generateProjectInfo>false</generateProjectInfo> @@ -2501,7 +2484,7 @@ under the License. </configuration> </execution> <execution> - <id>copy-docs-to-site</id> + <id>place-htaccess</id> <goals> <goal>run</goal> </goals> @@ -2509,11 +2492,7 @@ under the License. <configuration> <target> <copy todir="${site.deploymentBaseDir}/docs"> - <fileset dir="${project.build.directory}/generated-docs/" includes="getting-started.*" /> - <fileset dir="${project.build.directory}/generated-docs/" includes="reference-guide.*" /> - </copy> - <copy todir="${site.deploymentBaseDir}/docs/images"> - <fileset dir="${project.build.directory}/generated-docs/images" /> + <fileset dir="${rootpom.basedir}/src/site/" includes=".htaccess"/> </copy> </target> </configuration> http://git-wip-us.apache.org/repos/asf/syncope/blob/e56dbc29/src/site/.htaccess ---------------------------------------------------------------------- diff --git a/src/site/.htaccess b/src/site/.htaccess new file mode 100644 index 0000000..5c3d2a0 --- /dev/null +++ b/src/site/.htaccess @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +RedirectMatch getting-started(.*)$ "https://syncope.apache.org/docs/2.1/getting-started$1"; +RedirectMatch reference-guide(.*)$ "https://syncope.apache.org/docs/2.1/reference-guide$1"; http://git-wip-us.apache.org/repos/asf/syncope/blob/e56dbc29/src/site/xdoc/docs/index.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/docs/index.xml b/src/site/xdoc/docs/index.xml index 8cc0734..9481ff7 100644 --- a/src/site/xdoc/docs/index.xml +++ b/src/site/xdoc/docs/index.xml @@ -51,28 +51,38 @@ under the License. <thead> <tr> <th>Name</th> - <th width="100">Stable</th> - <th width="100">Snapshot</th> + <th width="100">2.1</th> + <th width="100">2.0</th> + <th width="100">dev</th> </tr> </thead> <tbody> <tr> <td>Getting Started</td> <td> - <a href="getting-started.html"> + <a href="2.1/getting-started.html"> <img src="../images/text-html.png"/> </a> - <a href="getting-started.pdf"> + <a href="2.1/getting-started.pdf"> <img src="../images/application-pdf.png"/> </a> </td> <td> - <a href="https://ci.apache.org/projects/syncope/2_0_X/getting-started.html";> + <a href="2.0/getting-started.html"> <img src="../images/text-html.png"/> </a> - <a href="https://ci.apache.org/projects/syncope/2_0_X/getting-started.pdf";> + <a href="2.0/getting-started.pdf"> + <img src="../images/application-pdf.png"/> + </a> + </td> + <td> + <a href="https://ci.apache.org/projects/syncope/2_1_X/getting-started.html";> + <img src="../images/text-html.png"/> + </a> + + <a href="https://ci.apache.org/projects/syncope/2_1_X/getting-started.pdf";> <img src="../images/application-pdf.png"/> </a> </td> @@ -80,20 +90,29 @@ under the License. <tr> <td>Reference Guide</td> <td> - <a href="reference-guide.html"> + <a href="2.1/reference-guide.html"> + <img src="../images/text-html.png"/> + </a> + + <a href="2.1/reference-guide.pdf"> + <img src="../images/application-pdf.png"/> + </a> + </td> + <td> + <a href="2.0/reference-guide.html"> <img src="../images/text-html.png"/> </a> - <a href="reference-guide.pdf"> + <a href="2.0/reference-guide.pdf"> <img src="../images/application-pdf.png"/> </a> </td> <td> - <a href="https://ci.apache.org/projects/syncope/2_0_X/reference-guide.html";> + <a href="https://ci.apache.org/projects/syncope/2_1_X/reference-guide.html";> <img src="../images/text-html.png"/> </a> - <a href="https://ci.apache.org/projects/syncope/2_0_X/reference-guide.pdf";> + <a href="https://ci.apache.org/projects/syncope/2_1_X/reference-guide.pdf";> <img src="../images/application-pdf.png"/> </a> </td> @@ -123,17 +142,17 @@ under the License. <tr> <td>REST</td> <td> - <a href="../rest/2.0/index.html">2.0</a> + <a href="../rest/2.1/index.html">2.1</a> - <a href="../rest/1.2/index.html">1.2</a> + <a href="../rest/2.0/index.html">2.0</a> </td> </tr> <tr> <td>Javadocs</td> <td> - <a href="../apidocs/2.0/index.html">2.0</a> + <a href="../apidocs/2.1/index.html">2.1</a> - <a href="../apidocs/1.2/index.html">1.2</a> + <a href="../apidocs/2.0/index.html">2.0</a> </td> </tr> </tbody> http://git-wip-us.apache.org/repos/asf/syncope/blob/e56dbc29/src/site/xdoc/downloads.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml index d8e72d8..0a7e1bf 100644 --- a/src/site/xdoc/downloads.xml +++ b/src/site/xdoc/downloads.xml @@ -36,25 +36,26 @@ under the License. It is good practice to <a href="#Verifying_Releases">verify the integrity</a> of the distribution files. </p> - <div class="alert alert-info"> - <h4>Don't know what do download? Click the buttons below to get more information.</h4> - <br/> - <div class="btn-group"> - <a href="docs/getting-started.html#maven-project" class="btn">Maven Project</a> - <a href="docs/getting-started.html#standalone" class="btn">Standalone</a> - <a href="docs/getting-started.html#debian-packages" class="btn">Debian Packages</a> - <a href="docs/getting-started.html#gui-installer" class="btn">GUI Installer</a> - <a href="docs/getting-started.html#docker" class="btn">Docker images</a> - <a href="docs/getting-started.html#eclipse-ide-plugin" class="btn">Eclipse IDE Plugin</a> - <a href="docs/getting-started.html#netbeans-ide-plugin" class="btn">Netbeans IDE Plugin</a> - </div> - </div> - - <subsection name="2.0.9 Jazz"> - <p>Release date: June 28th 2018</p> + <subsection name="2.1.0 Jazz"> + <p>Release date: July XXth 2018</p> <p> - <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Jazz";>Release notes</a> + <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Fusion";>Release notes</a> </p> + + <div class="alert alert-info"> + <h4>Don't know what to download? Click the buttons below to get more information.</h4> + <br/> + <div class="btn-group"> + <a href="docs/2.1/getting-started.html#maven-project" class="btn">Maven Project</a> + <a href="docs/2.1/getting-started.html#standalone" class="btn">Standalone</a> + <a href="docs/2.1/getting-started.html#debian-packages" class="btn">Debian Packages</a> + <a href="docs/2.1/getting-started.html#gui-installer" class="btn">GUI Installer</a> + <a href="docs/2.1/getting-started.html#docker" class="btn">Docker images</a> + <a href="docs/2.1/getting-started.html#eclipse-ide-plugin" class="btn">Eclipse IDE Plugin</a> + <a href="docs/2.1/getting-started.html#netbeans-ide-plugin" class="btn">Netbeans IDE Plugin</a> + </div> + </div> + <table> <thead> <tr> @@ -65,93 +66,118 @@ under the License. <tbody> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-2.0.9-source-release.zip";>syncope-2.0.9-source-release.zip</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/syncope-2.1.0-source-release.zip";>syncope-2.1.0-source-release.zip</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-2.0.9-source-release.zip.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-2.0.9-source-release.zip.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-2.1.0-source-release.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-2.1.0-source-release.zip.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-standalone-2.0.9-distribution.zip";>syncope-standalone-2.0.9-distribution.zip</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/syncope-standalone-2.1.0-distribution.zip";>syncope-standalone-2.1.0-distribution.zip</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-standalone-2.0.9-distribution.zip.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-standalone-2.0.9-distribution.zip.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-standalone-2.1.0-distribution.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-standalone-2.1.0-distribution.zip.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/apache-syncope-2.0.9.deb";>apache-syncope-2.0.9.deb</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/apache-syncope-2.1.0.deb";>apache-syncope-2.1.0.deb</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-2.0.9.deb.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-2.0.9.deb.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/apache-syncope-2.1.0.deb.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/apache-syncope-2.1.0.deb.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/apache-syncope-console-2.0.9.deb";>apache-syncope-console-2.0.9.deb</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/apache-syncope-console-2.1.0.deb";>apache-syncope-console-2.1.0.deb</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-console-2.0.9.deb.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-console-2.0.9.deb.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/apache-syncope-console-2.1.0.deb.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/apache-syncope-console-2.1.0.deb.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/apache-syncope-enduser-2.0.9.deb";>apache-syncope-enduser-2.0.9.deb</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/apache-syncope-enduser-2.1.0.deb";>apache-syncope-enduser-2.1.0.deb</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-enduser-2.0.9.deb.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-enduser-2.0.9.deb.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/apache-syncope-enduser-2.1.0.deb.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/apache-syncope-enduser-2.1.0.deb.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-installer-2.0.9-uber.jar";>syncope-installer-2.0.9.jar</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/syncope-installer-2.1.0-uber.jar";>syncope-installer-2.1.0.jar</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-installer-2.0.9-uber.jar.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-installer-2.0.9-uber.jar.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-installer-2.1.0-uber.jar.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-installer-2.1.0-uber.jar.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-client-cli-2.0.9.zip";>syncope-client-cli-2.0.9.zip</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/syncope-client-cli-2.1.0.zip";>syncope-client-cli-2.1.0.zip</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-client-cli-2.0.9.zip.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-client-cli-2.0.9.zip.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-client-cli-2.1.0.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-client-cli-2.1.0.zip.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/org.apache.syncope.ide.eclipse.site-2.0.9.zip";>org.apache.syncope.ide.eclipse.site-2.0.9.zip</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/syncope-core-upgrade-2.1.0.zip";>syncope-core-upgrade-2.1.0.zip</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/org.apache.syncope.ide.eclipse.site-2.0.9.zip.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/org.apache.syncope.ide.eclipse.site-2.0.9.zip.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-core-upgrade-2.1.0.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-core-upgrade-2.1.0.zip.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-ide-netbeans-2.0.9.nbm";>syncope-ide-netbeans-2.0.9.nbm</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/org.apache.syncope.ide.eclipse.site-2.1.0.zip";>org.apache.syncope.ide.eclipse.site-2.1.0.zip</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-ide-netbeans-2.0.9.nbm.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-ide-netbeans-2.0.9.nbm.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/org.apache.syncope.ide.eclipse.site-2.1.0.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/org.apache.syncope.ide.eclipse.site-2.1.0.zip.sha1";>sha1</a> + </td> + </tr> + <tr> + <td> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.0/syncope-ide-netbeans-2.1.0.nbm";>syncope-ide-netbeans-2.1.0.nbm</a> + </td> + <td> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-ide-netbeans-2.1.0.nbm.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.1.0/syncope-ide-netbeans-2.1.0.nbm.sha1";>sha1</a> </td> </tr> </tbody> </table> </subsection> - <subsection name="1.2.11 Intermezzo"> - <p>Release date: March 13th 2018</p> + + <subsection name="2.0.9 Jazz"> + <p>Release date: June 28th 2018</p> <p> - <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo";>Release notes</a> + <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Jazz";>Release notes</a> </p> + + <div class="alert alert-info"> + <h4>Don't know what to download? Click the buttons below to get more information.</h4> + <br/> + <div class="btn-group"> + <a href="docs/2.0/getting-started.html#maven-project" class="btn">Maven Project</a> + <a href="docs/2.0/getting-started.html#standalone" class="btn">Standalone</a> + <a href="docs/2.0/getting-started.html#debian-packages" class="btn">Debian Packages</a> + <a href="docs/2.0/getting-started.html#gui-installer" class="btn">GUI Installer</a> + <a href="docs/2.0/getting-started.html#docker" class="btn">Docker images</a> + <a href="docs/2.0/getting-started.html#eclipse-ide-plugin" class="btn">Eclipse IDE Plugin</a> + <a href="docs/2.0/getting-started.html#netbeans-ide-plugin" class="btn">Netbeans IDE Plugin</a> + </div> + </div> + <table> <thead> <tr> @@ -162,47 +188,83 @@ under the License. <tbody> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.11/syncope-1.2.11-source-release.zip";>syncope-1.2.11-source-release.zip</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-2.0.9-source-release.zip";>syncope-2.0.9-source-release.zip</a> + </td> + <td> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-2.0.9-source-release.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-2.0.9-source-release.zip.sha1";>sha1</a> + </td> + </tr> + <tr> + <td> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-standalone-2.0.9-distribution.zip";>syncope-standalone-2.0.9-distribution.zip</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/1.2.11/syncope-1.2.11-source-release.zip.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/1.2.11/syncope-1.2.11-source-release.zip.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-standalone-2.0.9-distribution.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-standalone-2.0.9-distribution.zip.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.11/syncope-standalone-1.2.11-distribution.zip";>syncope-standalone-1.2.11-distribution.zip</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/apache-syncope-2.0.9.deb";>apache-syncope-2.0.9.deb</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/1.2.11/syncope-standalone-1.2.11-distribution.zip.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/1.2.11/syncope-standalone-1.2.11-distribution.zip.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-2.0.9.deb.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-2.0.9.deb.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.11/apache-syncope-1.2.11.deb";>apache-syncope-1.2.11.deb</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/apache-syncope-console-2.0.9.deb";>apache-syncope-console-2.0.9.deb</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/1.2.11/apache-syncope-1.2.11.deb.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/1.2.11/apache-syncope-1.2.11.deb.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-console-2.0.9.deb.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-console-2.0.9.deb.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.11/apache-syncope-console-1.2.11.deb";>apache-syncope-console-1.2.11.deb</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/apache-syncope-enduser-2.0.9.deb";>apache-syncope-enduser-2.0.9.deb</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/1.2.11/apache-syncope-console-1.2.11.deb.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/1.2.11/apache-syncope-console-1.2.11.deb.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-enduser-2.0.9.deb.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/apache-syncope-enduser-2.0.9.deb.sha1";>sha1</a> </td> </tr> <tr> <td> - <a href="http://www.apache.org/dyn/closer.lua/syncope/1.2.11/syncope-installer-1.2.11-uber.jar";>syncope-installer-1.2.11.jar</a> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-installer-2.0.9-uber.jar";>syncope-installer-2.0.9.jar</a> </td> <td> - <a href="https://www.apache.org/dist/syncope/1.2.11/syncope-installer-1.2.11-uber.jar.asc";>asc</a> - <a href="https://www.apache.org/dist/syncope/1.2.11/syncope-installer-1.2.11-uber.jar.sha1";>sha1</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-installer-2.0.9-uber.jar.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-installer-2.0.9-uber.jar.sha1";>sha1</a> + </td> + </tr> + <tr> + <td> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-client-cli-2.0.9.zip";>syncope-client-cli-2.0.9.zip</a> + </td> + <td> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-client-cli-2.0.9.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-client-cli-2.0.9.zip.sha1";>sha1</a> + </td> + </tr> + <tr> + <td> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/org.apache.syncope.ide.eclipse.site-2.0.9.zip";>org.apache.syncope.ide.eclipse.site-2.0.9.zip</a> + </td> + <td> + <a href="https://www.apache.org/dist/syncope/2.0.9/org.apache.syncope.ide.eclipse.site-2.0.9.zip.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/org.apache.syncope.ide.eclipse.site-2.0.9.zip.sha1";>sha1</a> + </td> + </tr> + <tr> + <td> + <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.9/syncope-ide-netbeans-2.0.9.nbm";>syncope-ide-netbeans-2.0.9.nbm</a> + </td> + <td> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-ide-netbeans-2.0.9.nbm.asc";>asc</a> + <a href="https://www.apache.org/dist/syncope/2.0.9/syncope-ide-netbeans-2.0.9.nbm.sha1";>sha1</a> </td> </tr> </tbody> @@ -216,9 +278,9 @@ under the License. <section name="Verifying Releases"> <p>When downloading from a mirror please check the SHA1 checksums as well as verifying the OpenPGP compatible - signature available from the main Apache site. - The <a href="https://www.apache.org/dist/syncope/KEYS";>KEYS</a> file contains the public keys used for signing the - release. It is recommended that a web of trust is used to confirm the identity of these keys.</p> + signature available from the main Apache site. + The <a href="https://www.apache.org/dist/syncope/KEYS";>KEYS</a> file contains the public keys used for signing the + release. It is recommended that a web of trust is used to confirm the identity of these keys.</p> <p>You can check the OpenPGP signature with GnuPG via:</p> <source><![CDATA[gpg --import KEYS http://git-wip-us.apache.org/repos/asf/syncope/blob/e56dbc29/src/site/xdoc/release-process.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml index 0f55acc..4f119b0 100644 --- a/src/site/xdoc/release-process.xml +++ b/src/site/xdoc/release-process.xml @@ -126,7 +126,6 @@ under the License. <dd> <p> the working directory containing the GIT clone repository for the branch under release - (<tt>1_2_X</tt> or <tt>2_0_X</tt>) </p> </dd> <dt> @@ -135,7 +134,6 @@ under the License. <dd> <p> the working directory containing the GIT clone repository for the branch for site management - (<tt>2_0_X</tt>) </p> </dd> </dl> @@ -281,7 +279,6 @@ cp $SYNCOPE_RELEASE_DIR/deb/core/target/apache-syncope-*.deb . cp $SYNCOPE_RELEASE_DIR/deb/core/target/apache-syncope-*.deb.asc . cp $SYNCOPE_RELEASE_DIR/deb/console/target/apache-syncope-console-*.deb . cp $SYNCOPE_RELEASE_DIR/deb/console/target/apache-syncope-console-*.deb.asc . -# only for 2_0_X cp $SYNCOPE_RELEASE_DIR/deb/enduser/target/apache-syncope-enduser-*.deb . cp $SYNCOPE_RELEASE_DIR/deb/enduser/target/apache-syncope-enduser-*.deb.asc . cp $SYNCOPE_RELEASE_DIR/client/cli/target/syncope-client-cli-*.zip . @@ -290,6 +287,9 @@ cp $SYNCOPE_RELEASE_DIR/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/t cp $SYNCOPE_RELEASE_DIR/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/target/org.apache.syncope.ide.eclipse.site-*.zip.asc . cp $SYNCOPE_RELEASE_DIR/ide/netbeans/target/syncope-ide-netbeans-*.nbm . cp $SYNCOPE_RELEASE_DIR/ide/netbeans/target/syncope-ide-netbeans-*.nbm.asc . +# only for 2_1_X +cp $SYNCOPE_RELEASE_DIR/core/upgrade/target/syncope-core-upgrade-*.zip . +cp $SYNCOPE_RELEASE_DIR/core/upgrade/target/syncope-core-upgrade-*.zip.asc . for file in `find . -type f -iname '*.asc'` do @@ -312,12 +312,6 @@ unzip $SYNCOPE_RELEASE_DIR/target/syncope-$VERSION-source-release.zip cd syncope-$VERSION mvn -PskipTests,all -# if releasing from 1_2_X -mvn javadoc:aggregate -cd common -mvn -P offline-doc - -# else if releasing from 2_0_X cd fit/core-reference && mvn -Pdebug,all curl -o /tmp/index.html http://localhost:9080/syncope/index.html sed -i 's/\/syncope\/webjars\/jquery\/2.2.4\/jquery.min.js/https:\/\/code.jquery.com\/jquery-2.2.4.min.js/' index.html @@ -336,22 +330,32 @@ mvn -P site -Dsite.deploymentBaseUrl=file:///<absolute path to/site>/$VERSION cd <absolute path to/site>/$VERSION -# if releasing from 1_2_X -cp -r <absolute path to syncope-$VERSION above>/target/site/apidocs apidocs/1.2 -cp -r <absolute path to syncope-$VERSION above>/common/target/generated/wadl/ rest/1.2 -rm -rf apidocs/2.0 -rm -rf rest/2.0 +# if releasing from 2_0_X +mkdir -p $VERSION/rest/2.0 +mv /tmp/index.html $VERSION/rest/2.0 +mv /tmp/schema_1_syncope2.html $VERSION/rest/2.0 +mv /tmp/syncope.wadl $VERSION/rest/2.0 +cp $SYNCOPE_SITE_DIR/target/generated-docs/getting-started.* docs/2.0/ +cp $SYNCOPE_SITE_DIR/target/generated-docs/reference-guide.* docs/2.0/ +cp -r $SYNCOPE_SITE_DIR/target/generated-docs/images docs/2.0/ +cd .. +svn add $VERSION +svn copy apidocs/2.1 $VERSION/apidocs/ +svn copy rest/2.1 $VERSION/rest/ + +# else if releasing from 2_1_X +mkdir -p $VERSION/rest/2.1 +mv /tmp/index.html $VERSION/rest/2.1 +mv /tmp/schema_1_syncope2.html $VERSION/rest/2.1 +mv /tmp/syncope.wadl $VERSION/rest/2.1 +cp $SYNCOPE_SITE_DIR/target/generated-docs/getting-started.* docs/2.1/ +cp $SYNCOPE_SITE_DIR/target/generated-docs/reference-guide.* docs/2.1/ +cp -r $SYNCOPE_SITE_DIR/target/generated-docs/images docs/2.1/ cd .. svn add $VERSION svn copy apidocs/2.0 $VERSION/apidocs/ svn copy rest/2.0 $VERSION/rest/ -# else if releasing from 2_0_X -cd .. -svn add $VERSION -svn copy apidocs/1.2 $VERSION/apidocs/ -svn copy rest/1.2 $VERSION/rest/ - svn commit -m "Staging site for release"]]></source> </li> <li> @@ -548,11 +552,6 @@ svn commit -m "Cleaning up older releases"]]></source> wiki page based on the HTML release reports from JIRA </li> <li> - (if releasing from <tt>1_2_X</tt>) Update the - <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Create+a+new+Syncope+project";>Create - new project</a> wiki page to point to the new release artifacts - </li> - <li> Update the <a href="https://issues.apache.org/jira/plugins/servlet/project-config/SYNCOPE/versions";>JIRA versions</a> page to mark the version as <strong>Released</strong>, and set the date to the date that the release was approved. You may also need to make a new release entry for the next release. @@ -568,8 +567,8 @@ svn rm $VERSION svn commit -m "Promoting the staging site"]]></source> </li> <li> - If releasing from 2_0_X, deploy the updated Docker images to <a href="https://hub.docker.com/";>DockerHub</a> by adjusting the GIT tag - name then running the <a href="https://builds.apache.org/job/Syncope-2_0_X-Docker";>dedicated Jenkins job</a>. + Deploy the updated Docker images to <a href="https://hub.docker.com/";>DockerHub</a> by adjusting the GIT tag + name then running the <a href="https://builds.apache.org/job/Syncope-Docker";>dedicated Jenkins job</a>. </li> </ol> </subsection>
