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 2012/08/17 15:50:54 UTC
svn commit: r1374258 - in /incubator/syncope/trunk: archetype/pom.xml
build-tools/pom.xml client/pom.xml console/pom.xml core/pom.xml parent/
pom.xml quality/pom.xml src/ src/site/xdoc/release-process.xml
Author: ilgrosso
Date: Fri Aug 17 13:50:53 2012
New Revision: 1374258
URL: http://svn.apache.org/viewvc?rev=1374258&view=rev
Log:
[SYNCOPE-79] Parent POM is root POM now: expecting failures from Jenkins and Sonar...
Added:
incubator/syncope/trunk/pom.xml
- copied, changed from r1374232, incubator/syncope/trunk/parent/pom.xml
incubator/syncope/trunk/src/
- copied from r1374232, incubator/syncope/trunk/parent/src/
Removed:
incubator/syncope/trunk/parent/
Modified:
incubator/syncope/trunk/archetype/pom.xml
incubator/syncope/trunk/build-tools/pom.xml
incubator/syncope/trunk/client/pom.xml
incubator/syncope/trunk/console/pom.xml
incubator/syncope/trunk/core/pom.xml
incubator/syncope/trunk/quality/pom.xml
incubator/syncope/trunk/src/site/xdoc/release-process.xml
Modified: incubator/syncope/trunk/archetype/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/pom.xml?rev=1374258&r1=1374257&r2=1374258&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/pom.xml (original)
+++ incubator/syncope/trunk/archetype/pom.xml Fri Aug 17 13:50:53 2012
@@ -26,7 +26,6 @@ under the License.
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
<version>1.1.0-incubating-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
<name>Apache Syncope Archetype</name>
Modified: incubator/syncope/trunk/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/build-tools/pom.xml?rev=1374258&r1=1374257&r2=1374258&view=diff
==============================================================================
--- incubator/syncope/trunk/build-tools/pom.xml (original)
+++ incubator/syncope/trunk/build-tools/pom.xml Fri Aug 17 13:50:53 2012
@@ -26,7 +26,6 @@ under the License.
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
<version>1.1.0-incubating-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
<name>Apache Syncope Build Tools</name>
Modified: incubator/syncope/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/pom.xml?rev=1374258&r1=1374257&r2=1374258&view=diff
==============================================================================
--- incubator/syncope/trunk/client/pom.xml (original)
+++ incubator/syncope/trunk/client/pom.xml Fri Aug 17 13:50:53 2012
@@ -26,7 +26,6 @@ under the License.
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
<version>1.1.0-incubating-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
<name>Apache Syncope Client</name>
Modified: incubator/syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/pom.xml?rev=1374258&r1=1374257&r2=1374258&view=diff
==============================================================================
--- incubator/syncope/trunk/console/pom.xml (original)
+++ incubator/syncope/trunk/console/pom.xml Fri Aug 17 13:50:53 2012
@@ -26,7 +26,6 @@ under the License.
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
<version>1.1.0-incubating-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
<name>Apache Syncope Console</name>
Modified: incubator/syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/pom.xml?rev=1374258&r1=1374257&r2=1374258&view=diff
==============================================================================
--- incubator/syncope/trunk/core/pom.xml (original)
+++ incubator/syncope/trunk/core/pom.xml Fri Aug 17 13:50:53 2012
@@ -26,7 +26,6 @@ under the License.
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
<version>1.1.0-incubating-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
</parent>
<name>Apache Syncope Core</name>
Copied: incubator/syncope/trunk/pom.xml (from r1374232, incubator/syncope/trunk/parent/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/pom.xml?p2=incubator/syncope/trunk/pom.xml&p1=incubator/syncope/trunk/parent/pom.xml&r1=1374232&r2=1374258&rev=1374258&view=diff
==============================================================================
--- incubator/syncope/trunk/parent/pom.xml (original)
+++ incubator/syncope/trunk/pom.xml Fri Aug 17 13:50:53 2012
@@ -50,9 +50,9 @@ under the License.
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/syncope/trunk/parent</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/syncope/trunk/parent</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/syncope/trunk/parent</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/syncope/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/syncope/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/syncope/trunk</url>
</scm>
<issueManagement>
@@ -1032,6 +1032,16 @@ under the License.
</executions>
</plugin>
<plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <tagNameFormat>syncope-@{project.version}</tagNameFormat>
+ <arguments>-Papache-release</arguments>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
@@ -1066,13 +1076,28 @@ under the License.
<profiles>
<profile>
- <id>all</id>
- <modules>
- <module>../quality</module>
- <module>../archetype</module>
- </modules>
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
-
+
<profile>
<id>site</id>
<build>
@@ -1089,7 +1114,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -1128,16 +1153,16 @@ under the License.
</plugin>
</plugins>
</build>
-
- <modules>
- <module>../quality</module>
- <module>../archetype</module>
- <module>../build-tools</module>
- <module>../client</module>
- <module>../core</module>
- <module>../console</module>
- </modules>
</profile>
</profiles>
+
+ <modules>
+ <module>quality</module>
+ <module>archetype</module>
+ <module>build-tools</module>
+ <module>client</module>
+ <module>core</module>
+ <module>console</module>
+ </modules>
</project>
Modified: incubator/syncope/trunk/quality/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/quality/pom.xml?rev=1374258&r1=1374257&r2=1374258&view=diff
==============================================================================
--- incubator/syncope/trunk/quality/pom.xml (original)
+++ incubator/syncope/trunk/quality/pom.xml Fri Aug 17 13:50:53 2012
@@ -22,11 +22,9 @@ under the License.
<modelVersion>4.0.0</modelVersion>
- <!-- Parent POM is not Syncope parent POM but Syncope root POM: this is due to avoid circular dependencies between
- this POM and Syncope parent POM; specific items related to this are marked below as <SyncopeRootPOM />. -->
<parent>
<groupId>org.apache.syncope</groupId>
- <artifactId>syncope-root</artifactId>
+ <artifactId>syncope</artifactId>
<version>1.1.0-incubating-SNAPSHOT</version>
</parent>
Modified: incubator/syncope/trunk/src/site/xdoc/release-process.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/src/site/xdoc/release-process.xml?rev=1374258&r1=1374232&r2=1374258&view=diff
==============================================================================
--- incubator/syncope/trunk/src/site/xdoc/release-process.xml (original)
+++ incubator/syncope/trunk/src/site/xdoc/release-process.xml Fri Aug 17 13:50:53 2012
@@ -130,7 +130,7 @@ under the License.
</li>
<li>
Perform a full build and deploy the SNAPSHOT artifacts:
- <source>mvn -P all clean deploy</source>
+ <source>mvn clean deploy</source>
</li>
</ol>
</subsection>
@@ -239,8 +239,8 @@ cd <version></source>
<source>svn checkout https://svn.apache.org/repos/asf/incubator/syncope/site/ site
svn checkout https://svn.apache.org/repos/asf/incubator/syncope/tags/syncope-<version> syncope-<version>
cd syncope-<version>
-mvn -Pall clean install
-mvn -f parent/pom.xml -P site -Dsite.deploymentBaseUrl=file:///<absolute path to ../site/<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 syncope-hibernate-enhancer syncope-quality
cd ..
@@ -280,7 +280,7 @@ 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-root-<version>-source-release.zip</code> of <code>syncope-root</code>
+ The <code>syncope-<version>-source-release.zip</code>
should likewise have signature and checksum files.
</li>
</ol>
@@ -329,7 +329,7 @@ Maven staging repo:
https://repository.apache.org/content/repositories/orgapachesyncope-YYY/
Source release (checksums and signatures are available at the same location):
-https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope-root/<version>/syncope-root-<version>-source-release.zip
+https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope/<version>/syncope-<version>-source-release.zip
Staging site:
http://incubator.apache.org/syncope/<version>/
@@ -417,7 +417,7 @@ Maven staging repo:
https://repository.apache.org/content/repositories/orgapachesyncope-YYY/
Source release (checksums and signatures are available at the same location):
-https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope-root/<version>/syncope-root-<version>-source-release.zip
+https://repository.apache.org/content/repositories/orgapachesyncope-YYY/org/apache/syncope/syncope/<version>/syncope-<version>-source-release.zip
Staging site:
http://incubator.apache.org/syncope/<version>/
@@ -504,7 +504,7 @@ Best regards.
<source>ssh people.apache.org
cd /x1/www/www.apache.org/dist/incubator/syncope/
wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.zip* -R .asc.sha1,.asc.md5 \
-https://repository.apache.org/content/repositories/releases/org/apache/syncope/syncope-root/<version>/
+https://repository.apache.org/content/repositories/releases/org/apache/syncope/syncope/<version>/
</source>
</li>
<li>