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 2014/08/29 17:22:44 UTC
svn commit: r1621325 - in /syncope/trunk: ./ core-upgrader/pom.xml
deb/console/pom.xml deb/core/pom.xml deb/pom.xml installer/pom.xml pom.xml
standalone/pom.xml
Author: ilgrosso
Date: Fri Aug 29 15:22:43 2014
New Revision: 1621325
URL: http://svn.apache.org/r1621325
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core-upgrader/pom.xml
syncope/trunk/deb/console/pom.xml
syncope/trunk/deb/core/pom.xml
syncope/trunk/deb/pom.xml
syncope/trunk/installer/pom.xml
syncope/trunk/pom.xml
syncope/trunk/standalone/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1621312-1621324
Modified: syncope/trunk/core-upgrader/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core-upgrader/pom.xml?rev=1621325&r1=1621324&r2=1621325&view=diff
==============================================================================
--- syncope/trunk/core-upgrader/pom.xml (original)
+++ syncope/trunk/core-upgrader/pom.xml Fri Aug 29 15:22:43 2014
@@ -31,13 +31,13 @@ under the License.
<artifactId>core-upgrader</artifactId>
<packaging>jar</packaging>
- <name>Apache Syncope Upgrader</name>
- <description>Apache Syncope Upgrader from 1.1.X to 1.2.X</description>
+ <name>Apache Syncope Core Upgrader</name>
+ <description>Apache Syncope Core Upgrader from 1.1.X to 1.2.X</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<xstream.version>1.4.7</xstream.version>
</properties>
+
<dependencies>
<dependency>
Modified: syncope/trunk/deb/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/deb/console/pom.xml?rev=1621325&r1=1621324&r2=1621325&view=diff
==============================================================================
--- syncope/trunk/deb/console/pom.xml (original)
+++ syncope/trunk/deb/console/pom.xml Fri Aug 29 15:22:43 2014
@@ -86,6 +86,34 @@ under the License.
</resources>
<plugins>
+ <!-- Put NOTICE and LICENSE files in all javadoc artifacts -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-javadoc-legal-files</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/apidocs/META-INF</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
@@ -187,4 +215,22 @@ under the License.
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: syncope/trunk/deb/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/deb/core/pom.xml?rev=1621325&r1=1621324&r2=1621325&view=diff
==============================================================================
--- syncope/trunk/deb/core/pom.xml (original)
+++ syncope/trunk/deb/core/pom.xml Fri Aug 29 15:22:43 2014
@@ -104,7 +104,35 @@ under the License.
</execution>
</executions>
</plugin>
-
+
+ <!-- Put NOTICE and LICENSE files in all javadoc artifacts -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-javadoc-legal-files</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/apidocs/META-INF</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../..</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
@@ -222,8 +250,26 @@ under the License.
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: syncope/trunk/deb/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/deb/pom.xml?rev=1621325&r1=1621324&r2=1621325&view=diff
==============================================================================
--- syncope/trunk/deb/pom.xml (original)
+++ syncope/trunk/deb/pom.xml Fri Aug 29 15:22:43 2014
@@ -42,6 +42,24 @@ under the License.
<log.directory>/var/log/apache-syncope</log.directory>
</properties>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<modules>
<module>core</module>
<module>console</module>
Modified: syncope/trunk/installer/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/installer/pom.xml?rev=1621325&r1=1621324&r2=1621325&view=diff
==============================================================================
--- syncope/trunk/installer/pom.xml (original)
+++ syncope/trunk/installer/pom.xml Fri Aug 29 15:22:43 2014
@@ -176,4 +176,23 @@ under the License.
</resource>
</resources>
</build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1621325&r1=1621324&r2=1621325&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri Aug 29 15:22:43 2014
@@ -1268,7 +1268,7 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -1528,6 +1528,12 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
@@ -1621,10 +1627,10 @@ under the License.
<module>common</module>
<module>client</module>
<module>core</module>
+ <module>core-upgrader</module>
<module>console</module>
<module>standalone</module>
<module>installer</module>
- <module>core-upgrader</module>
<module>deb</module>
</modules>
</project>
Modified: syncope/trunk/standalone/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/standalone/pom.xml?rev=1621325&r1=1621324&r2=1621325&view=diff
==============================================================================
--- syncope/trunk/standalone/pom.xml (original)
+++ syncope/trunk/standalone/pom.xml Fri Aug 29 15:22:43 2014
@@ -213,4 +213,23 @@ under the License.
</resource>
</resources>
</build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>