Repository: syncope Updated Branches: refs/heads/2_0_X bdd664ef4 -> f0a9c604e refs/heads/master 0057595c9 -> 76a323ce0
Fixes to the release process after 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/76a323ce Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/76a323ce Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/76a323ce Branch: refs/heads/master Commit: 76a323ce08d865bada83f9c3e804c743bce95de2 Parents: 0057595 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Jul 6 09:39:00 2018 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Jul 6 09:39:36 2018 +0200 ---------------------------------------------------------------------- pom.xml | 16 +------------- src/site/.htaccess | 19 ---------------- src/site/xdoc/release-process.xml | 40 ++++++++++++++++++++++++---------- 3 files changed, 30 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/76a323ce/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c0e60b9..dcd11b1 100644 --- a/pom.xml +++ b/pom.xml @@ -2258,7 +2258,7 @@ under the License. <artifactId>maven-javadoc-plugin</artifactId> <version>2.10.4</version> <configuration> - <destDir>apidocs/2.0</destDir> + <destDir>apidocs/2.1</destDir> <isOffline>false</isOffline> <detectLinks>true</detectLinks> <detectJavaApiLink>true</detectJavaApiLink> @@ -2487,20 +2487,6 @@ under the License. </target> </configuration> </execution> - <execution> - <id>place-htaccess</id> - <goals> - <goal>run</goal> - </goals> - <phase>site-deploy</phase> - <configuration> - <target> - <copy todir="${site.deploymentBaseDir}/docs"> - <fileset dir="${rootpom.basedir}/src/site/" includes=".htaccess" /> - </copy> - </target> - </configuration> - </execution> </executions> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/syncope/blob/76a323ce/src/site/.htaccess ---------------------------------------------------------------------- diff --git a/src/site/.htaccess b/src/site/.htaccess deleted file mode 100644 index 5c3d2a0..0000000 --- a/src/site/.htaccess +++ /dev/null @@ -1,19 +0,0 @@ -# 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/76a323ce/src/site/xdoc/release-process.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml index 4f119b0..2d3ad58 100644 --- a/src/site/xdoc/release-process.xml +++ b/src/site/xdoc/release-process.xml @@ -312,17 +312,27 @@ unzip $SYNCOPE_RELEASE_DIR/target/syncope-$VERSION-source-release.zip cd syncope-$VERSION mvn -PskipTests,all -cd fit/core-reference && mvn -Pdebug,all +cd standalone/target/standalone/apache-tomcat-* && ./bin/startup.sh + +curl -o /tmp/syncope.wadl http://localhost:9080/syncope/syncope.wadl + 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 -sed -i 's/\/syncope\/webjars\/jquery-ui\/1.11.4\/jquery-ui.min.js/http:\/\/code.jquery.com\/ui\/1.11.4\/jquery-ui.min.js/' index.html -sed -i 's/\/syncope\/webjars\/jquery-ui-themes\/1.11.4\/smoothness\/jquery-ui.min.css/https:\/\/code.jquery.com\/ui\/1.11.4\/themes\/smoothness\/jquery-ui.css/' index.html +sed -i 's/\/syncope\/webjars\/jquery\/2.2.4\/jquery.min.js/https:\/\/code.jquery.com\/jquery-2.2.4.min.js/' /tmp/index.html +sed -i 's/\/syncope\/webjars\/jquery-ui\/1.11.4\/jquery-ui.min.js/http:\/\/code.jquery.com\/ui\/1.11.4\/jquery-ui.min.js/' /tmp/index.html +sed -i 's/\/syncope\/webjars\/jquery-ui-themes\/1.11.4\/smoothness\/jquery-ui.min.css/https:\/\/code.jquery.com\/ui\/1.11.4\/themes\/smoothness\/jquery-ui.css/' /tmp/index.html + +# if releasing from 2_0_X curl -o /tmp/schema_1_syncope2.html http://localhost:9080/syncope/schema_1_syncope2.html -sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/styles\/default.min.css/' schema_1_syncope2.html -sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/highlight.min.js/' schema_1_syncope2.html -curl -o /tmp/syncope.wadl http://localhost:9080/syncope/syncope.wadl -# now CTRL+C to stop cargo +sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/styles\/default.min.css/' /tmp/schema_1_syncope2.html +sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/highlight.min.js/' /tmp/schema_1_syncope2.html +# else if releasing from 2_1_X +curl -o /tmp/schema_1_syncope2.html http://localhost:9080/syncope/schema_1_syncope21.html +sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/styles\/default.min.css/' /tmp/schema_1_syncope21.html +sed -i 's/\/syncope\/webjars\/highlightjs\/9.8.0\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.8.0\/highlight.min.js/' /tmp/schema_1_syncope21.html + +./bin/shutdown.sh && cd - + svn checkout https://svn.apache.org/repos/asf/syncope/site/ site cd $SYNCOPE_SITE_DIR @@ -338,7 +348,11 @@ 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 .. +cd docs +ln -s 2.1/reference-guide.html . +ln -s 2.1/getting-started.html . +ln -s 2.1/images/ . +cd ../.. svn add $VERSION svn copy apidocs/2.1 $VERSION/apidocs/ svn copy rest/2.1 $VERSION/rest/ @@ -346,12 +360,16 @@ 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/schema_1_syncope21.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 .. +cd docs +ln -s 2.1/reference-guide.html . +ln -s 2.1/getting-started.html . +ln -s 2.1/images/ . +cd ../.. svn add $VERSION svn copy apidocs/2.0 $VERSION/apidocs/ svn copy rest/2.0 $VERSION/rest/
