james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r1197780 - in /james/protocols/trunk: pom.xml src/reporting-site/site.xml src/site/site.xml
Date Fri, 04 Nov 2011 21:16:50 GMT
Author: felixk
Date: Fri Nov  4 21:16:49 2011
New Revision: 1197780

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

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

Modified: james/protocols/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1197780&r1=1197779&r2=1197780&view=diff
==============================================================================
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Fri Nov  4 21:16:49 2011
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>1.6</version>
+        <version>1.7</version>
         <relativePath />
     </parent>
 
@@ -49,27 +49,14 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/protocols/trunk</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/james/protocols/trunk?root=Apache-SVN</url>
     </scm>
-    <ciManagement>
-        <system>hudson</system>
-        <url>http://hudson.zones.apache.org/hudson/view/James/job/james-protocols-trunk/</url>
-        <notifiers>
-            <notifier>
-                <type>mail</type>
-            </notifier>
-        </notifiers>
-    </ciManagement>
 
     <distributionManagement>
         <site>
             <id>server-trunk-website</id>
-            <url>scp://people.apache.org/www/james.apache.org/protocols/trunk/</url>
+            <url>scpexe://people.apache.org/www/james.apache.org/protocols/trunk/</url>
         </site>
     </distributionManagement>
 
-    <properties>
-        <target.jdk>1.6</target.jdk>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -171,85 +158,10 @@
     </dependencyManagement>
 
     <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.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>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -268,261 +180,7 @@
                     </filesets>
                 </configuration>
             </plugin>
-
-            <!-- 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.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>${target.jdk}</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>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>aggregate</goal>
-                            <goal>test-aggregate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <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>
-            </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>
         </plugins>
     </build>
 
-    <profiles>
-        <!-- TODO: Move this to james parent pom -->
-        <!-- This take care of generate a zip and tar.gz file for the source -->
-        <profile>
-            <id>apache-release</id>
-            <activation>
-                <property>
-                    <name>apache-release</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <!-- waiting for release -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                                    <descriptorRefs>
-                                        <descriptorRef>source-release</descriptorRef>
-                                    </descriptorRefs>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <!-- apache version not yet released -->
-                                <!--<groupId>org.apache</groupId> -->
-                                <groupId>org.apache.geronimo.genesis</groupId>
-                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                                <!-- apache version not yet known -->
-                                <version>2.0</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

Modified: james/protocols/trunk/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/src/reporting-site/site.xml?rev=1197780&r1=1197779&r2=1197780&view=diff
==============================================================================
--- james/protocols/trunk/src/reporting-site/site.xml (original)
+++ james/protocols/trunk/src/reporting-site/site.xml Fri Nov  4 21:16:49 2011
@@ -19,12 +19,6 @@
 -->
 <project name="${project.name}">
 
-    <skin>
-        <groupId>org.apache.james</groupId>
-        <artifactId>james-skin</artifactId>
-        <version>1.7</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="modules" />

Modified: james/protocols/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/src/site/site.xml?rev=1197780&r1=1197779&r2=1197780&view=diff
==============================================================================
--- james/protocols/trunk/src/site/site.xml (original)
+++ james/protocols/trunk/src/site/site.xml Fri Nov  4 21:16:49 2011
@@ -19,12 +19,6 @@
 -->
 <project name="Apache James Protocols">
 
-  <skin>
-    <groupId>org.apache.james</groupId>
-    <artifactId>james-skin</artifactId>
-    <version>1.7</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 name="Documentation">
@@ -53,8 +41,6 @@
 <!--      <item name="JIRA Report" href="/jira-report.html" />-->
     </menu>
 
-    <menu ref="reports" />
-
   </body>  
 
 </project>



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