james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r1078294 - in /james/protocols/trunk: ./ api/ api/src/reporting-site/ impl/ impl/src/reporting-site/ smtp/ smtp/src/reporting-site/ src/reporting-site/
Date Sat, 05 Mar 2011 14:35:08 GMT
Author: felixk
Date: Sat Mar  5 14:35:08 2011
New Revision: 1078294

URL: http://svn.apache.org/viewvc?rev=1078294&view=rev
Log:
Log:
- Fix plugin declarations
- Force maven 3 build
- Add generation of site and technical reports switch by profile site-reports
- Change Jenkins CI configuration to use m3 (JFI, but not in commit included)

See JAMES-1041

Added:
    james/protocols/trunk/api/src/reporting-site/
    james/protocols/trunk/api/src/reporting-site/site.xml   (with props)
    james/protocols/trunk/impl/src/reporting-site/
    james/protocols/trunk/impl/src/reporting-site/site.xml   (with props)
    james/protocols/trunk/smtp/src/reporting-site/
    james/protocols/trunk/smtp/src/reporting-site/site.xml   (with props)
    james/protocols/trunk/src/reporting-site/
    james/protocols/trunk/src/reporting-site/site.xml   (with props)
Modified:
    james/protocols/trunk/api/pom.xml
    james/protocols/trunk/impl/pom.xml
    james/protocols/trunk/pom.xml
    james/protocols/trunk/smtp/pom.xml

Modified: james/protocols/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1078294&r1=1078293&r2=1078294&view=diff
==============================================================================
--- james/protocols/trunk/api/pom.xml (original)
+++ james/protocols/trunk/api/pom.xml Sat Mar  5 14:35:08 2011
@@ -32,6 +32,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <!-- This configuration is used by all goals -->
         <configuration>
           <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

@@ -41,9 +42,6 @@
             </manifest>
           </archive>
         </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
             <goals>

Added: james/protocols/trunk/api/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/reporting-site/site.xml?rev=1078294&view=auto
==============================================================================
--- james/protocols/trunk/api/src/reporting-site/site.xml (added)
+++ james/protocols/trunk/api/src/reporting-site/site.xml Sat Mar  5 14:35:08 2011
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+-->
+<project name="${project.name}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/protocols/trunk/api/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/protocols/trunk/api/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/protocols/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/pom.xml?rev=1078294&r1=1078293&r2=1078294&view=diff
==============================================================================
--- james/protocols/trunk/impl/pom.xml (original)
+++ james/protocols/trunk/impl/pom.xml Sat Mar  5 14:35:08 2011
@@ -32,6 +32,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <!-- This configuration is used by all goals -->
         <configuration>
           <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

@@ -41,9 +42,6 @@
             </manifest>
           </archive>
         </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
             <goals>

Added: james/protocols/trunk/impl/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/reporting-site/site.xml?rev=1078294&view=auto
==============================================================================
--- james/protocols/trunk/impl/src/reporting-site/site.xml (added)
+++ james/protocols/trunk/impl/src/reporting-site/site.xml Sat Mar  5 14:35:08 2011
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+-->
+<project name="${project.name}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/protocols/trunk/impl/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/protocols/trunk/impl/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/protocols/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1078294&r1=1078293&r2=1078294&view=diff
==============================================================================
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Sat Mar  5 14:35:08 2011
@@ -32,6 +32,11 @@
   <url>http://james.apache.org/protocols</url>
   <inceptionYear>2010</inceptionYear>
   <packaging>pom</packaging>
+  
+  <prerequisites>
+    <maven>3.0.2</maven>
+  </prerequisites>
+
   <modules>
     <module>api</module>
     <module>smtp</module>
@@ -74,20 +79,93 @@
   </repositories>
   
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.4.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jxr-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.0-beta-3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-changes-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.7.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-report-plugin</artifactId>
+          <version>2.7.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.3.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>findbugs-maven-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <optimize>true</optimize>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>${target.jdk}</source>
+          <target>${target.jdk}</target>
         </configuration>
       </plugin>
-      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>2.4.1</version>
         <configuration>
           <filesets>
             <fileset>
@@ -99,81 +177,180 @@
         </configuration>
       </plugin>
       
-    </plugins>
-  </build>
-  
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-          <targetJdk>1.5</targetJdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/controversial.xml</ruleset>
-          </rulesets>
-          <format>xml</format>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
+      <!-- Site generation -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
+        <artifactId>maven-site-plugin</artifactId>
         <configuration>
-            <onlyCurrentVersion>true</onlyCurrentVersion>
-            <resolutionIds>Closed</resolutionIds>
-            <maxEntries>1000</maxEntries>
-        </configuration>
-        <reportSets>
-            <reportSet>
-                <reports>
+          <siteDirectory>${protocols.siteDirectory}</siteDirectory>
+          <generateReports>${protocols.generateReports}</generateReports>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jxr-plugin</artifactId>
+              <configuration>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>dependencies</report>
+                    <report>dependency-management</report>
+                    <report>dependency-convergence</report>
+                    <report>distribution-management</report>
+                    <report>index</report>
+                    <report>license</report>
+                    <report>mailing-list</report>
+                    <report>modules</report>
+                    <report>plugin-management</report>
+                    <report>plugins</report>
+                    <report>project-team</report>
+                    <report>scm</report>
+                    <report>summary</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-report-plugin</artifactId>
+              <configuration>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>rat-maven-plugin</artifactId>
+              <version>1.0-alpha-3</version>
+              <configuration>
+                <excludes>
+                  <exclude>NOTICE.*</exclude>
+                  <exclude>LICENSE.*</exclude>
+                  <!-- Generated by Maven -->
+                  <exclude>release.properties</exclude>
+                  <exclude>dist/**/*</exclude>
+                  <!-- Eclipse -->
+                  <exclude>**/.*</exclude>
+                  <exclude>.*/**/*</exclude>
+                </excludes>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-pmd-plugin</artifactId>
+              <configuration>
+                <aggregate>true</aggregate>
+                <targetJdk>${target.jdk}</targetJdk>
+                <rulesets>
+                  <ruleset>/rulesets/basic.xml</ruleset>
+                  <ruleset>/rulesets/controversial.xml</ruleset>
+                </rulesets>
+                <format>xml</format>
+                <linkXref>true</linkXref>
+                <sourceEncoding>utf-8</sourceEncoding>
+                <minimumTokens>100</minimumTokens>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <configuration>
+                <minmemory>256m</minmemory>
+                <maxmemory>1g</maxmemory>
+                <linksource>true</linksource>
+                <tags>
+                  <tag>
+                    <name>note</name>
+                    <placement>a</placement>
+                    <head>NOTE</head>
+                  </tag>
+                  <tag>
+                    <name>todo</name>
+                    <placement>a</placement>
+                    <head>TODO</head>
+                  </tag>
+                  <tag>
+                    <name>warning</name>
+                    <placement>a</placement>
+                    <head>WARNING</head>
+                  </tag>
+                </tags>
+                <source>1.5</source>
+              </configuration>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>aggregate</report>
+                    <report>test-aggregate</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>findbugs-maven-plugin</artifactId>
+              <configuration>
+                <xrefLocation>${project.reporting.outputDirectory}/xref</xrefLocation>
+                <xrefTestLocation>${project.reporting.outputDirectory}/xref-test</xrefTestLocation>
+                <!-- required by dashboard plugin and hudson -->
+                <xmlOutput>true</xmlOutput>
+                <effort>Max</effort>
+                <findbugsXmlOutput>true</findbugsXmlOutput>
+                <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+              </configuration>
+            </plugin>
+            <!--
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-changes-plugin</artifactId>
+              <configuration>
+                <onlyCurrentVersion>true</onlyCurrentVersion>
+                <resolutionIds>Fixed</resolutionIds>
+                <statusIds>Resolved,Closed</statusIds>
+                <columnNames>Type,Key,Summary,Status,Resolution,Fix Version</columnNames>
+              </configuration>
+              <reportSets>
+                <reportSet>
+                  <reports>
                     <report>jira-report</report>
-                </reports>
-            </reportSet>
-        </reportSets>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            -->
+          </reportPlugins>
+        </configuration>
       </plugin>
     </plugins>
-  </reporting>
+  </build>
+
   <distributionManagement>
     <site>
       <id>server-trunk-website</id>
       <url>scp://people.apache.org/www/james.apache.org/protocols/trunk/</url>
     </site>
   </distributionManagement>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols-smtp</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols-api</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols-impl</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -282,5 +459,18 @@
         </plugins>
       </build>
     </profile>    
+    <profile>
+      <id>site-reports</id>
+      <properties>
+        <protocols.siteDirectory>${basedir}/src/reporting-site</protocols.siteDirectory>
+        <protocols.generateReports>true</protocols.generateReports>
+      </properties>
+    </profile>
   </profiles>
+
+  <properties>
+    <target.jdk>1.5</target.jdk>
+    <protocols.siteDirectory>${basedir}/src/site</protocols.siteDirectory>
+    <protocols.generateReports>false</protocols.generateReports>
+  </properties>
 </project>

Modified: james/protocols/trunk/smtp/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1078294&r1=1078293&r2=1078294&view=diff
==============================================================================
--- james/protocols/trunk/smtp/pom.xml (original)
+++ james/protocols/trunk/smtp/pom.xml Sat Mar  5 14:35:08 2011
@@ -32,6 +32,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <!-- This configuration is used by all goals -->
         <configuration>
           <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

@@ -41,9 +42,6 @@
             </manifest>
           </archive>
         </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
             <goals>

Added: james/protocols/trunk/smtp/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/reporting-site/site.xml?rev=1078294&view=auto
==============================================================================
--- james/protocols/trunk/smtp/src/reporting-site/site.xml (added)
+++ james/protocols/trunk/smtp/src/reporting-site/site.xml Sat Mar  5 14:35:08 2011
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+-->
+<project name="${project.name}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/protocols/trunk/smtp/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/protocols/trunk/smtp/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: james/protocols/trunk/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/src/reporting-site/site.xml?rev=1078294&view=auto
==============================================================================
--- james/protocols/trunk/src/reporting-site/site.xml (added)
+++ james/protocols/trunk/src/reporting-site/site.xml Sat Mar  5 14:35:08 2011
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+-->
+<project name="${project.name}">
+
+    <skin>
+        <groupId>org.apache.james</groupId>
+        <artifactId>maven-skin</artifactId>
+        <version>1.6-SNAPSHOT</version>
+    </skin>
+
+    <bannerLeft>
+        <name>James Project</name>
+        <src>http://james.apache.org/images/logos/james-server-logo.gif</src>
+        <href>http://james.apache.org/index.html</href>
+    </bannerLeft>
+
+    <bannerRight>
+        <name>The Apache Software Foundation</name>
+        <src>http://james.apache.org/images/logos/asf-logo-reduced.gif</src>
+        <href>http://www.apache.org/index.html</href>
+    </bannerRight>
+
+    <body>
+
+        <menu ref="modules" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Propchange: james/protocols/trunk/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/protocols/trunk/src/reporting-site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message