Author: khmarbaise
Date: Thu Jun 11 22:11:51 2015
New Revision: 1684987
URL: http://svn.apache.org/r1684987
Log:
Cleanup round for codehaus mojohaus.org transition.
Modified:
maven/site/trunk/content/apt/developers/conventions/code.apt
maven/site/trunk/content/apt/guides/development/guide-maven-development.apt
maven/site/trunk/content/apt/guides/development/guide-plugin-documentation.apt
maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
maven/site/trunk/content/apt/plugin-developers/cookbook/add-svn-revision-to-manifest.apt
Modified: maven/site/trunk/content/apt/developers/conventions/code.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/conventions/code.apt?rev=1684987&r1=1684986&r2=1684987&view=diff
==============================================================================
--- maven/site/trunk/content/apt/developers/conventions/code.apt (original)
+++ maven/site/trunk/content/apt/developers/conventions/code.apt Thu Jun 11
22:11:51 2015
@@ -295,7 +295,7 @@ public class MyMojo
[]
<<Note>>: There existing two alternativs to change order of a pom file
- {{{http://mojo.codehaus.org/tidy-maven-plugin/}Tidy Maven Plugin}} or the
+ {{{http://www.mojohaus.org/tidy-maven-plugin/}Tidy Maven Plugin}} or the
{{{https://code.google.com/p/sortpom/}maven-sortpom-plugin}}.
** {XDOC Code Convention}
Modified:
maven/site/trunk/content/apt/guides/development/guide-maven-development.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/development/guide-maven-development.apt?rev=1684987&r1=1684986&r2=1684987&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/development/guide-maven-development.apt
(original)
+++ maven/site/trunk/content/apt/guides/development/guide-maven-development.apt
Thu Jun 11 22:11:51 2015
@@ -194,9 +194,9 @@ And remember, your contributions are alw
* <<Mojo>>
"Mojo" is really two things when it comes to Maven: it is both
{{{/ref/current/maven-plugin-api/}Maven's plug-in API}}
- but also {{{http://mojo.codehaus.org}a separate Codehaus project}} hosting a
lot of plugins.
+ but also {{{http://www.mojohaus.org}a separate Mojohaus project}} hosting a
lot of plugins.
- {{{http://mojo.codehaus.org}The Mojo Project}} is a plugin forge for non-core
Maven plugins.
+ {{{http://www.mojohaus.org}The MojoHaus Project}} is a plugin forge for
non-core Maven plugins.
There is also a lower bar for becoming a part of the project.
[]
Modified:
maven/site/trunk/content/apt/guides/development/guide-plugin-documentation.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/development/guide-plugin-documentation.apt?rev=1684987&r1=1684986&r2=1684987&view=diff
==============================================================================
---
maven/site/trunk/content/apt/guides/development/guide-plugin-documentation.apt
(original)
+++
maven/site/trunk/content/apt/guides/development/guide-plugin-documentation.apt
Thu Jun 11 22:11:51 2015
@@ -69,7 +69,7 @@ mvn site
* <<<\<description\>>>> - project description, an overview of what the plugin
can do
- * <<<\<url\>>>> - the site of the plugin, normally <maven.apache.org> or
<mojo.codehaus.org>
+ * <<<\<url\>>>> - the site of the plugin, normally <maven.apache.org> or
<org.mojohaus>
* <<<\<prerequisites\>>>> - the minimum version of Maven required to use this
plugin
Modified: maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt?rev=1684987&r1=1684986&r2=1684987&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt Thu Jun
11 22:11:51 2015
@@ -3,8 +3,9 @@
------
Maria Odea Ching
Dennis Lundberg
+ Karl Heinz Marbaise
------
- 2014-11-02
+ 2015-06-12
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -62,11 +63,9 @@ Guide to Using Toolchains
*-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+
| jdk |
<<<{{{http://mojo.codehaus.org/cassandra-maven-plugin/}cassandra-maven-plugin}}>>>
| 0.7.0-1 | Codehaus Mojo
*-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+
-| jdk |
<<<{{{http://mojo.codehaus.org/exec-maven-plugin/}exec-maven-plugin}}>>>
| 1.1.1 | Codehaus Mojo
+| jdk |
<<<{{{http://www.mojohaus.org/exec-maven-plugin/}exec-maven-plugin}}>>>
| 1.1.1 | Codehaus Mojo
*-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+
-| jdk |
<<<{{{http://mojo.codehaus.org/jasperreports-maven-plugin/}jasperreports-maven-plugin}}>>>
| 1.0-beta-3-SNAPSHOT | Codehaus Mojo
-*-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+
-| jdk |
<<<{{{http://mojo.codehaus.org/jdiff-maven-plugin/}jdiff-maven-plugin}}>>>
| 1.0-beta-1-SNAPSHOT | Codehaus Mojo
+| jdk |
<<<{{{http://www.mojohaus.org/jdiff-maven-plugin/}jdiff-maven-plugin}}>>>
| 1.0-beta-1-SNAPSHOT | Codehaus Mojo
*-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+
| jdk |
<<<{{{http://mojo.codehaus.org/keytool-maven-plugin/}keytool-maven-plugin}}>>>
| 1.4 | Codehaus Mojo
*-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+
Modified:
maven/site/trunk/content/apt/plugin-developers/cookbook/add-svn-revision-to-manifest.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugin-developers/cookbook/add-svn-revision-to-manifest.apt?rev=1684987&r1=1684986&r2=1684987&view=diff
==============================================================================
---
maven/site/trunk/content/apt/plugin-developers/cookbook/add-svn-revision-to-manifest.apt
(original)
+++
maven/site/trunk/content/apt/plugin-developers/cookbook/add-svn-revision-to-manifest.apt
Thu Jun 11 22:11:51 2015
@@ -2,8 +2,9 @@
Cookbook - How To Add SVN Revision To A JAR Manifest
-----
Vincent Siveton
+ Karl Heinz Marbase
-----
- 2008-01-01
+ 2015-06-12
-----
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -39,9 +40,9 @@ Cookbook: How To Add SVN Revision To A J
*-----------------------------------------------------------+--------------+
|| <<Plugin>> || <<Version>>
*-----------------------------------------------------------+--------------+
-| {{{../../plugins/maven-jar-plugin/} <<<jar>>>}} | 2.2
+| {{{../../plugins/maven-jar-plugin/} <<<jar>>>}} | 2.6
*-----------------------------------------------------------+--------------+
-| {{{http://mojo.codehaus.org/buildnumber-maven-plugin/} <<<buildnumber>>>}} |
1.0-beta-1
+| {{{http://www.mojohaus.org/buildnumber-maven-plugin/} <<<buildnumber>>>}} |
1.3
*-----------------------------------------------------------+--------------+
* Sample Generated Manifest
@@ -59,7 +60,7 @@ SCM-Revision: 613393
** Configuring Mojo Buildnumber Plugin
- We configure this plugin as suggested in the
{{{http://mojo.codehaus.org/buildnumber-maven-plugin/usage.html}Mojo
Buildnumber Plugin usage}} page.
+ We configure this plugin as suggested in the
{{{http://www.mojohaus.org/buildnumber-maven-plugin/usage.html}Mojo Buildnumber
Plugin usage}} page.
%{snippet|id=buildnumber|url=http://svn.apache.org/repos/asf/maven/sandbox/trunk/site/cookbook/generate-svn-revision/pom.xml}
@@ -89,6 +90,6 @@ mvn package
* {{{../../plugins/maven-jar-plugin/} Maven Jar Plugin}}
- * {{{http://mojo.codehaus.org/buildnumber-maven-plugin/} Mojo Buildnumber
Maven Plugin}}
+ * {{{http://www.mojohaus.org/buildnumber-maven-plugin/} Mojo Buildnumber
Maven Plugin}}
[]
