Move to james-project-1.7
git-svn-id: https://svn.apache.org/repos/asf/james/postage/trunk@1200540 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index f423afb..78e60e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
<relativePath></relativePath>
</parent>
@@ -62,7 +62,7 @@
<distributionManagement>
<site>
<id>postage-website</id>
- <url>scp://people.apache.org/www/james.apache.org/postage/</url>
+ <url>scpexe://people.apache.org/www/james.apache.org/postage/</url>
</site>
</distributionManagement>
@@ -344,40 +344,6 @@
<repositories>
<repository>
- <id>central</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
-
- <!--
- this should be removed and custom jars should
- be copied to a local files based repository.
- -->
- <repository>
- <id>ibiblio</id>
- <name>Main maven repo</name>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
-
- <repository>
<id>local-postage-stage-repository</id>
<name>Local postage stage repository</name>
<!-- Please note that due to http://jira.codehaus.org/browse/MNG-2896 -->
@@ -412,12 +378,6 @@
</repositories>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -445,47 +405,19 @@
</descriptorRefs>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <encoding>iso8859-1</encoding>
- </configuration>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>instrument</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <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>
- </plugins>
- </reporting>
</project>
diff --git a/src/reporting-site/site.xml b/src/reporting-site/site.xml
index f930e1c..cf70ef3 100644
--- a/src/reporting-site/site.xml
+++ b/src/reporting-site/site.xml
@@ -19,12 +19,6 @@
-->
<project name="${project.name}">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>James Postage</name>
<src>images/logos/james-postage-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-postage-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" />
diff --git a/src/site/site.xml b/src/site/site.xml
index ac7e803..f8e4660 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,12 +19,6 @@
-->
<project name="Postage">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>James Postage</name>
<src>images/logos/james-postage-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-postage-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 name="Postage">
