Author: britter
Date: Sun Jul 20 16:56:38 2014
New Revision: 1612121
URL: http://svn.apache.org/r1612121
Log:
Add support for maven, ivy and gradle coordinates
Modified:
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
commons/proper/commons-build-plugin/trunk/src/test-project/pom.xml
Modified:
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml?rev=1612121&r1=1612120&r2=1612121&view=diff
==============================================================================
---
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
(original)
+++
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
Sun Jul 20 16:56:38 2014
@@ -27,4 +27,23 @@
</tr>
</table>
</subsection>
+ <subsection name="Maven">
+ <source>
+<dependency>
+ <groupId>@GROUP_ID@</groupId>
+ <artifactId>@ARTIFACT_ID@</artifactId>
+ <version>@VERSION@</version>
+</dependency>
+ </source>
+ </subsection>
+ <subsection name="Ivy">
+ <source>
+<dependency org="@GROUP_ID@" name="@ARTIFACT_ID@" rev="@VERSION@"/>
+ </source>
+ </subsection>
+ <subsection name="Gradle">
+ <source>
+'@GROUP_ID@:@ARTIFACT_ID@:@VERSION@'
+ </source>
+ </subsection>
</section>
Modified:
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml?rev=1612121&r1=1612120&r2=1612121&view=diff
==============================================================================
---
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
(original)
+++
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
Sun Jul 20 16:56:38 2014
@@ -5,9 +5,9 @@
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.
@@ -208,6 +208,8 @@
<token key="ID" value="${commons.componentid}"/>
<token key="FINAL_NAME"
value="${commons.release.name}"/>
<token key="BINARY-SUFFIX"
value="${commons.binary.suffix}"/>
+ <token key="GROUP_ID" value="${project.groupId}"/>
+ <token key="ARTIFACT_ID" value="${project.artifactId}"/>
</replacetokens>
</filterchain>
</loadresource>
@@ -229,6 +231,8 @@
<token key="ID" value="${commons.componentid}"/>
<token key="FINAL_NAME"
value="${commons.release.2.name}"/>
<token key="BINARY-SUFFIX"
value="${commons.release.2.binary.suffix}"/>
+ <token key="GROUP_ID"
value="${commons.release.2.groupId}"/>
+ <token key="ARTIFACT_ID"
value="${commons.release.2.artifactId}"/>
</replacetokens>
</filterchain>
</loadresource>
@@ -250,6 +254,8 @@
<token key="ID" value="${commons.componentid}"/>
<token key="FINAL_NAME"
value="${commons.release.3.name}"/>
<token key="BINARY-SUFFIX"
value="${commons.release.3.binary.suffix}"/>
+ <token key="GROUP_ID"
value="${commons.release.3.groupId}"/>
+ <token key="ARTIFACT_ID"
value="${commons.release.3.artifactId}"/>
</replacetokens>
</filterchain>
</loadresource>
Modified:
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml?rev=1612121&r1=1612120&r2=1612121&view=diff
==============================================================================
---
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
(original)
+++
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
Sun Jul 20 16:56:38 2014
@@ -31,7 +31,7 @@
<requiresProject>true</requiresProject>
<parameters>
<parameter>
- <name>project.name</name>
+ <name>project.name</name>
<property>project.name</property>
<required>true</required>
<readonly>true</readonly>
@@ -40,7 +40,7 @@
<description>The name of the project currently being
built.</description>
</parameter>
<parameter>
- <name>commons.componentid</name>
+ <name>commons.componentid</name>
<property>commons.componentid</property>
<required>true</required>
<readonly>true</readonly>
@@ -57,7 +57,7 @@
<requiresProject>true</requiresProject>
<parameters>
<parameter>
- <name>project.name</name>
+ <name>project.name</name>
<property>project.name</property>
<required>true</required>
<readonly>true</readonly>
@@ -66,7 +66,7 @@
<description>The name of the project currently being
built.</description>
</parameter>
<parameter>
- <name>commons.jira.id</name>
+ <name>commons.jira.id</name>
<property>commons.jira.id</property>
<required>true</required>
<readonly>false</readonly>
@@ -75,7 +75,7 @@
<description>The external JIRA id for the project
(alphabetic, upper case)</description>
</parameter>
<parameter>
- <name>commons.jira.pid</name>
+ <name>commons.jira.pid</name>
<property>commons.jira.pid</property>
<required>true</required>
<readonly>false</readonly>
@@ -92,7 +92,7 @@
<requiresProject>true</requiresProject>
<parameters>
<parameter>
- <name>project.name</name>
+ <name>project.name</name>
<property>project.name</property>
<required>true</required>
<readonly>true</readonly>
@@ -101,7 +101,7 @@
<description>The name of the project currently being
built.</description>
</parameter>
<parameter>
- <name>commons.jira.componentid</name>
+ <name>commons.jira.componentid</name>
<property>commons.jira.componentid</property>
<required>true</required>
<readonly>false</readonly>
@@ -118,7 +118,7 @@
<requiresProject>true</requiresProject>
<parameters>
<parameter>
- <name>project.name</name>
+ <name>project.name</name>
<property>project.name</property>
<required>true</required>
<readonly>true</readonly>
@@ -127,7 +127,16 @@
<description>The name of the project currently being
built.</description>
</parameter>
<parameter>
- <name>project.artifactId</name>
+ <name>project.groupId</name>
+ <property>project.groupId</property>
+ <required>true</required>
+ <readonly>true</readonly>
+ <defaultValue>${project.groupId}</defaultValue>
+ <type>java.lang.String</type>
+ <description>The groupId of the project currently being
built.</description>
+ </parameter>
+ <parameter>
+ <name>project.artifactId</name>
<property>project.artifactId</property>
<required>true</required>
<readonly>true</readonly>
@@ -136,7 +145,7 @@
<description>The artifactId of the project currently being
built.</description>
</parameter>
<parameter>
- <name>commons.componentid</name>
+ <name>commons.componentid</name>
<property>commons.componentid</property>
<required>true</required>
<readonly>true</readonly>
@@ -145,7 +154,7 @@
<description>The commons component id.</description>
</parameter>
<parameter>
- <name>commons.release.version</name>
+ <name>commons.release.version</name>
<property>commons.release.version</property>
<required>true</required>
<readonly>false</readonly>
@@ -154,7 +163,7 @@
<description>The version of the latest release of the
project.</description>
</parameter>
<parameter>
- <name>commons.release.name</name>
+ <name>commons.release.name</name>
<property>commons.release.name</property>
<required>true</required>
<readonly>false</readonly>
@@ -163,7 +172,7 @@
<description>The name of the latest release of the
project.</description>
</parameter>
<parameter>
- <name>commons.binary.suffix</name>
+ <name>commons.binary.suffix</name>
<property>commons.binary.suffix</property>
<required>false</required>
<readonly>false</readonly>
@@ -172,7 +181,7 @@
<description>The suffix for the binary
distro.</description>
</parameter>
<parameter>
- <name>commons.release.desc</name>
+ <name>commons.release.desc</name>
<property>commons.release.desc</property>
<required>false</required>
<readonly>false</readonly>
@@ -182,7 +191,7 @@
</parameter>
<!-- commons.release.2.* -->
<parameter>
- <name>commons.release.2.version</name>
+ <name>commons.release.2.version</name>
<property>commons.release.2.version</property>
<required>false</required>
<readonly>false</readonly>
@@ -191,16 +200,34 @@
<description>The version of an alternative release of the
project.</description>
</parameter>
<parameter>
- <name>commons.release.2.name</name>
+ <name>commons.release.2.name</name>
<property>commons.release.2.name</property>
<required>true</required>
<readonly>false</readonly>
<defaultValue>${commons.release.2.name}</defaultValue>
<type>java.lang.String</type>
- <description>The nameof the alternative release of the
project.</description>
+ <description>The name of the alternative release of the
project.</description>
</parameter>
<parameter>
- <name>commons.release.2.desc</name>
+ <name>commons.release.2.groupId</name>
+ <property>commons.release.2.groupId</property>
+ <required>true</required>
+ <readonly>false</readonly>
+ <defaultValue>${commons.release.2.groupId}</defaultValue>
+ <type>java.lang.String</type>
+ <description>The groupId of the alternative release of the
project.</description>
+ </parameter>
+ <parameter>
+ <name>commons.release.2.artifactId</name>
+ <property>commons.release.2.artifactId</property>
+ <required>true</required>
+ <readonly>false</readonly>
+
<defaultValue>${commons.release.2.artifactId}</defaultValue>
+ <type>java.lang.String</type>
+ <description>The artifactId of the alternative release of
the project.</description>
+ </parameter>
+ <parameter>
+ <name>commons.release.2.desc</name>
<property>commons.release.2.desc</property>
<required>false</required>
<readonly>false</readonly>
@@ -209,7 +236,7 @@
<description>Alternative Release Title or
Description.</description>
</parameter>
<parameter>
- <name>commons.release.2.binary.suffix</name>
+ <name>commons.release.2.binary.suffix</name>
<property>commons.release.2.binary.suffix</property>
<required>false</required>
<readonly>false</readonly>
@@ -219,7 +246,7 @@
</parameter>
<!-- commons.release.3.* -->
<parameter>
- <name>commons.release.3.version</name>
+ <name>commons.release.3.version</name>
<property>commons.release.3.version</property>
<required>false</required>
<readonly>false</readonly>
@@ -228,16 +255,34 @@
<description>The version of an alternative release of the
project.</description>
</parameter>
<parameter>
- <name>commons.release.3.name</name>
+ <name>commons.release.3.name</name>
<property>commons.release.3.name</property>
<required>true</required>
<readonly>false</readonly>
<defaultValue>${commons.release.3.name}</defaultValue>
<type>java.lang.String</type>
- <description>The nameof the alternative release of the
project.</description>
+ <description>The name of the alternative release of the
project.</description>
+ </parameter>
+ <parameter>
+ <name>commons.release.3.groupId</name>
+ <property>commons.release.3.groupId</property>
+ <required>true</required>
+ <readonly>false</readonly>
+ <defaultValue>${commons.release.3.groupId}</defaultValue>
+ <type>java.lang.String</type>
+ <description>The groupId of the alternative release of the
project.</description>
+ </parameter>
+ <parameter>
+ <name>commons.release.3.artifactId</name>
+ <property>commons.release.3.artifactId</property>
+ <required>true</required>
+ <readonly>false</readonly>
+
<defaultValue>${commons.release.3.artifactId}</defaultValue>
+ <type>java.lang.String</type>
+ <description>The artifactId of the alternative release of
the project.</description>
</parameter>
<parameter>
- <name>commons.release.3.desc</name>
+ <name>commons.release.3.desc</name>
<property>commons.release.3.desc</property>
<required>false</required>
<readonly>false</readonly>
@@ -246,7 +291,7 @@
<description>Alternative Release Title or
Description.</description>
</parameter>
<parameter>
- <name>commons.release.3.binary.suffix</name>
+ <name>commons.release.3.binary.suffix</name>
<property>commons.release.3.binary.suffix</property>
<required>false</required>
<readonly>false</readonly>
Modified: commons/proper/commons-build-plugin/trunk/src/test-project/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/test-project/pom.xml?rev=1612121&r1=1612120&r2=1612121&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/test-project/pom.xml
(original)
+++ commons/proper/commons-build-plugin/trunk/src/test-project/pom.xml Sun Jul
20 16:56:38 2014
@@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.commons</groupId>
<artifactId>commons-build-plugin</artifactId>
- <version>1.3</version>
+ <version>1.5-SNAPSHOT</version>
<configuration>
<commons.release.name>${project.artifactId}-${commons.release.version}</commons.release.name>
<commons.jira.id>COMMONSSITE</commons.jira.id>
