You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/06/28 00:04:53 UTC
svn commit: r1140344 - in /maven/pom/trunk/asf: pom.xml site-pom.xml
src/site-docs/ src/site-docs/apt/ src/site-docs/apt/index.apt
src/site-docs/site.xml src/site/apt/ src/site/site.xml
Author: hboutemy
Date: Mon Jun 27 22:04:52 2011
New Revision: 1140344
URL: http://svn.apache.org/viewvc?rev=1140344&view=rev
Log:
[MPOM-7] added separate pom and site directory for pom documentation
Added:
maven/pom/trunk/asf/site-pom.xml (with props)
maven/pom/trunk/asf/src/site-docs/
maven/pom/trunk/asf/src/site-docs/apt/
- copied from r1140326, maven/pom/trunk/asf/src/site/apt/
maven/pom/trunk/asf/src/site-docs/site.xml (with props)
Removed:
maven/pom/trunk/asf/src/site/apt/
Modified:
maven/pom/trunk/asf/pom.xml
maven/pom/trunk/asf/src/site-docs/apt/index.apt
maven/pom/trunk/asf/src/site/site.xml
Modified: maven/pom/trunk/asf/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1140344&r1=1140343&r2=1140344&view=diff
==============================================================================
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Mon Jun 27 22:04:52 2011
@@ -76,20 +76,10 @@ under the License.
</mailingList>
</mailingLists>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/pom/trunk/asf</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/MPOM/component/12314370</url>
- </issueManagement>
-
<distributionManagement>
<!-- Site omitted - each project must provide their own -->
- <!-- this project *has* a site, but it gets deployed manually
- to avoid unwanted inheritance. -->
+ <!-- this project *has* a site: http://maven.apache.org/pom/asf/
+ but it gets deployed manually to avoid unwanted inheritance. -->
<repository>
<id>apache.releases.https</id>
<name>Apache Release Distribution Repository</name>
Added: maven/pom/trunk/asf/site-pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/site-pom.xml?rev=1140344&view=auto
==============================================================================
--- maven/pom/trunk/asf/site-pom.xml (added)
+++ maven/pom/trunk/asf/site-pom.xml Mon Jun 27 22:04:52 2011
@@ -0,0 +1,64 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>10-SNAPSHOT</version>
+ <relativePath>./pom.xml</relativePath>
+ </parent>
+
+ <artifactId>asf-pom-site</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Apache Software Foundation Parent POM</name>
+ <description>This project consists of a POM that contains settings that are likely to be useful to any Apache project that is building and releasing code with Maven 2/3.</description>
+ <url>http://maven.apache.org/pom/asf/</url>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/asf</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/asf</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/pom/trunk/asf</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/MPOM/component/12314370</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org//view/M-R/view/Maven/job/ASF%20Parent%20Pom/</url>
+ </ciManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <siteDirectory>${basedir}/src/site-docs</siteDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
\ No newline at end of file
Propchange: maven/pom/trunk/asf/site-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/pom/trunk/asf/site-pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/pom/trunk/asf/site-pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/pom/trunk/asf/src/site-docs/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site-docs/apt/index.apt?rev=1140344&r1=1140326&r2=1140344&view=diff
==============================================================================
--- maven/pom/trunk/asf/src/site-docs/apt/index.apt (original)
+++ maven/pom/trunk/asf/src/site-docs/apt/index.apt Mon Jun 27 22:04:52 2011
@@ -1,20 +1,114 @@
- --------------------------
- ASF Shared Parent POM
- --------------------------
- Modified 4 June 2011
- --------------------------
-
-Introduction
-
- This project provides a shared parent POM for anything built
- with Maven at the Apache Software Foundation.
-
- It defines the standard repositories, selects current versions
- of commonly-used plugins, and defines a configuration for the
- release plugin that is consistent with ASF requirements and
- conventions.
-
- Note, in particular, that it enables a profile named <apache-release>
- in all goals of the <maven-release-plugin>. This profile enables
- gpg signing, source packaging, and other defaults.
+ -----
+ Apache Software Foundation Parent POM
+ -----
+ Benson Margulies
+ Hervé Boutemy
+ -----
+ 2011-06-27
+ -----
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Apache Software Foundation Parent POM
+
+ This project consists of a POM that contains settings that are
+ likely to be useful to any Apache project that is building and
+ releasing code with Maven 2/3. By using this project as a parent,
+ a project gets these settings.
+
+ Most project will want to override some of these settings.
+
+ The following is a list of the items configured in this POM:
+
+ * Top-level project properties:
+
+ ** <<license>>: The Apache Software License, version 2.0.
+
+ ** <<organization>>: The Apache Software Foundation
+
+ ** <<url>>: http://www.apache.org/. You should override this.
+
+ ** <<repositories>>: The pom adds the Apache snapshot
+ repository. (http://repository.apache.org/snapshots)
+
+ ** <<distributionManagement>>: The POM sets up for releases to the Apache Nexus
+ instance at
+ https://repository.apache.org/service/local/staging/deploy/maven2
+ and snapshots to
+ https://repository.apache.org/content/repositories/snapshots. Note
+ that there is POM parameters that you can override to change
+ the snapshot location.
+
+ ** <<mailingLists>>: The POM sets up generic Apache announcement
+ lists. You should override this.
+
+ ** <<scm>>: The location <of this POM> in subversion. You must override
+ this for the release plugin to work correctly.
+
+ * <<pluginManagement>>: The plugin management section specifies versions
+ of a list of plugins. See {{{./plugin-management.html}the report}} on this site for a list with versions.
+
+ ** The compiler plugin is set to default to Java 1.4 and
+ UTF-8 source.
+
+ ** the jar plugin is set to add default specification and
+ implementation entries.
+
+ ** the resources plugin is set for UTF-8.
+
+ ** the release plugin: the release plugin is set, via the
+ \<arguments\> configuration element, to enable the
+ <<apache-release>> profile for <<all>> executions and to disable
+ \<useReleaseProfiles\>. You can remove this with an empty
+ \<arguments/\> element in the configuration of the release plugin.
+
+ * <<plugins>>: The plugins section configures one execution:
+
+ ** maven-remote-resources-plugin for
+ org.apache:apache-jar-resource-bundle:1.4.
+
+The <<<apache-release>>> Profile
+
+ As noted above, this pom configures the release plugin to enable
+ the apache-release profile for all executions of the release
+ plugin. The profile includes the following plugins:
+
+ * maven-assemble-plugin:
+ org.apache.apache.resources:apache-source-release-assembly-descriptor:1.0.3
+ is in the dependencies, and an execution is configured.The plugin
+ is configured to take a descriptorRef name from the
+ <<sourceReleaseAssemblyDescriptor>> property, which by default is
+ set to 'source-release'.
+
+ * maven-deploy-plugin
+
+ * maven-source-plugin: configured to build and attach a source jar.
+
+ * maven-javadoc-plugin: configured to build and attach a javadoc jar.
+
+ * maven-gpg-plugin: configured to sign everything. It expects to find
+ a passphrase in $\{gpg.passphrase\}, presumably in your settings.xml.
+
+Settings Configuration
+
+ You can have a look at the page in Apache website {{{http://www.apache.org/dev/publishing-maven-artifacts.html}Publishing Maven Artifacts}}.
+
+ You can test your environment setup using : <<<-Papache-release>>> with the command line.
Added: maven/pom/trunk/asf/src/site-docs/site.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site-docs/site.xml?rev=1140344&view=auto
==============================================================================
--- maven/pom/trunk/asf/src/site-docs/site.xml (added)
+++ maven/pom/trunk/asf/src/site-docs/site.xml Mon Jun 27 22:04:52 2011
@@ -0,0 +1,67 @@
+<?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/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
+ <bannerLeft>
+ <name>${project.name}</name>
+ <src>http://maven.apache.org/images/apache-maven-project-2.png</src>
+ <href>http://maven.apache.org/</href>
+ </bannerLeft>
+ <bannerRight>
+ <src>http://maven.apache.org/images/maven-logo-2.gif</src>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-stylus-skin</artifactId>
+ <version>1.3</version>
+ </skin>
+
+ <publishDate format="yyyy-MM-dd" position="right" />
+ <version position="right" />
+
+ <body>
+ <head>
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+ </script>
+ <script type="text/javascript">
+ _uacct = "UA-140879-1";
+ urchinTracker();
+ </script>
+ </head>
+
+ <breadcrumbs>
+ <item name="Apache" href="http://www.apache.org/" />
+ <item name="Maven" href="http://maven.apache.org/index.html" />
+ <item name="POMs" href="http://maven.apache.org/pom/index.html" />
+ </breadcrumbs>
+
+ <menu ref="reports" inherit="bottom" />
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="http://www.apache.org/foundation/"/>
+ <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+ </menu>
+ </body>
+</project>
\ No newline at end of file
Propchange: maven/pom/trunk/asf/src/site-docs/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/pom/trunk/asf/src/site-docs/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/pom/trunk/asf/src/site-docs/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/pom/trunk/asf/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site/site.xml?rev=1140344&r1=1140343&r2=1140344&view=diff
==============================================================================
--- maven/pom/trunk/asf/src/site/site.xml (original)
+++ maven/pom/trunk/asf/src/site/site.xml Mon Jun 27 22:04:52 2011
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
<bannerLeft>
<name>${project.name}</name>
<src>http://maven.apache.org/images/apache-maven-project-2.png</src>
@@ -39,22 +40,9 @@ under the License.
<version position="right" />
<body>
- <head>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
- </script>
- <script type="text/javascript">
- _uacct = "UA-140879-1";
- urchinTracker();
- </script>
- </head>
-
<!-- Breadcrumbs that every project will inherit -->
<breadcrumbs>
<item name="Apache" href="http://www.apache.org/" />
- <!-- NOTE: This only works with stylus-skin-1.3,
- remove again if reverting to 1.2
- -->
- <item name="Maven" href="http://maven.apache.org/index.html" />
</breadcrumbs>
<!-- Menus that every project will inherit -->