Switch to and force maven 3. Add generation of technical reports using the -Psite-reports profile
git-svn-id: https://svn.apache.org/repos/asf/james/jspf/trunk@1082771 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 9bba7a4..7c7db84 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -59,8 +59,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<configuration>
<descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
<tarLongFileMode>gnu</tarLongFileMode>
diff --git a/assemble/src/reporting-site/site.xml b/assemble/src/reporting-site/site.xml
new file mode 100644
index 0000000..d919164
--- /dev/null
+++ b/assemble/src/reporting-site/site.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 19b5475..a5999c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
- <version>1.5</version>
+ <version>1.6-SNAPSHOT</version>
</parent>
<name>Apache JAMES jSPF</name>
<version>0.9.9-SNAPSHOT</version>
@@ -64,48 +64,49 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1</version>
+ <version>3.0-beta-3</version>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.2.0</version>
</plugin>
- <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.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <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.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-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.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.7</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-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>${target.jdk}</source>
<target>${target.jdk}</target>
@@ -113,19 +114,193 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.8</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <!-- Site generation -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ <configuration>
+ <siteDirectory>${basedir}/src/site</siteDirectory>
+ <generateReports>false</generateReports>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <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>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>
+ </plugin>
+ <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-surefire-report-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>NOTICE.*</exclude>
+ <exclude>LICENSE.*</exclude>
+ <!-- Generated by Maven -->
+ <exclude>release.properties</exclude>
+ <exclude>dist/**/*</exclude>
+ <!-- Eclipse -->
+ <exclude>**/.*</exclude>
+ <exclude>.*/**/*</exclude>
+ <!-- 3rd party resources described in NOTICE:
+ see the maven-remote-resources-plugin configuration, in this file -->
+ <exclude>src/test/resources/org/apache/james/jspf/test_live.txt</exclude>
+ <exclude>src/test/resources/org/apache/james/jspf/test_parser.txt</exclude>
+ <exclude>src/test/resources/org/apache/james/jspf/test_rfc_examples.txt</exclude>
+ <exclude>src/main/resources/org/apache/james/jspf/tester/pyspf-tests.yml</exclude>
+ <exclude>src/main/resources/org/apache/james/jspf/tester/rfc4408-tests.yml</exclude>
+ <exclude>src/main/resources/org/apache/james/jspf/tester/rfc4408-tests-2009.10.yml</exclude>
+ <exclude>src/main/resources/org/apache/james/jspf/tester/tests.yml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <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>
+ </plugin>
+ -->
+ </reportPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencyManagement>
diff --git a/resolver/pom.xml b/resolver/pom.xml
index 34e2002..6aa01a3 100644
--- a/resolver/pom.xml
+++ b/resolver/pom.xml
@@ -60,27 +60,19 @@
</dependency>
</dependencies>
- <reporting>
+ <build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<excludes>
<!-- 3rd party resources described in NOTICE:
@@ -93,26 +85,9 @@
</excludes>
</configuration>
</plugin>
- </plugins>
- </reporting>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -142,16 +117,16 @@
<addClasspath>true</addClasspath>
</manifest>
<manifestEntries>
- <Specification-Title>${pom.name}</Specification-Title>
- <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Implementation-Title>${pom.name}</Implementation-Title>
- <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
<X-Compile-Source-JDK>${target.jdk}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${target.jdk}</X-Compile-Target-JDK>
- <url>${pom.url}</url>
+ <url>${project.url}</url>
</manifestEntries>
</archive>
</configuration>
@@ -161,6 +136,7 @@
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
@@ -176,7 +152,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -188,6 +163,7 @@
</plugin>
<!-- Add NOTICE and LICENSE to generated JAR -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/resolver/src/reporting-site/site.xml b/resolver/src/reporting-site/site.xml
new file mode 100644
index 0000000..d919164
--- /dev/null
+++ b/resolver/src/reporting-site/site.xml
@@ -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>
diff --git a/resolver/src/site/site.xml b/resolver/src/site/site.xml
deleted file mode 100644
index 365ab0e..0000000
--- a/resolver/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="jSPF">
- <body>
- <!-- This is a "dummy" site because of this bug: -->
- <!-- http://jira.codehaus.org/browse/MSITE-345 -->
- <menu ref="parent"/>
- <menu ref="reports"/>
- </body>
-</project>
diff --git a/src/reporting-site/site.xml b/src/reporting-site/site.xml
new file mode 100644
index 0000000..da4803c
--- /dev/null
+++ b/src/reporting-site/site.xml
@@ -0,0 +1,48 @@
+<?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 jSPF</name>
+ <src>images/logos/james-jspf-logo.gif</src>
+ <href>http://james.apache.org/jspf/index.html</href>
+ <alt>james-jspf-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="modules" />
+ <menu ref="reports" />
+
+ </body>
+
+</project>
diff --git a/src/site/site.xml b/src/site/site.xml
index 74300a4..b05f406 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,15 +18,22 @@
under the License.
-->
<project name="jSPF">
+ <skin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ </skin>
+
<bannerLeft>
<name>James jSPF</name>
- <src>images/james-jspf-logo.gif</src>
+ <src>images/logos/james-jspf-logo.gif</src>
<href>http://james.apache.org/jspf/index.html</href>
+ <alt>james-jspf-logo.gif</alt>
</bannerLeft>
<bannerRight>
<name>The Apache Software Foundation</name>
- <src>http://james.apache.org/jspf/images/asf-logo-reduced.gif</src>
+ <src>images/logos/asf-logo-reduced.gif</src>
<href>http://www.apache.org/index.html</href>
</bannerRight>
@@ -35,7 +42,7 @@
<menu name="jSPF" inherit="top">
<item name="Overview" href="/index.html"/>
<item name="jSPF FAQ" href="/FAQ.html"/>
- <item name="Mailing Lists" href="/mail-lists.html" />
+ <item name="Mailing Lists" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/mail-lists.html" />
<item name="Useful RFCs" href="/rfclist.html"/>
</menu>
@@ -48,18 +55,14 @@
-->
<menu name="Project">
- <item name="Bug Database" href="/issue-tracking.html"/>
- <item name="Source Code" href="/source-repository.html"/>
- <item name="Who We Are" href="/team-list.html" />
+ <item name="Bug Database" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/issue-tracking.html"/>
+ <item name="Source Code" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/source-repository.html"/>
+ <item name="Who We Are" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/team-list.html" />
<!-- Not yet there
<item name="Contributing" href="contribute.html"/>
-->
- <item name="License" href="/license.html"/>
+ <item name="License" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/license.html"/>
</menu>
-
- <menu ref="modules" />
-
- <menu ref="reports" />
</body>
</project>
diff --git a/tester/pom.xml b/tester/pom.xml
index 6b24391..f81a6d7 100644
--- a/tester/pom.xml
+++ b/tester/pom.xml
@@ -54,20 +54,19 @@
</dependency>
</dependencies>
- <reporting>
+ <build>
<plugins>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<excludes>
<!-- 3rd party resources described in NOTICE:
@@ -80,27 +79,9 @@
</excludes>
</configuration>
</plugin>
- </plugins>
- </reporting>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -119,26 +100,28 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
- <Specification-Title>${pom.name}</Specification-Title>
- <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Implementation-Title>${pom.name}</Implementation-Title>
- <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
<X-Compile-Source-JDK>${target.jdk}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${target.jdk}</X-Compile-Target-JDK>
- <url>${pom.url}</url>
+ <url>${project.url}</url>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
@@ -154,7 +137,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -166,8 +148,8 @@
</plugin>
<!-- Add NOTICE and LICENSE to generated JAR -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<goals>
diff --git a/tester/src/reporting-site/site.xml b/tester/src/reporting-site/site.xml
new file mode 100644
index 0000000..d919164
--- /dev/null
+++ b/tester/src/reporting-site/site.xml
@@ -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>
diff --git a/tester/src/site/site.xml b/tester/src/site/site.xml
deleted file mode 100644
index a33ccf4..0000000
--- a/tester/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="jSPF">
- <body>
- <!-- This is a "dummy" site because of this bug: -->
- <!-- http://jira.codehaus.org/browse/MSITE-345 -->
- <menu ref="parent"/>
- <menu ref="reports"/>
- </body>
-</project>
