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 2013/04/04 13:06:39 UTC
svn commit: r1464440 - in /syncope/trunk: ./ pom.xml
src/site/resources/images/apache-incubator-logo.png src/site/site.xml
src/site/xdoc/release-process.xml
Author: ilgrosso
Date: Thu Apr 4 11:06:39 2013
New Revision: 1464440
URL: http://svn.apache.org/r1464440
Log:
Merge from 1_1_X
Removed:
syncope/trunk/src/site/resources/images/apache-incubator-logo.png
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
syncope/trunk/src/site/site.xml
syncope/trunk/src/site/xdoc/release-process.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1463927-1464438
Merged /syncope/branches/1_1_X:r1464359-1464439
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1464440&r1=1464439&r2=1464440&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Apr 4 11:06:39 2013
@@ -1200,8 +1200,8 @@ under the License.
<phase>process-resources</phase>
<configuration>
<target name="copy-javadoc-files" description="Copy NOTICE/LICENSE files for javadoc jars">
- <mkdir dir="target/apidocs/META-INF" />
- <copy todir="target/apidocs/META-INF">
+ <mkdir dir="${project.build.directory}/apidocs/META-INF" />
+ <copy todir="${project.build.directory}/apidocs/META-INF">
<fileset dir="..">
<include name="NOTICE" />
<include name="LICENSE" />
@@ -1276,13 +1276,14 @@ under the License.
<build>
<defaultGoal>clean site-deploy</defaultGoal>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.2</version>
<configuration>
<locales>en</locales>
+ <generateProjectInfo>false</generateProjectInfo>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1291,35 +1292,38 @@ under the License.
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- <anonymousConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/syncope/trunk</anonymousConnection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/syncope/trunk</developerConnection>
- <webAccessUrl>http://svn.apache.org/viewvc/incubator/syncope/trunk</webAccessUrl>
</configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- <report>mailing-list</report>
- <report>project-team</report>
- <report>scm</report>
- <report>cim</report>
- <report>issue-tracking</report>
- <report>license</report>
- </reports>
- </reportSet>
- </reportSets>
+ <reports>
+ <report>index</report>
+ <report>mailing-list</report>
+ <report>project-team</report>
+ <report>scm</report>
+ <report>cim</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ </reports>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
+ <configuration>
+ <destDir>apidocs/1.1</destDir>
+ <detectLinks>true</detectLinks>
+ <detectJavaApiLink>true</detectJavaApiLink>
+ <links>
+ <link>http://docs.oracle.com/javaee/6/api/</link>
+ <link>http://www.slf4j.org/api/</link>
+ <link>http://tirasa.github.com/ConnId/apidocs/base/</link>
+ <link>http://ci.apache.org/projects/wicket/apidocs/6.0.x/</link>
+ <link>http://static.springsource.org/spring/docs/3.2.x/javadoc-api/</link>
+ <link>http://static.springsource.org/spring-security/site/docs/3.1.x/apidocs/</link>
+ <link>http://activiti.org/javadocs/</link>
+ </links>
+ </configuration>
+ <reports>
+ <report>aggregate</report>
+ </reports>
</plugin>
</reportPlugins>
</configuration>
Modified: syncope/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/site.xml?rev=1464440&r1=1464439&r2=1464440&view=diff
==============================================================================
--- syncope/trunk/src/site/site.xml (original)
+++ syncope/trunk/src/site/site.xml Thu Apr 4 11:06:39 2013
@@ -25,8 +25,8 @@ under the License.
name="Apache Syncope">
<publishDate position="right"/>
- <version position="right"/>
-
+ <version position="none"/>
+
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -36,9 +36,6 @@ under the License.
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
- <googleSearch>
- <sitesearch>${project.url}</sitesearch>
- </googleSearch>
<twitter>
<user>syncopeidm</user>
<showUser>true</showUser>
@@ -48,6 +45,8 @@ under the License.
<projectId>syncope</projectId>
<widget>thin-badge</widget>
</ohloh>
+ <facebookLike/>
+ <googlePlusOne/>
</fluidoSkin>
</custom>
@@ -61,7 +60,10 @@ under the License.
<item name="Features" href="features.html"/>
<item name="Architecture" href="architecture.html"/>
<item name="Downloads" href="downloads.html"/>
- <item name="Javadoc" href="apidocs/index.html"/>
+ <item name="API Docs" href="apidocs/1.1/index.html">
+ <item name="Javadocs 1.1" href="apidocs/1.1/index.html"/>
+ <item name="Javadocs 1.0" href="apidocs/1.0/index.html"/>
+ </item>
<item name="License" href="license.html"/>
<item name="Professional Services" href="professional-services.html"/>
</menu>
Modified: syncope/trunk/src/site/xdoc/release-process.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/release-process.xml?rev=1464440&r1=1464439&r2=1464440&view=diff
==============================================================================
--- syncope/trunk/src/site/xdoc/release-process.xml (original)
+++ syncope/trunk/src/site/xdoc/release-process.xml Thu Apr 4 11:06:39 2013
@@ -116,7 +116,7 @@ under the License.
importance to go through these at least once for every major release.
</p>
<p>
- All verifications takes place in the <tt>core</tt> submodule.
+ All verifications take place in the <tt>core</tt> submodule.
<ol>
<li>DBMS
<ul>
@@ -188,52 +188,33 @@ pass <tt>-Dweblogic.home=...</tt> to Mav
<subsection name="Prepare the source for release">
<ol>
- <li>Clean up JIRA so the
- <b>Fix Version</b> in issues resolved since the last
- release includes this release version correctly. Also, transition any
- <b>Resolved</b> issues to the
- <b>Closed</b> state.
+ <li>Clean up JIRA so the <b>Fix Version</b> in issues resolved since the last
+ release includes this release version correctly. Also, transition any
+ <b>Resolved</b> issues to the <b>Closed</b> state.
</li>
<li>
- Update the <tt>CHANGES</tt> file in a working copy of the project root based on the Text release reports
- from JIRA.
- </li>
- <li>
- Update the <a href="downloads.html">downloads</a> site page by adding the new release artifacts with base
- URL <source>http://www.apache.org/dyn/closer.cgi/syncope/<version>/</source>,
- moving current release artifacts to 'Older Releases' section and changing base URL to
- <source>http://archive.apache.org/dist/syncope/</source>
+ Update the <tt>CHANGES</tt> file, in a SVN working copy <u>of the branch under release</u> (currently 1_0_X
+ or 1_1_X), based on the text release reports from JIRA.
</li>
<li>
Commit any changes back to SVN:
- <source>svn commit -m "updating files for release"</source>
- </li>
- <li>
- Perform a full build and deploy the SNAPSHOT artifacts:
- <source>mvn clean deploy</source>
+ <source>svn commit -m "Updating CHANGES for release"</source>
</li>
- </ol>
- </subsection>
-
- <subsection name="Get source tree">
- <ol>
<li>
- <strong>
- <em>Only for new major releases (like 1.0.0 to 1.1.0):</em>
- </strong>
- <br/>
- Create a sub-branch from which to make the release.
- <br/>
- Releasing from a branch will allow any cosmetic changes that need to be made for the release to be
- approved to be done without preventing other more disruptive advances in the trunk from potentially
- causing problems with the release. It also provides a future maintenance branch (like 1.0.x.)
- <br/>
- A branch can be made by running:
- <source>mvn -P apache-release release:branch -DbranchName=1_0_X</source>
+ Update the <a href="https://svn.apache.org/repos/asf/syncope/branches/1_1_X/src/site/xdoc/downloads.xml">downloads</a>
+ site page from a SVN working copy <u>of the branch used for managing the web site</u> (currenly 1_1_X):
+ <ul>
+ <li>add new release artifacts with base URL
+ <source>http://www.apache.org/dyn/closer.cgi/syncope/<version>/</source>
+ </li>
+ <li>move current release artifacts to 'Older Releases' section and change base URL to
+ <source>http://archive.apache.org/dist/syncope/</source>
+ </li>
+ </ul>
</li>
<li>
- Checkout a clean copy of the trunk/branch to release using command line SVN:
- <source>svn checkout https://svn.apache.org/repos/asf/syncope/trunk/ release</source>
+ Commit any changes back to SVN:
+ <source>svn commit -m "Updating downloads site page for release"</source>
</li>
</ol>
</subsection>
@@ -241,8 +222,7 @@ pass <tt>-Dweblogic.home=...</tt> to Mav
<subsection name="Prepare the release">
<ol>
<li>
- Do a dry run of the
- <tt>release:prepare</tt> step.
+ Do a dry run of the <tt>release:prepare</tt> step.
<source>mvn -P apache-release release:prepare -DdryRun=true</source>
The dry run will not commit any changes back to SVN and gives you the opportunity to verify that the
@@ -258,24 +238,19 @@ pass <tt>-Dweblogic.home=...</tt> to Mav
<li>
Verify that the release process completed as expected:
<ol>
- <li>The release plugin will create
- <code>pom.xml.tag</code> files which contain the
- changes that would have been committed to SVN. The only differences between
- <code>pom.xml.tag</code> and its corresponding
- <code>pom.xml</code> file should be the version
- number.
+ <li>The release plugin will create <code>pom.xml.tag</code> files which contain the changes that would
+ have been committed to SVN. The only differences between <code>pom.xml.tag</code> and its corresponding
+ <code>pom.xml</code> file should be the version number.
</li>
<li>
If other formatting changes have been made you should review the changes and then commit them:
- <source>svn commit -m "fixing formatting for release"</source>
+ <source>svn commit -m "Fixing formatting for release"</source>
</li>
<li>
- Assuming the
- <code>.tag</code> files look OK you may proceed and do any other validation you feel necessary.
- The following list may be helpful:
+ Assuming the <code>.tag</code> files look OK you may proceed and do any other validation you feel
+ necessary. The following list may be helpful:
<ol>
- <li>Check
- <tt>release.properties</tt> and make sure that the scm properties have the
+ <li>Check <tt>release.properties</tt> and make sure that the scm properties have the
right version. Sometimes the scm location can be the previous version not the next version.
</li>
<li>
@@ -297,9 +272,8 @@ gpg: Signature made ...</source>
</ol>
</li>
<li>
- Run the
- <tt>release:prepare</tt> step for real this time. You'll be prompted for the same version information and
- optionally your GPG passphrase again.
+ Run the <tt>release:prepare</tt> step for real this time. You'll be prompted for the same version
+ information and optionally your GPG passphrase again.
<source>mvn -P apache-release release:prepare</source>
</li>
<li>
@@ -315,20 +289,40 @@ cd <version></source>
<subsection name="Perform the release">
<ol>
<li>
- This step will create the staging site
- <source>svn checkout https://svn.apache.org/repos/asf/syncope/site/ site
+ <b>Staging site</b>
+ <ul>
+ <li>1_1_X
+<source>svn checkout https://svn.apache.org/repos/asf/syncope/site/ site
svn checkout https://svn.apache.org/repos/asf/syncope/tags/syncope-<version> syncope-<version>
cd syncope-<version>
mvn clean install
mvn -P site -Dsite.deploymentBaseUrl=file:///<absolute path to ../site/<version>>
cd ../site/<version>
-rm -r syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools
+rm -rf syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools project-reports.html apidocs/1.html
cd ..
svn add <version>
-svn commit -m "staging site for release"</source>
+svn copy apidocs/1.0 <version>/apidocs/
+svn commit -m "Staging site for release"</source>
+ </li>
+ <li>1_0_X
+<source>svn checkout https://svn.apache.org/repos/asf/syncope/site/ site
+svn checkout https://svn.apache.org/repos/asf/syncope/tags/syncope-<version> syncope-<version>
+cd syncope-<version>
+mvn clean install
+mvn -f parent/pom.xml -P site -Dsite.deploymentBaseUrl=file:///<absolute path to ../site/<version>>
+cd ../site/<version>
+rm -rf images css syncope-console syncope-client syncope-archetype syncope-core syncope-build-tools syncope-hibernate-enhancer syncope-quality project-reports.html apidocs/1.html
+cd ..
+svn add <version>
+svn copy *.html css images img js <version>
+svn copy apidocs/1.1 <version>/apidocs/
+svn commit -m "Staging site for release"</source>
+ </li>
+ </ul>
</li>
<li>
- From the directory where you have launched <tt>release:prepare</tt> execute (this step will create a maven staging repository):
+ From the directory where you have launched <tt>release:prepare</tt> execute (this step will create a maven
+ staging repository):
<source>mvn -P apache-release release:perform [-Duser.name=<your_apache_uid>]</source>
<p>
@@ -360,7 +354,9 @@ svn commit -m "staging site for release"
files (see
<a href="http://people.apache.org/~henkp/repo/faq.html">Repository FAQ</a> and
<a href="http://www.apache.org/dev/release-signing.html#openpgp-ascii-detach-sig">Detached Signatures</a>).
- The <code>syncope-<version>-source-release.zip</code>
+ <br/>
+ The <code>syncope-<version>-source-release.zip</code> (for 1_1_X) or
+ <code>syncope-root-<version>-source-release.zip</code> (for 1_0_X)
should likewise have signature and checksum files.
</li>
</ol>
@@ -531,7 +527,7 @@ svn commit -m "Promoting the voted relea
<source>
svn co https://svn.apache.org/repos/asf/syncope/site/
cd site
-svn rm *.html apidocs css images js
+svn rm *.html apidocs css images img js
svn mv <version>/* .
svn rm <version>
svn commit -m "Promoting the staging site"</source>
@@ -574,12 +570,12 @@ svn commit -m "Promoting the staging sit
<p>Delete the svn tag created by the
<code>release:perform</code> step:
</p>
- <source>svn rm https://svn.apache.org/repos/asf/syncope/tags/<version> -m "deleting tag from rolled back release"</source>
+ <source>svn remove https://svn.apache.org/repos/asf/syncope/tags/<version> -m "Deleting tag from rolled back release"</source>
</li>
<li>
<p>Delete the staging site:
</p>
- <source>svn rm https://svn.apache.org/repos/asf/syncope/site/<version> -m "deleting staging site from rolled back release"</source>
+ <source>svn remove https://svn.apache.org/repos/asf/syncope/site/<version> -m "Deleting staging site from rolled back release"</source>
</li>
<li>
<p>Drop the nexus staging repo:</p>