Author: felixk
Date: Fri Mar 18 20:11:46 2011
New Revision: 1083036
URL: http://svn.apache.org/viewvc?rev=1083036&view=rev
Log:
Some fixes regarding JAMES-1041.
Modified:
james/project/trunk/maven-skin/pom.xml
james/project/trunk/pom.xml
james/project/trunk/project/pom.xml
james/project/trunk/project/server/2.2.0/pom.xml
james/project/trunk/project/server/pom.xml
james/project/trunk/project/server/src/site/xdoc/FAQ.xml
Modified: james/project/trunk/maven-skin/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/maven-skin/pom.xml?rev=1083036&r1=1083035&r2=1083036&view=diff
==============================================================================
--- james/project/trunk/maven-skin/pom.xml (original)
+++ james/project/trunk/maven-skin/pom.xml Fri Mar 18 20:11:46 2011
@@ -1,4 +1,4 @@
-<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="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,23 +17,18 @@
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>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-skin</artifactId>
- <version>1.6-SNAPSHOT</version>
- <name>JAMES Skin</name>
- <description>Apache JAMES Official Maven2/3 Site Skin</description>
-
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-parent</artifactId>
<version>1.6-SNAPSHOT</version>
</parent>
-
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-skin</artifactId>
+ <name>JAMES Skin</name>
+ <description>Apache JAMES Official Maven2/3 Site Skin</description>
<url>http://james.apache.org/maven-skin/</url>
- <prerequisites>
- <maven>3.0.2</maven>
- </prerequisites>
<distributionManagement>
<site>
@@ -43,6 +38,20 @@
</distributionManagement>
<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-project-info-reports-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -52,7 +61,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
<reports>
<report>distribution-management</report>
<report>index</report>
Modified: james/project/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/pom.xml?rev=1083036&r1=1083035&r2=1083036&view=diff
==============================================================================
--- james/project/trunk/pom.xml (original)
+++ james/project/trunk/pom.xml Fri Mar 18 20:11:46 2011
@@ -1,43 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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 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";>
- <!--
- 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.
- -->
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.james</groupId>
- <artifactId>james-parent</artifactId>
- <name>Apache JAMES Parent POM</name>
- <version>1.6-SNAPSHOT</version>
- <description>
- The Apache JAMES Parent POM
- </description>
-
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>7</version>
</parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-parent</artifactId>
+ <name>Apache JAMES Parent POM</name>
+ <version>1.6-SNAPSHOT</version>
+ <description>The Apache JAMES Parent POM</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<prerequisites>
- <maven>2.0.6</maven>
+ <maven>3.0.2</maven>
</prerequisites>
<modules>
@@ -49,9 +47,6 @@
<inceptionYear>2006</inceptionYear>
<packaging>pom</packaging>
- <dependencies>
- </dependencies>
-
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
@@ -273,8 +268,4 @@
</site>
</distributionManagement>
- <profiles>
- <!-- Use inherited apache release profile -->
- </profiles>
-
</project>
Modified: james/project/trunk/project/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/project/pom.xml?rev=1083036&r1=1083035&r2=1083036&view=diff
==============================================================================
--- james/project/trunk/project/pom.xml (original)
+++ james/project/trunk/project/pom.xml Fri Mar 18 20:11:46 2011
@@ -1,48 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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 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";>
- <!--
- 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.
- -->
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.james</groupId>
- <artifactId>james-project</artifactId>
- <name>Apache JAMES Project</name>
- <version>1.6-SNAPSHOT</version>
- <description>
- The Apache JAMES Project
- </description>
-
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-parent</artifactId>
<version>1.6-SNAPSHOT</version>
</parent>
-
- <modules>
- <module>server</module>
- </modules>
-
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
+ <name>Apache JAMES Project</name>
+ <description>The Apache JAMES Project</description>
<url>http://james.apache.org/</url>
<inceptionYear>2006</inceptionYear>
<packaging>pom</packaging>
- <dependencies>
- </dependencies>
+ <modules>
+ <module>server</module>
+ </modules>
<issueManagement>
<system>JIRA</system>
@@ -101,7 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>${maven-site-plugin.version}</version>
+ <version>3.0-beta-3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -146,23 +138,9 @@
</build>
<profiles>
- <!-- can be removed when all james project have been migrated to maven 3
only -->
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <properties>
- <maven-site-plugin.version>3.0-beta-3</maven-site-plugin.version>
- </properties>
- </profile>
-
<!--
Switches between generating the documentation site (without using this
profile) and
- generating the tenchnical reports site (using this profile)
+ generating the technical reports site (using this profile)
-->
<profile>
<id>site-reports</id>
@@ -175,7 +153,6 @@
</profiles>
<properties>
- <maven-site-plugin.version>2.2</maven-site-plugin.version>
<maven-site-plugin.siteDirectory>${basedir}/src/site</maven-site-plugin.siteDirectory>
<maven-site-plugin.generateReports>false</maven-site-plugin.generateReports>
</properties>
Modified: james/project/trunk/project/server/2.2.0/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/project/server/2.2.0/pom.xml?rev=1083036&r1=1083035&r2=1083036&view=diff
==============================================================================
--- james/project/trunk/project/server/2.2.0/pom.xml (original)
+++ james/project/trunk/project/server/2.2.0/pom.xml Fri Mar 18 20:11:46 2011
@@ -19,19 +19,16 @@
-->
<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>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-site-2-2-0</artifactId>
- <name>JAMES Server 2.2.0 Documentation</name>
- <version>1.6-SNAPSHOT</version>
- <description>
- Apache JAMES Server 2.2.0 Documentation
- </description>
- <packaging>pom</packaging>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-server-root</artifactId>
<version>1.6-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-site-2-2-0</artifactId>
+ <name>JAMES Server 2.2.0 Documentation</name>
+ <description>Apache JAMES Server 2.2.0 Documentation</description>
+ <packaging>pom</packaging>
<url>http://james.apache.org/server/2.2.0/</url>
<inceptionYear>2006</inceptionYear>
Modified: james/project/trunk/project/server/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/project/server/pom.xml?rev=1083036&r1=1083035&r2=1083036&view=diff
==============================================================================
--- james/project/trunk/project/server/pom.xml (original)
+++ james/project/trunk/project/server/pom.xml Fri Mar 18 20:11:46 2011
@@ -19,24 +19,22 @@
-->
<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>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-root</artifactId>
- <name>JAMES Server</name>
- <version>1.6-SNAPSHOT</version>
- <description>
- Apache JAMES Server
- </description>
- <packaging>pom</packaging>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.6-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-root</artifactId>
+ <name>JAMES Server</name>
+ <description>Apache JAMES Server</description>
+ <url>http://james.apache.org/server/</url>
+ <inceptionYear>2006</inceptionYear>
+ <packaging>pom</packaging>
+
<modules>
<module>2.2.0</module>
</modules>
- <url>http://james.apache.org/server/</url>
- <inceptionYear>2006</inceptionYear>
<distributionManagement>
<site>
@@ -67,5 +65,4 @@
</mailingList>
</mailingLists>
-
</project>
Modified: james/project/trunk/project/server/src/site/xdoc/FAQ.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/project/server/src/site/xdoc/FAQ.xml?rev=1083036&r1=1083035&r2=1083036&view=diff
==============================================================================
--- james/project/trunk/project/server/src/site/xdoc/FAQ.xml (original)
+++ james/project/trunk/project/server/src/site/xdoc/FAQ.xml Fri Mar 18
20:11:46 2011
@@ -27,7 +27,7 @@
<body>
<section name="This FAQ">
- <P>This is a living document that provides answers to common questions
about James, installation, configuration, admin and running not already
answered in the documentation. Last Updated January 2005.</P>
+ <p>This is a living document that provides answers to common questions
about James, installation, configuration, admin and running not already
answered in the documentation. Last Updated January 2005.</p>
</section>
<section name="Questions">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
