X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=dd4abe9345b772b0725a2cbde3336aa53b43b016;hb=be5c8c8a3698d9c12fb295ba8d27853f8aecc266;hp=64b782210c936479fe94700eb78c91a0220b21aa;hpb=72d60cac7d75e3f2cc088328eb4185767f13ad59;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 64b782210..dd4abe934 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 		<developmentCycle>0.3</developmentCycle>
 		<developmentCycle.startDate>2011-03-24</developmentCycle.startDate>
 		<version.argeo-distribution>1.1.7</version.argeo-distribution>
-		<version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>0.3.4</version.argeo-commons>
 		<!-- distribution -->
 		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
@@ -33,6 +33,7 @@
 		<module>eclipse</module>
 		<module>security</module>
 		<module>demo</module>
+		<module>doc</module>
 	</modules>
 	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
@@ -151,6 +152,9 @@ limitations under the License.
 				<plugin>
 					<artifactId>maven-release-plugin</artifactId>
 					<version>2.2.2</version>
+					<configuration>
+						<autoVersionSubmodules>true</autoVersionSubmodules>
+					</configuration>
 				</plugin>
 				<!-- Apache -->
 				<plugin>
@@ -217,7 +221,6 @@ limitations under the License.
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
 					<version>3.0</version>
-					<inherited>false</inherited>
 					<configuration>
 						<siteDirectory>doc/site</siteDirectory>
 						<generateSitemap>true</generateSitemap>
@@ -310,20 +313,6 @@ limitations under the License.
 									<dateFormat>yyyy-MM-dd</dateFormat>
 								</configuration>
 							</plugin>
-							<!-- <plugin> -->
-							<!-- <artifactId>maven-pmd-plugin</artifactId> -->
-							<!-- <version>2.7.1</version> -->
-							<!-- <configuration> -->
-							<!-- <linkXref>true</linkXref> -->
-							<!-- <targetJdk>1.6</targetJdk> -->
-							<!-- <aggregate>true</aggregate> -->
-							<!-- <excludes> -->
-							<!-- <exclude>**/springutil/*.java</exclude> -->
-							<!-- <exclude>**/demo/**/*.java</exclude> -->
-							<!-- <exclude>**/internal/**/*.java</exclude> -->
-							<!-- </excludes> -->
-							<!-- </configuration> -->
-							<!-- </plugin> -->
 						</reportPlugins>
 					</configuration>
 				</plugin>
@@ -360,10 +349,35 @@ limitations under the License.
 					<skip>false</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-release-plugin</artifactId>
+				<configuration>
+					<releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.mycila.maven-license-plugin</groupId>
+				<artifactId>maven-license-plugin</artifactId>
+				<configuration>
+					<header>license-apache2-header.txt</header>
+					<failIfMissing>true</failIfMissing>
+					<aggregate>true</aggregate>
+					<includes>
+						<include>src/**/*.java</include>
+						<include>src/**/*.xml</include>
+					</includes>
+					<excludes>
+						<exclude>**/springutil/**</exclude>
+						<exclude>**/qooxdoo-sdk/**</exclude>
+					</excludes>
+					<useDefaultExcludes>true</useDefaultExcludes>
+					<mapping>
+						<java>SLASHSTAR_STYLE</java>
+						<xml>XML_STYLE</xml>
+					</mapping>
+				</configuration>
+			</plugin>
 		</plugins>
-		<!-- NOTE: This is just a vision for the future, it's not yet implemented: 
-			see MNG-2216 -->
-		<!-- <sourceEncoding>UTF-8</sourceEncoding> -->
 	</build>
 	<dependencyManagement>
 		<dependencies>
@@ -396,20 +410,10 @@ limitations under the License.
 		<site>
 			<id>argeo-commons-site</id>
 			<name>Argeo Commons Site</name>
-			<url>file://${site.repoBase}/${developmentCycle}/</url>
+			<url>file://${site.repoBase}/${project.version}</url>
 		</site>
 	</distributionManagement>
 	<profiles>
-		<profile>
-			<id>release</id>
-			<distributionManagement>
-				<site>
-					<id>argeo-commons-site</id>
-					<name>Argeo Commons Site</name>
-					<url>file://${site.repoBase}/${project.version}</url>
-				</site>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>localrepo</id>
 			<distributionManagement>
@@ -427,13 +431,6 @@ limitations under the License.
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
-		<profile>
-			<id>full</id>
-			<modules>
-				<module>doc</module>
-				<module>sandbox</module>
-			</modules>
-		</profile>
 		<profile>
 			<id>el5</id>
 			<properties>