Author: ilgrosso
Date: Tue Oct 7 08:12:44 2014
New Revision: 1629819
URL: http://svn.apache.org/r1629819
Log:
Jackson and maven-deploy-plugin upgrade
Modified:
syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
syncope/branches/1_2_X/pom.xml
syncope/branches/1_2_X/src/site/xdoc/downloads.xml
syncope/branches/1_2_X/src/site/xdoc/release-process.xml
Modified:
syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java?rev=1629819&r1=1629818&r2=1629819&view=diff
==============================================================================
---
syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
(original)
+++
syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/services/UserSelfService.java
Tue Oct 7 08:12:44 2014
@@ -48,8 +48,9 @@ public interface UserSelfService extends
*
* @return <tt>Response</tt> contains special Syncope HTTP header
indicating if user self registration and / or
* password reset is allowed
- * @see
org.apache.syncope.common.types.RESTHeaders#SELFREGISTRATION_ALLOWED
- * @see org.apache.syncope.common.types.RESTHeaders#PASSWORDRESET_ALLOWED
+ * @see org.apache.syncope.common.types.RESTHeaders#SELFREG_ALLOWED
+ * @see org.apache.syncope.common.types.RESTHeaders#PWDRESET_ALLOWED
+ * @see
org.apache.syncope.common.types.RESTHeaders#PWDRESET_NEEDS_SECURITYQUESTIONS
*/
@Descriptions({
@Description(target = DocTarget.RESPONSE,
Modified: syncope/branches/1_2_X/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/pom.xml?rev=1629819&r1=1629818&r2=1629819&view=diff
==============================================================================
--- syncope/branches/1_2_X/pom.xml (original)
+++ syncope/branches/1_2_X/pom.xml Tue Oct 7 08:12:44 2014
@@ -328,7 +328,7 @@ under the License.
<cxf.version>3.0.1</cxf.version>
<spring.version>4.0.7.RELEASE</spring.version>
<spring-security.version>3.2.5.RELEASE</spring-security.version>
- <jackson.version>2.4.2</jackson.version>
+ <jackson.version>2.4.3</jackson.version>
<velocity.version>1.7</velocity.version>
<velocitytools.version>2.0</velocitytools.version>
<quartz.version>2.2.1</quartz.version>
@@ -1486,7 +1486,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.8.2</version>
</plugin>
<plugin>
Modified: syncope/branches/1_2_X/src/site/xdoc/downloads.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/src/site/xdoc/downloads.xml?rev=1629819&r1=1629818&r2=1629819&view=diff
==============================================================================
--- syncope/branches/1_2_X/src/site/xdoc/downloads.xml (original)
+++ syncope/branches/1_2_X/src/site/xdoc/downloads.xml Tue Oct 7 08:12:44 2014
@@ -60,7 +60,7 @@ under the License.
</section>
<section name="Current Releases">
- <subsection name="1.2.0-M1 Intermezzo">
+ <subsection name="1.2.0 Intermezzo">
<p>Release date: Oct 3rd, 2014</p>
<p>
<a
href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo";>Release
notes</a>
Modified: syncope/branches/1_2_X/src/site/xdoc/release-process.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/src/site/xdoc/release-process.xml?rev=1629819&r1=1629818&r2=1629819&view=diff
==============================================================================
--- syncope/branches/1_2_X/src/site/xdoc/release-process.xml (original)
+++ syncope/branches/1_2_X/src/site/xdoc/release-process.xml Tue Oct 7
08:12:44 2014
@@ -271,7 +271,7 @@ mvn -P site -Dsite.deploymentBaseUrl=fil
cd common
mvn -P offline-doc
-cd ../../site/<version>
+cd ../../../site/<version>
rm -rf syncope-* project-reports.html apidocs/1.html
# if releasing from 1_2_X
@@ -498,7 +498,7 @@ svn commit -m "Cleaning up older release
<source><![CDATA[
svn co https://svn.apache.org/repos/asf/syncope/site/
cd site
-svn rm *.html apidocs css images img js
+svn rm *.html apidocs rest css images img js
svn mv <version>/* .
svn rm <version>
svn commit -m "Promoting the staging site"]]></source>
