You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by fe...@apache.org on 2011/04/05 06:40:05 UTC
svn commit: r1088890 - in /james/mailet/crypto/trunk: ./ src/reporting-site/
src/reporting-site/resources/ src/reporting-site/resources/images/
src/reporting-site/resources/images/logos/ src/site/
src/site/resources/images/ src/site/resources/images/lo...
Author: felixk
Date: Tue Apr 5 04:40:04 2011
New Revision: 1088890
URL: http://svn.apache.org/viewvc?rev=1088890&view=rev
Log:
Switch to and force maven 3. Add generation of technical reports using the -Psite-reports profile
Added:
james/mailet/crypto/trunk/src/reporting-site/
james/mailet/crypto/trunk/src/reporting-site/resources/
james/mailet/crypto/trunk/src/reporting-site/resources/images/
james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/
james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/asf-logo-reduced.gif (with props)
james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/james-crypto-mailets-logo.gif (with props)
james/mailet/crypto/trunk/src/reporting-site/site.xml (with props)
james/mailet/crypto/trunk/src/site/resources/images/logos/
james/mailet/crypto/trunk/src/site/resources/images/logos/asf-logo-reduced.gif
- copied unchanged from r1075291, james/mailet/crypto/trunk/src/site/resources/images/asf-logo-reduced.gif
james/mailet/crypto/trunk/src/site/resources/images/logos/james-crypto-mailets-logo.gif
- copied unchanged from r1075291, james/mailet/crypto/trunk/src/site/resources/images/james-crypto-mailets-logo.gif
Removed:
james/mailet/crypto/trunk/src/site/resources/images/asf-logo-reduced.gif
james/mailet/crypto/trunk/src/site/resources/images/james-crypto-mailets-logo.gif
Modified:
james/mailet/crypto/trunk/pom.xml
james/mailet/crypto/trunk/src/site/site.xml
Modified: james/mailet/crypto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/pom.xml?rev=1088890&r1=1088889&r2=1088890&view=diff
==============================================================================
--- james/mailet/crypto/trunk/pom.xml (original)
+++ james/mailet/crypto/trunk/pom.xml Tue Apr 5 04:40:04 2011
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
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
@@ -16,49 +16,28 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
+ <version>1.6</version>
+ </parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-crypto-mailets</artifactId>
<name>Apache JAMES Crypto Mailets</name>
+ <url>http://james.apache.org/mailet/crypto/</url>
+ <inceptionYear>2008</inceptionYear>
<version>1.1-SNAPSHOT</version>
<packaging>jar</packaging>
+
<description>
Apache JAMES Cryptographic Mailets is a collection of mailets which use cryptography.
This includes matching signatures, decrypting, encrypting and signing.
</description>
- <parent>
- <groupId>org.apache.james</groupId>
- <artifactId>james-project</artifactId>
- <version>1.5</version>
- </parent>
- <url>http://james.apache.org/mailet/crypto/</url>
- <inceptionYear>2008</inceptionYear>
<properties>
- <!--
- The website is committed to subversion. This property can be overriden
- to upload the site to a local staging location.
- For example, adding the following to ~/.m2/settings.xml will upload
- to localhost:
-
- <profiles>
- <profile>
- <id>main</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <james.www>scp://localhost/www</james.www>
- <james.www.id>localhost</james.www.id>
- ...
- -->
- <!-- General location for site stage -->
- <james.www>scp://people.apache.org/www/james.apache.org/</james.www>
- <!-- Project specific location, allowing specific override -->
- <james.cryptomailets.www>${james.www}/mailet/crypto/</james.cryptomailets.www>
- <!-- Overridding this value allows single set of loopback settings to be maintained -->
- <james.www.id>crypto-mailet-website</james.www.id>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<target.jdk>1.5</target.jdk>
<version.bc>1.43</version.bc>
@@ -66,8 +45,8 @@
<distributionManagement>
<site>
- <id>${james.www.id}</id>
- <url>${james.cryptomailets.www}</url>
+ <id>crypto-mailet-website</id>
+ <url>scp://people.apache.org/www/james.apache.org/mailet/crypto/</url>
</site>
</distributionManagement>
@@ -122,8 +101,88 @@
</mailingLists>
<build>
+ <pluginManagement>
+ <plugins>
+ <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-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-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-doap-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.2.0</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-surefire-report-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.7</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-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-mailetdocs-plugin</artifactId>
+ <version>0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<optimize>true</optimize>
@@ -140,13 +199,13 @@
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Specification-Title>Apache James Cryptography Mailets</Specification-Title>
- <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Version>${project.version}</Specification-Version>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
<Implementation-Title>Apache James Cryptography Mailets</Implementation-Title>
- <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <url>${pom.url}</url>
+ <url>${project.url}</url>
</manifestEntries>
</archive>
</configuration>
@@ -154,7 +213,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -172,6 +230,7 @@
</instructions>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-doap-plugin</artifactId>
@@ -199,7 +258,9 @@
</configuration>
</plugin>
+ -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
@@ -215,64 +276,165 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-mailetdocs-plugin</artifactId>
- <version>0.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
+
+ <!-- Site generation -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <excludes>
- <exclude>NOTICE.txt</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>LICENSE.apache</exclude>
- <!-- Generated by Maven -->
- <exclude>release.properties</exclude>
- <exclude>dist/**/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.3</version>
+ <executions>
+ <!-- Attach non-reporting site-descriptor when installing -->
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ <configuration>
+ <siteDirectory>${basedir}/src/site</siteDirectory>
+ <generateReports>false</generateReports>
+ </configuration>
+ </execution>
+ </executions>
<configuration>
- <encoding>UTF-8</encoding>
+ <siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
+ <generateReports>${maven-site-plugin.generateReports}</generateReports>
+ <reportPlugins>
+ <!-- Order matters. First project-info-reports, second jxr. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reports>
+ <report>index</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>cim</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ <report>dependencies</report>
+ </reports>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-mailetdocs-plugin</artifactId>
+ </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>${target.jdk}</source>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <aggregate>true</aggregate>
+ <targetJdk>${target.jdk}</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <format>xml</format>
+ <xrefLocation>${project.reporting.outputDirectory}/xref</xrefLocation>
+ <xrefTestLocation>${project.reporting.outputDirectory}/xref-test</xrefTestLocation>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <!-- 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>Closed</resolutionIds>
+ <maxEntries>1000</maxEntries>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx1024m -XX:MaxPermSize=512m</argLine>
+ <aggregate>true</aggregate>
+ <linkXref>true</linkXref>
+ <xrefLocation>${project.reporting.outputDirectory}</xrefLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>LICENSE.apache</exclude>
+ <!-- Generated by Maven -->
+ <exclude>release.properties</exclude>
+ <exclude>dist/**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+ </reportPlugins>
</configuration>
</plugin>
</plugins>
- </reporting>
-
+ </build>
</project>
Added: james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/asf-logo-reduced.gif
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/asf-logo-reduced.gif?rev=1088890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/asf-logo-reduced.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/james-crypto-mailets-logo.gif
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/james-crypto-mailets-logo.gif?rev=1088890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/mailet/crypto/trunk/src/reporting-site/resources/images/logos/james-crypto-mailets-logo.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/mailet/crypto/trunk/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/src/reporting-site/site.xml?rev=1088890&view=auto
==============================================================================
--- james/mailet/crypto/trunk/src/reporting-site/site.xml (added)
+++ james/mailet/crypto/trunk/src/reporting-site/site.xml Tue Apr 5 04:40:04 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</version>
+ </skin>
+
+ <bannerLeft>
+ <name>JAMES Cryptography Mailets</name>
+ <src>images/logos/james-crypto-mailets-logo.gif</src>
+ <href>http://james.apache.org/mailet/crypto/index.html</href>
+ <alt>james-crypto-mailets-logo.gif</alt>
+ </bannerLeft>
+
+ <bannerRight>
+ <name>The Apache Software Foundation</name>
+ <src>images/logos/asf-logo-reduced.gif</src>
+ <href>http://www.apache.org/index.html</href>
+ </bannerRight>
+
+ <body>
+
+ <menu ref="reports" />
+
+ </body>
+
+</project>
Propchange: james/mailet/crypto/trunk/src/reporting-site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mailet/crypto/trunk/src/reporting-site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: james/mailet/crypto/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/src/site/site.xml?rev=1088890&r1=1088889&r2=1088890&view=diff
==============================================================================
--- james/mailet/crypto/trunk/src/site/site.xml (original)
+++ james/mailet/crypto/trunk/src/site/site.xml Tue Apr 5 04:40:04 2011
@@ -18,10 +18,17 @@
under the License.
-->
<project name="Apache JAMES Crypto">
+ <skin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.6</version>
+ </skin>
+
<bannerLeft>
<name>JAMES Cryptography Mailets</name>
- <src>images/james-crypto-mailets-logo.gif</src>
+ <src>images/logos/james-crypto-mailets-logo.gif</src>
<href>http://james.apache.org/mailet/crypto/index.html</href>
+ <alt>james-crypto-mailets-logo.gif</alt>
</bannerLeft>
<bannerRight>
@@ -30,12 +37,6 @@
<href>http://www.apache.org/index.html</href>
</bannerRight>
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-skin</artifactId>
- <version>1.2</version>
- </skin>
-
<body>
<menu name="Cryptography Mailets">
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org