projects / lgpl / argeo-commons.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2f527b0)
Make Maven site generation and plugin versions up to date
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 9 Mar 2012 12:27:43 +0000 (12:27 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 9 Mar 2012 12:27:43 +0000 (12:27 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@5180 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

doc/site/apt/index.apt patch | blob | history
doc/site/site.xml patch | blob | history
pom.xml patch | blob | history

diff --git a/doc/site/apt/index.apt b/doc/site/apt/index.apt
index 4fcef7a82c2598984bb57199524e502621a7e506..3753a3eee05261062a757165499b38518d83a2c7 100644 (file)
--- a/doc/site/apt/index.apt
+++ b/doc/site/apt/index.apt
@@ -1,3 +1,3 @@
 Argeo Commons
 
-  Commons components.
+  Commons groups the generic layers developed and maintained by Argeo. They factorize complex but generic logic in fields like security, default configurations, etc.
diff --git a/doc/site/site.xml b/doc/site/site.xml
index 8b5f5f396b0c35ebef0e9b0ecc43f148db715de2..f639492b4ce7fa94e69421db4e061e2dfeb28e13 100644 (file)
--- a/doc/site/site.xml
+++ b/doc/site/site.xml
@@ -24,20 +24,12 @@
        <body>
                <menu name="Overview">
                        <item name="Home" href="${project.url}/index.html" />
-                       <item name="Runtime" href="${project.url}/runtime/index.html">
-                               <item name="API (Javadoc)" href="${project.url}/apidocs/index.html" />
-                               <item name="Code" href="${project.url}/xref/index.html" />
-                               <item name="Unit Tests Results" href="${project.url}/surefire-report.html" />
-                       </item>
+                       <item name="API (Javadoc)" href="${project.url}/apidocs/index.html" target="argeo_commons_javadoc" />
+                       <item name="Browse Code" href="${project.url}/xref/index.html" target="argeo_commons_code" />
+                       <item name="FIXMEs / TODOs" href="${project.url}/taglist.html" />
                </menu>
-               <menu ref="parent" />
-               <menu ref="modules" />
                <menu ref="reports" />
        </body>
-       <poweredBy>
-               <logo name="Maven" href="http://maven.apache.org/"
-                       img="http://maven.apache.org/images/logos/maven-feather.png" />
-       </poweredBy>
        <skin>
                <groupId>org.apache.maven.skins</groupId>
                <artifactId>maven-default-skin</artifactId>
diff --git a/pom.xml b/pom.xml
index aa4bbc607ea8341bd01224119b55b7a5a7bb0d7f..cd89ab8c89a20c00cc7dd802aee311df6d510aef 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,11 @@
        <artifactId>argeo-commons</artifactId>
        <version>0.3.4-SNAPSHOT</version>
        <name>Argeo Commons</name>
+       <description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
        <packaging>pom</packaging>
        <properties>
                <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>
                <!-- distribution -->
@@ -39,6 +41,7 @@
                </developerConnection>
                <url>https://svn.argeo.org/commons/trunk</url>
        </scm>
+       <inceptionYear>2007</inceptionYear>
        <licenses>
                <license>
                        <name>Apache 2</name>
@@ -126,11 +129,11 @@ limitations under the License.
                                </plugin>
                                <plugin>
                                        <artifactId>maven-surefire-plugin</artifactId>
-                                       <version>2.7.1</version>
+                                       <version>2.12</version>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-jar-plugin</artifactId>
-                                       <version>2.3.1</version>
+                                       <version>2.4</version>
                                        <configuration>
                                                <archive>
                                                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
@@ -143,15 +146,11 @@ limitations under the License.
                                </plugin>
                                <plugin>
                                        <artifactId>maven-resources-plugin</artifactId>
-                                       <version>2.4.3</version>
-                               </plugin>
-                               <plugin>
-                                       <artifactId>maven-site-plugin</artifactId>
-                                       <version>2.1.1</version>
+                                       <version>2.5</version>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
-                                       <version>2.1</version>
+                                       <version>2.2.2</version>
                                </plugin>
                                <!-- Apache -->
                                <plugin>
@@ -212,7 +211,108 @@ limitations under the License.
                                <plugin>
                                        <groupId>com.mycila.maven-license-plugin</groupId>
                                        <artifactId>maven-license-plugin</artifactId>
-                                       <version>1.8.0</version>
+                                       <version>1.9.0</version>
+                               </plugin>
+                               <!-- Site -->
+                               <plugin>
+                                       <artifactId>maven-site-plugin</artifactId>
+                                       <version>3.0</version>
+                                       <inherited>false</inherited>
+                                       <configuration>
+                                               <siteDirectory>doc/site</siteDirectory>
+                                               <generateSitemap>true</generateSitemap>
+                                               <skip>true</skip>
+                                               <reportPlugins>
+                                                       <plugin>
+                                                               <groupId>org.apache.maven.plugins</groupId>
+                                                               <artifactId>maven-project-info-reports-plugin</artifactId>
+                                                               <version>2.4</version>
+                                                               <reportSets>
+                                                                       <reportSet>
+                                                                               <reports>
+                                                                                       <report>index</report>
+                                                                                       <report>summary</report>
+                                                                                       <report>license</report>
+                                                                                       <report>scm</report>
+                                                                                       <report>issue-tracking</report>
+                                                                                       <report>project-team</report>
+                                                                               </reports>
+                                                                       </reportSet>
+                                                               </reportSets>
+                                                       </plugin>
+                                                       <plugin>
+                                                               <artifactId>maven-javadoc-plugin</artifactId>
+                                                               <version>2.8.1</version>
+                                                               <configuration>
+                                                                       <encoding>UTF-8</encoding>
+                                                                       <excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
+                                                               </configuration>
+                                                               <reportSets>
+                                                                       <reportSet>
+                                                                               <id>aggregate</id>
+                                                                               <reports>
+                                                                                       <report>aggregate</report>
+                                                                               </reports>
+                                                                       </reportSet>
+                                                               </reportSets>
+                                                       </plugin>
+                                                       <plugin>
+                                                               <artifactId>maven-jxr-plugin</artifactId>
+                                                               <version>2.3</version>
+                                                               <configuration>
+                                                                       <excludes>
+                                                                               <exclude>**/demo/**/*</exclude>
+                                                                               <exclude>**/internal/**/*</exclude>
+                                                                       </excludes>
+                                                               </configuration>
+                                                               <reportSets>
+                                                                       <reportSet>
+                                                                               <id>aggregate</id>
+                                                                               <reports>
+                                                                                       <report>aggregate</report>
+                                                                               </reports>
+                                                                       </reportSet>
+                                                               </reportSets>
+                                                       </plugin>
+                                                       <plugin>
+                                                               <groupId>org.codehaus.mojo</groupId>
+                                                               <artifactId>taglist-maven-plugin</artifactId>
+                                                               <version>2.4</version>
+                                                               <configuration>
+                                                                       <aggregate>true</aggregate>
+                                                                       <tags>
+                                                                               <tag>TODO</tag>
+                                                                               <tag>FIXME</tag>
+                                                                       </tags>
+                                                               </configuration>
+                                                       </plugin>
+                                                       <plugin>
+                                                               <artifactId>maven-changelog-plugin</artifactId>
+                                                               <version>2.2</version>
+                                                               <configuration>
+                                                                       <type>date</type>
+                                                                       <dates>
+                                                                               <date>${developmentCycle.startDate}</date>
+                                                                       </dates>
+                                                                       <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>
                        </plugins>
                </pluginManagement>
@@ -235,48 +335,17 @@ limitations under the License.
                                </configuration>
                        </plugin>
                        <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>
                                <configuration>
                                        <encoding>UTF-8</encoding>
                                </configuration>
                        </plugin>
                        <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
+                               <version>3.0</version>
+                               <inherited>false</inherited>
                                <configuration>
-                                       <siteDirectory>doc/site</siteDirectory>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-release-plugin</artifactId>
-                               <configuration>
-                                       <autoVersionSubmodules>true</autoVersionSubmodules>
-                                       <releaseProfiles>release</releaseProfiles>
-                                       <preparationGoals>clean install</preparationGoals>
-                               </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>
+                                       <skip>false</skip>
                                </configuration>
                        </plugin>
                </plugins>
@@ -318,100 +387,6 @@ limitations under the License.
                        <url>file://${site.repoBase}/${developmentCycle}/</url>
                </site>
        </distributionManagement>
-       <reporting>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-project-info-reports-plugin</artifactId>
-                               <version>2.3.1</version>
-                               <reportSets>
-                                       <reportSet>
-                                               <reports>
-                                                       <report>index</report>
-                                                       <report>summary</report>
-                                                       <report>license</report>
-                                                       <report>scm</report>
-                                                       <report>issue-tracking</report>
-                                                       <report>dependencies</report>
-                                               </reports>
-                                       </reportSet>
-                                       <reportSet>
-                                               <inherited>false</inherited>
-                                               <reports>
-                                                       <report>project-team</report>
-                                               </reports>
-                                       </reportSet>
-                               </reportSets>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>2.7</version>
-                               <inherited>false</inherited>
-                               <configuration>
-                                       <aggregate>true</aggregate>
-                                       <encoding>UTF-8</encoding>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jxr-plugin</artifactId>
-                               <version>2.2</version>
-                               <configuration>
-                                       <aggregate>true</aggregate>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-report-plugin</artifactId>
-                               <version>2.7.1</version>
-                               <inherited>false</inherited>
-                               <configuration>
-                                       <aggregate>true</aggregate>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>taglist-maven-plugin</artifactId>
-                               <version>2.4</version>
-                               <configuration>
-                                       <aggregate>true</aggregate>
-                                       <tags>
-                                               <tag>TODO</tag>
-                                               <tag>FIXME</tag>
-                                               <tag>@deprecated</tag>
-                                       </tags>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-changelog-plugin</artifactId>
-                               <version>2.2</version>
-                               <inherited>false</inherited>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-pmd-plugin</artifactId>
-                               <version>2.3</version>
-                               <inherited>false</inherited>
-                               <configuration>
-                                       <linkXref>true</linkXref>
-                                       <targetJdk>1.5</targetJdk>
-                                       <aggregate>true</aggregate>
-                                       <excludes>
-                                               <exclude>**/springutil/*.java</exclude>
-                                       </excludes>
-                               </configuration>
-                               <reportSets>
-                                       <reportSet>
-                                               <reports>
-                                                       <report>cpd</report>
-                                               </reports>
-                                       </reportSet>
-                               </reportSets>
-                       </plugin>
-               </plugins>
-       </reporting>
        <profiles>
                <profile>
                        <id>release</id>
Argeo Commons - Lightweight integration framework in pure Java/OSGi