You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/06/27 15:10:29 UTC
[1/2] syncope git commit: Adjust release process
Repository: syncope
Updated Branches:
refs/heads/2_0_X 56f7c561a -> 6f2790b8a
refs/heads/master 9b1cb5978 -> d33731156
Adjust release process
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6f2790b8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6f2790b8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6f2790b8
Branch: refs/heads/2_0_X
Commit: 6f2790b8a892faba6a4922792ce74b321ea02603
Parents: 56f7c56
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Jun 27 17:06:12 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Jun 27 17:06:31 2018 +0200
----------------------------------------------------------------------
common/rest-api/pom.xml | 65 ---------
core/rest-cxf/pom.xml | 142 +------------------
.../src/main/resources/wadl2html/identity.xsl | 28 ----
src/site/xdoc/release-process.xml | 38 +++--
4 files changed, 17 insertions(+), 256 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6f2790b8/common/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml
index 8500c9d..0778b90 100644
--- a/common/rest-api/pom.xml
+++ b/common/rest-api/pom.xml
@@ -78,69 +78,4 @@ under the License.
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>site</id>
-
- <build>
- <defaultGoal>clean generate-resources compile site-deploy</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>javadocs-for-wadl</id>
- <phase>pre-site</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-java2wadl-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>parse-javadoc-for-wadl</id>
- <phase>pre-site</phase>
- <goals>
- <goal>parsejavadoc</goal>
- </goals>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </execution>
- <execution>
- <id>generate-wadl</id>
- <phase>pre-site</phase>
- <goals>
- <goal>java2wadl</goal>
- </goals>
- <configuration>
- <applicationTitle>Apache Syncope ${project.version}</applicationTitle>
- <namespacePrefix>syncope2</namespacePrefix>
- <incrementNamespacePrefix>false</incrementNamespacePrefix>
- <linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema>
- <useJaxbContextForQnames>true</useJaxbContextForQnames>
- <addResourceAndMethodIds>true</addResourceAndMethodIds>
- <usePathParamsToCompareOperations>false</usePathParamsToCompareOperations>
- <classResourceNames />
- <basePackages>org.apache.syncope.common.rest.api.service</basePackages>
- <docProvider>org.apache.cxf.maven_plugin.javatowadl.ResourceMapJavaDocProvider</docProvider>
- <attachWadl>true</attachWadl>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/6f2790b8/core/rest-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml
index 88c4c37..fb3c67d 100644
--- a/core/rest-cxf/pom.xml
+++ b/core/rest-cxf/pom.xml
@@ -155,7 +155,7 @@ under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
-
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -163,144 +163,4 @@ under the License.
</resource>
</resources>
</build>
-
- <profiles>
- <profile>
- <id>site</id>
-
- <build>
- <plugins>
- <!-- 1. Transform WADL into 2 HTML pages -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>wadl2html</id>
- <phase>pre-site</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${basedir}/../../common/rest-api/target/generated/wadl</dir>
- <includes>
- <include>application.wadl</include>
- </includes>
- <outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${basedir}/src/main/resources/wadl2html/identity.xsl</stylesheet>
- <outputProperties>
- <outputProperty>
- <name>indent</name>
- <value>yes</value>
- </outputProperty>
- </outputProperties>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
- <pattern>^.*$</pattern>
- <replacement>syncope.wadl</replacement>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- <transformationSet>
- <dir>${project.build.directory}/generated/wadl</dir>
- <includes>
- <include>syncope.wadl</include>
- </includes>
- <outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${basedir}/src/main/resources/wadl2html/index.xsl</stylesheet>
- <parameters>
- <parameter>
- <name>contextPath</name>
- <value>..</value>
- </parameter>
- </parameters>
- <outputProperties>
- <outputProperty>
- <name>indent</name>
- <value>yes</value>
- </outputProperty>
- </outputProperties>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
- <pattern>^.*$</pattern>
- <replacement>index.html</replacement>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- <transformationSet>
- <dir>${project.build.directory}/generated/wadl</dir>
- <includes>
- <include>syncope.wadl</include>
- </includes>
- <outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${basedir}/src/main/resources/wadl2html/schema.xsl</stylesheet>
- <parameters>
- <parameter>
- <name>contextPath</name>
- <value>..</value>
- </parameter>
- <parameter>
- <name>schema-position</name>
- <value>1</value>
- </parameter>
- <parameter>
- <name>schema-prefix</name>
- <value>syncope2</value>
- </parameter>
- </parameters>
- <outputProperties>
- <outputProperty>
- <name>indent</name>
- <value>yes</value>
- </outputProperty>
- </outputProperties>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
- <pattern>^.*$</pattern>
- <replacement>schema_1_syncope2.html</replacement>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- </transformationSets>
- </configuration>
- </plugin>
-
- <!-- 2. Fix external references -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>copy-rest-reference-to-site</id>
- <phase>pre-site</phase>
- <configuration>
- <target>
- <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery/$/jquery.min.js" value="https://code.jquery.com/jquery-${jquery.version}.min.js" />
- <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui/$/jquery-ui.min.js" value="http://code.jquery.com/ui/${jquery-ui.version}/jquery-ui.min.js" />
- <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui-themes/$/smoothness/jquery-ui.min.css" value="https://code.jquery.com/ui/${jquery-ui.version}/themes/smoothness/jquery-ui.css" />
-
- <replace file="${project.build.directory}/generated/wadl/schema_1_syncope2.html" token="../webjars/highlightjs/$/highlight.min.js" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js" />
- <replace file="${project.build.directory}/generated/wadl/schema_1_syncope2.html" token="../webjars/highlightjs/$/styles/default.min.css" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css" />
-
- <copy todir="${site.deploymentBaseDir}/rest/2.0">
- <fileset dir="${project.build.directory}/generated/wadl" />
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/6f2790b8/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/wadl2html/identity.xsl b/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
deleted file mode 100644
index 3678f80..0000000
--- a/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
- <xsl:template match="node()|@*">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-</xsl:stylesheet>
http://git-wip-us.apache.org/repos/asf/syncope/blob/6f2790b8/src/site/xdoc/release-process.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml
index 2a2f9de..2c6bbd4 100644
--- a/src/site/xdoc/release-process.xml
+++ b/src/site/xdoc/release-process.xml
@@ -317,6 +317,18 @@ 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
+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
+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
+
svn checkout https://svn.apache.org/repos/asf/syncope/site/ site
cd $SYNCOPE_SITE_DIR
@@ -324,7 +336,7 @@ mvn -P site -Dsite.deploymentBaseUrl=file:///<absolute path to/site>/$VERSION
cd <absolute path to/site>/$VERSION
-# if releasing from 1_2_X
+# 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
@@ -438,13 +450,13 @@ GIT source tag (XXXXXXXXXXXXXXXX):
https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=tag;h=XXXXXXXXXXXXXXXX
List of changes:
-https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=blob_plain;f=CHANGES;h=0a7fb550234f89f4ad315272cf934f2e050250f7;hb=acbc816bdd6a75b27d8fb12b46905fe07e2cd977
+https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=blob_plain;f=CHANGES;h=XXXXXXXXXXXXXXXX;hb=YYYYYYYYYYYYYYYYYYYYY
Staging artifacts:
https://dist.apache.org/repos/dist/dev/syncope/$VERSION
Maven staging repo:
-https://repository.apache.org/content/repositories/orgapachesyncope-YYY/
+https://repository.apache.org/content/repositories/orgapachesyncope-ZZZZ/
Staging site:
http://syncope.apache.org/$VERSION/
@@ -459,24 +471,6 @@ Vote will be open for 72 hours.
[ ] -1 disapprove (and reason why)]]></pre>
</li>
<li>
- Create a <code>DISCUSS</code> email thread on <a href="mailto:dev@syncope.apache.org">syncope-dev</a> for any vote questions, e.g.:
- <pre><![CDATA[
-To: dev@syncope.apache.org
-Subject: [DISCUSS] Apache Syncope $VERSION
-
-Discussion thread for vote on $VERSION release, with GIT source tag (XXXXXXXXXXXXXXXX).
-
-For more information on the release process, check out http://www.apache.org/dev/release.html
-
-Some of the things to check before voting are:
-- does "mvn apache-rat:check" pass on the source
-- can you build the contents of source release zip and GIT tag
-- do all of the staged jars/wars/zips contain the required LICENSE and NOTICE files
-- are all of the staged jars/wars/zips signed and the signature verifiable
-- is the signing key in the project's KEYS file and on a public server (i.e. http://www.apache.org/dist/syncope/)]]>
- </pre>
- </li>
- <li>
Perform a review of the release and cast your vote; more details on
<a href="http://www.apache.org/dev/release.html">Apache releases</a>.
</li>
@@ -575,7 +569,7 @@ 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>.
+ name then running the <a href="https://builds.apache.org/job/Syncope-2_0_X-Docker">dedicated Jenkins job</a>.
</li>
</ol>
</subsection>
[2/2] syncope git commit: Adjust release process
Posted by il...@apache.org.
Adjust release process
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d3373115
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d3373115
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d3373115
Branch: refs/heads/master
Commit: d337311563d6e028d7a69aa2d114e91661a74af3
Parents: 9b1cb59
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Jun 27 17:06:12 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Jun 27 17:10:20 2018 +0200
----------------------------------------------------------------------
common/rest-api/pom.xml | 65 ---------
core/rest-cxf/pom.xml | 142 +------------------
.../src/main/resources/wadl2html/identity.xsl | 28 ----
src/site/xdoc/release-process.xml | 38 +++--
4 files changed, 17 insertions(+), 256 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d3373115/common/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml
index 68a79b7..717afc9 100644
--- a/common/rest-api/pom.xml
+++ b/common/rest-api/pom.xml
@@ -78,69 +78,4 @@ under the License.
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>site</id>
-
- <build>
- <defaultGoal>clean generate-resources compile site-deploy</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>javadocs-for-wadl</id>
- <phase>pre-site</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-java2wadl-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>parse-javadoc-for-wadl</id>
- <phase>pre-site</phase>
- <goals>
- <goal>parsejavadoc</goal>
- </goals>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </execution>
- <execution>
- <id>generate-wadl</id>
- <phase>pre-site</phase>
- <goals>
- <goal>java2wadl</goal>
- </goals>
- <configuration>
- <applicationTitle>Apache Syncope ${project.version}</applicationTitle>
- <namespacePrefix>syncope21</namespacePrefix>
- <incrementNamespacePrefix>false</incrementNamespacePrefix>
- <linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema>
- <useJaxbContextForQnames>true</useJaxbContextForQnames>
- <addResourceAndMethodIds>true</addResourceAndMethodIds>
- <usePathParamsToCompareOperations>false</usePathParamsToCompareOperations>
- <classResourceNames />
- <basePackages>org.apache.syncope.common.rest.api.service</basePackages>
- <docProvider>org.apache.cxf.maven_plugin.javatowadl.ResourceMapJavaDocProvider</docProvider>
- <attachWadl>true</attachWadl>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/d3373115/core/rest-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml
index 79dea7a..3387ff1 100644
--- a/core/rest-cxf/pom.xml
+++ b/core/rest-cxf/pom.xml
@@ -155,7 +155,7 @@ under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
-
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -163,144 +163,4 @@ under the License.
</resource>
</resources>
</build>
-
- <profiles>
- <profile>
- <id>site</id>
-
- <build>
- <plugins>
- <!-- 1. Transform WADL into 2 HTML pages -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>wadl2html</id>
- <phase>pre-site</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${basedir}/../../common/rest-api/target/generated/wadl</dir>
- <includes>
- <include>application.wadl</include>
- </includes>
- <outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${basedir}/src/main/resources/wadl2html/identity.xsl</stylesheet>
- <outputProperties>
- <outputProperty>
- <name>indent</name>
- <value>yes</value>
- </outputProperty>
- </outputProperties>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
- <pattern>^.*$</pattern>
- <replacement>syncope.wadl</replacement>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- <transformationSet>
- <dir>${project.build.directory}/generated/wadl</dir>
- <includes>
- <include>syncope.wadl</include>
- </includes>
- <outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${basedir}/src/main/resources/wadl2html/index.xsl</stylesheet>
- <parameters>
- <parameter>
- <name>contextPath</name>
- <value>..</value>
- </parameter>
- </parameters>
- <outputProperties>
- <outputProperty>
- <name>indent</name>
- <value>yes</value>
- </outputProperty>
- </outputProperties>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
- <pattern>^.*$</pattern>
- <replacement>index.html</replacement>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- <transformationSet>
- <dir>${project.build.directory}/generated/wadl</dir>
- <includes>
- <include>syncope.wadl</include>
- </includes>
- <outputDir>${project.build.directory}/generated/wadl</outputDir>
- <stylesheet>${basedir}/src/main/resources/wadl2html/schema.xsl</stylesheet>
- <parameters>
- <parameter>
- <name>contextPath</name>
- <value>..</value>
- </parameter>
- <parameter>
- <name>schema-position</name>
- <value>1</value>
- </parameter>
- <parameter>
- <name>schema-prefix</name>
- <value>syncope21</value>
- </parameter>
- </parameters>
- <outputProperties>
- <outputProperty>
- <name>indent</name>
- <value>yes</value>
- </outputProperty>
- </outputProperties>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
- <pattern>^.*$</pattern>
- <replacement>schema_1_syncope21.html</replacement>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- </transformationSets>
- </configuration>
- </plugin>
-
- <!-- 2. Fix external references -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>copy-rest-reference-to-site</id>
- <phase>pre-site</phase>
- <configuration>
- <target>
- <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery/$/jquery.min.js" value="https://code.jquery.com/jquery-${jquery.version}.min.js" />
- <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui/$/jquery-ui.min.js" value="http://code.jquery.com/ui/${jquery-ui.version}/jquery-ui.min.js" />
- <replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui-themes/$/smoothness/jquery-ui.min.css" value="https://code.jquery.com/ui/${jquery-ui.version}/themes/smoothness/jquery-ui.css" />
-
- <replace file="${project.build.directory}/generated/wadl/schema_1_syncope21.html" token="../webjars/highlightjs/$/highlight.min.js" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js" />
- <replace file="${project.build.directory}/generated/wadl/schema_1_syncope21.html" token="../webjars/highlightjs/$/styles/default.min.css" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css" />
-
- <copy todir="${site.deploymentBaseDir}/rest/2.0">
- <fileset dir="${project.build.directory}/generated/wadl" />
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/d3373115/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/wadl2html/identity.xsl b/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
deleted file mode 100644
index 3678f80..0000000
--- a/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
- <xsl:template match="node()|@*">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-</xsl:stylesheet>
http://git-wip-us.apache.org/repos/asf/syncope/blob/d3373115/src/site/xdoc/release-process.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml
index 67b6b0f..ba1b346 100644
--- a/src/site/xdoc/release-process.xml
+++ b/src/site/xdoc/release-process.xml
@@ -317,6 +317,18 @@ 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
+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
+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
+
svn checkout https://svn.apache.org/repos/asf/syncope/site/ site
cd $SYNCOPE_SITE_DIR
@@ -324,7 +336,7 @@ mvn -P site -Dsite.deploymentBaseUrl=file:///<absolute path to/site>/$VERSION
cd <absolute path to/site>/$VERSION
-# if releasing from 1_2_X
+# 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
@@ -438,13 +450,13 @@ GIT source tag (XXXXXXXXXXXXXXXX):
https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=tag;h=XXXXXXXXXXXXXXXX
List of changes:
-https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=blob_plain;f=CHANGES;h=0a7fb550234f89f4ad315272cf934f2e050250f7;hb=acbc816bdd6a75b27d8fb12b46905fe07e2cd977
+https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=blob_plain;f=CHANGES;h=XXXXXXXXXXXXXXXX;hb=YYYYYYYYYYYYYYYYYYYYY
Staging artifacts:
https://dist.apache.org/repos/dist/dev/syncope/$VERSION
Maven staging repo:
-https://repository.apache.org/content/repositories/orgapachesyncope-YYY/
+https://repository.apache.org/content/repositories/orgapachesyncope-ZZZZ/
Staging site:
http://syncope.apache.org/$VERSION/
@@ -459,24 +471,6 @@ Vote will be open for 72 hours.
[ ] -1 disapprove (and reason why)]]></pre>
</li>
<li>
- Create a <code>DISCUSS</code> email thread on <a href="mailto:dev@syncope.apache.org">syncope-dev</a> for any vote questions, e.g.:
- <pre><![CDATA[
-To: dev@syncope.apache.org
-Subject: [DISCUSS] Apache Syncope $VERSION
-
-Discussion thread for vote on $VERSION release, with GIT source tag (XXXXXXXXXXXXXXXX).
-
-For more information on the release process, check out http://www.apache.org/dev/release.html
-
-Some of the things to check before voting are:
-- does "mvn apache-rat:check" pass on the source
-- can you build the contents of source release zip and GIT tag
-- do all of the staged jars/wars/zips contain the required LICENSE and NOTICE files
-- are all of the staged jars/wars/zips signed and the signature verifiable
-- is the signing key in the project's KEYS file and on a public server (i.e. http://www.apache.org/dist/syncope/)]]>
- </pre>
- </li>
- <li>
Perform a review of the release and cast your vote; more details on
<a href="http://www.apache.org/dev/release.html">Apache releases</a>.
</li>
@@ -575,7 +569,7 @@ 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>.
+ name then running the <a href="https://builds.apache.org/job/Syncope-2_0_X-Docker">dedicated Jenkins job</a>.
</li>
</ol>
</subsection>