james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r1197776 - in /james/server/trunk: pom.xml src/reporting-site/site.xml src/site/site.xml
Date Fri, 04 Nov 2011 21:07:02 GMT
Author: felixk
Date: Fri Nov  4 21:07:01 2011
New Revision: 1197776

URL: http://svn.apache.org/viewvc?rev=1197776&view=rev
Log:
Move to james-project-1.7

Modified:
    james/server/trunk/pom.xml
    james/server/trunk/src/reporting-site/site.xml
    james/server/trunk/src/site/site.xml

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1197776&r1=1197775&r2=1197776&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Nov  4 21:07:01 2011
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>james-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>1.6</version>
+        <version>1.7</version>
         <relativePath></relativePath>
     </parent>
 
@@ -40,10 +40,6 @@
     <url>http://james.apache.org/server/head/</url>
     <inceptionYear>2002</inceptionYear>
 
-    <prerequisites>
-        <maven>3.0.2</maven>
-    </prerequisites>
-
     <modules>
         <module>container-spring</module>
         <module>core</module>
@@ -84,15 +80,6 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/server/trunk</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/james/server/trunk?root=Apache-SVN</url>
     </scm>
-    <ciManagement>
-        <system>hudson</system>
-        <url>http://hudson.zones.apache.org/hudson/view/James/job/james-server-trunk/</url>
-        <notifiers>
-            <notifier>
-                <type>mail</type>
-            </notifier>
-        </notifiers>
-    </ciManagement>
 
     <distributionManagement>
         <site>
@@ -119,8 +106,6 @@
         <jackrabbit.version>2.2.5</jackrabbit.version>
         <hbase.version>0.90.3</hbase.version>
         <hadoop.version>0.20-append-r1057313</hadoop.version>
-
-        <target.jdk>1.6</target.jdk>
     </properties>
 
     <dependencyManagement>
@@ -1073,105 +1058,10 @@
     </pluginRepositories>
 
     <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-deploy-plugin</artifactId>
-                    <version>2.4</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-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.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.1.0</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-changes-plugin</artifactId>
-                    <version>2.4</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.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.1.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.7.2</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>versions-maven-plugin</artifactId>
-                    <version>1.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.3</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <optimize>true</optimize>
-                    <source>${target.jdk}</source>
-                    <target>${target.jdk}</target>
-                </configuration>
             </plugin>
             <!-- Use maven deploy plugin version 2.4 as workaround -->
             <!-- See: http://jira.codehaus.org/browse/MAPPASM-96 -->
@@ -1233,169 +1123,6 @@
                     </instructions>
                 </configuration>
             </plugin>
-
-            <!-- Site generation -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <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>
-                    <siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
-                    <generateReports>${maven-site-plugin.generateReports}</generateReports>
-                    <generateSitemap>true</generateSitemap>
-                    <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>
-                        <!-- disable this till we released a new version with javamail
1.4.3 as dependency -->
-                        <!--
-                            <plugin>
-                            <groupId>org.apache.james</groupId>
-                            <artifactId>maven-mailetdocs-plugin</artifactId>
-                            <version>0.1</version>
-                            </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.maven.plugins</groupId>
-                            <artifactId>maven-dependency-plugin</artifactId>
-                        </plugin>
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>versions-maven-plugin</artifactId>
-                            <reportSets>
-                                <reportSet>
-                                    <reports>
-                                        <report>dependency-updates-report</report>
-                                        <report>plugin-updates-report</report>
-                                        <report>property-updates-report</report>
-                                    </reports>
-                                </reportSet>
-                            </reportSets>
-                        </plugin>
-                    </reportPlugins>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

Modified: james/server/trunk/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/reporting-site/site.xml?rev=1197776&r1=1197775&r2=1197776&view=diff
==============================================================================
--- james/server/trunk/src/reporting-site/site.xml (original)
+++ james/server/trunk/src/reporting-site/site.xml Fri Nov  4 21:07:01 2011
@@ -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 Server</name>
 		<src>images/logos/james-server-logo.gif</src>
@@ -32,12 +26,6 @@
         <alt>james-server-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" />

Modified: james/server/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/site/site.xml?rev=1197776&r1=1197775&r2=1197776&view=diff
==============================================================================
--- james/server/trunk/src/site/site.xml (original)
+++ james/server/trunk/src/site/site.xml Fri Nov  4 21:07:01 2011
@@ -19,12 +19,6 @@
 -->
 <project name="Apache James Server 3.0">
 
-  <skin>
-    <groupId>org.apache.james</groupId>
-    <artifactId>james-skin</artifactId>
-    <version>1.7-SNAPSHOT</version>
-  </skin>
-
   <bannerLeft>
     <name>Apache James Server 3.0</name>
     <src>images/logos/james-server-logo.gif</src>
@@ -32,12 +26,6 @@
     <alt>james-server-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="Overview">



---------------------------------------------------------------------
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