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 2017/12/08 18:14:41 UTC
[maven-mapping] branch master created (now 2cbdf71)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git.
at 2cbdf71 Removed maven-compiler-plugin properties, cause this configuration is already done in parent.
This branch includes the following new commits:
new 3084478 Start a new shared component for mapping stuff. The first addition will be the file name mapping code from Maven WAR Plugin.
new 64c0f71 [MSHARED-291] Copy code for file name mapping from Maven WAR Plugin
new 9bf5b6f Use maven-javadoc-plugin:2.9.1 to avoid Javadoc vulnerability.
new 55c5778 Improve Javadoc.
new 835bd7c Add documentation.
new d5d83f7 Add a link to Maven WAR Plugin.
new f886cb4 [maven-release-plugin] prepare release maven-mapping-1.0
new 202e948 [maven-release-plugin] prepare for next development iteration
new 9699217 configured site deploy to /shared-archives/<artifactId>-LATEST
new 5463d4f updated parent pom
new 87b83d5 [MNGSITE-152] - Added appropriate links to download site and license location to fulfill the ASF requirements.
new f4ec9e0 [MNGSITE-152] - Added missing links from overview to ASF License page and to download area.
new 2c234b8 added license header
new 6d6f0c6 s/plugins/shared/
new a821329 [MSHARED-356] - Upgrade build minimum to 2.2.1 and compatibility.
new 731f3a8 [MSHARED-357] - Upgrade plexus-interpolation to 1.19
new c0bec40 [MSHARED-368] Updated p-i
new 479a6d5 upgraded parent pom
new 62163de changed svnpubsub url from /content to /components
new fab4d5e moved Jira from Codehaus to Apache
new fd7ed3c [MNGSITE-243] Fixed wrong link.
new aa11c5d [MSHARED-449] Upgrade to Maven 3.X only.
new d1f9a89 [MSHARED-452] Removed calling to accessor
new 06bb9aa [MSHARED-453] Bump version to 3.0.0-SNAPSHOT
new 109cad2 Removed explicit packaging, cause it's default.
new 766a2d9 [MSHARED-457] Upgrade maven-shared-components parent to version 22
new b8df2e3 Removed hard coded version for maven-changes-plugin and let the parent do it's work.
new da04268 Reformatted code.
new a922708 [maven-release-plugin] prepare release maven-mapping-3.0.0
new 6620de3 [maven-release-plugin] prepare for next development iteration
new 5c1884f Undone release steps.
new 30a1e78 Fixed checkstyle reported errors/warnings.
new 3674530 fixVersionIds
new 444f292 Using component for JIRA report instead of fixVersionIds
new fbb5f73 Improved code Prevent instantiation and make the class final.
new c99d46a [maven-release-plugin] prepare release maven-mapping-3.0.0
new 954efe4 [maven-release-plugin] prepare for next development iteration
new ae19e74 [MPOM-95] updated parent pom location
new 2e6d998 updated Jira url
new 9cf4254 [MSHARED-518] Upgrade plexus-interpolation to 1.22
new dd498f6 [MSHARED-520] Upgrade maven-shared-components to version 30
new 2cbdf71 Removed maven-compiler-plugin properties, cause this configuration is already done in parent.
The 42 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].
[maven-mapping] 21/42: [MNGSITE-243] Fixed wrong link.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit fd7ed3cead39b301fc765fc379d914b46761aa5e
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Jun 19 23:25:50 2015 +0000
[MNGSITE-243] Fixed wrong link.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1686514 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/xdoc/download.xml.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 46ca4be..5d1650b 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -39,7 +39,7 @@ under the License.
<p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
- <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="./guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
+ <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="/guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
<a name="mirror"/>
<subsection name="Mirror">
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 32/42: Fixed checkstyle reported errors/warnings.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 30a1e78418da93cea32f365e5bb4fd1f6d2cbcb1
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 10:21:46 2015 +0000
Fixed checkstyle reported errors/warnings.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714425 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/maven/shared/mapping/MappingUtils.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
index ffeee81..bd6086e 100644
--- a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
+++ b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
@@ -47,8 +47,14 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
*/
public class MappingUtils
{
+ /**
+ * Default file name mapping.
+ */
public static final String DEFAULT_FILE_NAME_MAPPING = "@{artifactId}@-@{baseVersion}@.@{extension}@";
+ /**
+ * Default file name mapping incl. classifier.
+ */
public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
"@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@";
@@ -57,6 +63,7 @@ public class MappingUtils
*
* @param expression the expression to evaluate
* @param artifact the artifact to use as value object for tokens
+ * @throws InterpolationException In case of an error.
* @return expression the evaluated expression
*/
public static String evaluateFileNameMapping( String expression, Artifact artifact )
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 38/42: [MPOM-95] updated parent pom location
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit ae19e746d97ae18e2f255c7b5612b76e5ea4884e
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Tue Nov 17 21:02:09 2015 +0000
[MPOM-95] updated parent pom location
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714889 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0dae1d5..c26785a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
<version>22</version>
- <relativePath>../maven-shared-components/pom.xml</relativePath>
+ <relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
</parent>
<artifactId>maven-mapping</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 31/42: Undone release steps.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 5c1884ff7207626da8e5f0ab4e639b6e7213ed83
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 09:33:42 2015 +0000
Undone release steps.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714422 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6f65722..f9bdfc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>maven-mapping</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>Apache Maven Mapping</name>
<description>A shared component to assist in interpolating file names using properties from a Maven project.</description>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 11/42: [MNGSITE-152] - Added appropriate links to
download site and license location to fulfill the ASF requirements.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 87b83d574ca3869f80a2b1b75fd96110db02759a
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed May 14 19:12:38 2014 +0000
[MNGSITE-152]
- Added appropriate links to download site and license location
to fulfill the ASF requirements.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1594676 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/resources/download.cgi | 4 ++
src/site/xdoc/download.xml.vm | 126 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/src/site/resources/download.cgi b/src/site/resources/download.cgi
new file mode 100644
index 0000000..495cde1
--- /dev/null
+++ b/src/site/resources/download.cgi
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Just call the standard mirrors.cgi script. It will use download.html
+# as the input template.
+exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
\ No newline at end of file
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
new file mode 100644
index 0000000..7186d93
--- /dev/null
+++ b/src/site/xdoc/download.xml.vm
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+
+<!--
+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.
+-->
+
+<document>
+ <properties>
+ <title>Download ${project.name} Source</title>
+ </properties>
+ <body>
+ <section name="Download ${project.name} ${project.version} Source">
+
+ <p>${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build
+ ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.</p>
+
+ <p>You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
+ hours to reach all mirrors.<p/>
+
+ <p>In order to guard against corrupted downloads/installations, it is highly recommended to
+ <a href="http://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
+ of the release bundles against the public <a href="http://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
+ developers.</p>
+
+ <p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
+
+ <p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="./guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
+
+ <a name="mirror"/>
+ <subsection name="Mirror">
+
+ <p>
+ [if-any logo]
+ <a href="[link]">
+ <img align="right" src="[logo]" border="0"
+ alt="logo"/>
+ </a>
+ [end]
+ The currently selected mirror is
+ <b>[preferred]</b>.
+ If you encounter a problem with this mirror,
+ please select another mirror.
+ If all mirrors are failing, there are
+ <i>backup</i>
+ mirrors
+ (at the end of the mirrors list) that should be available.
+ </p>
+
+ <form action="[location]" method="get" id="SelectMirror">
+ Other mirrors:
+ <select name="Preferred">
+ [if-any http]
+ [for http]
+ <option value="[http]">[http]</option>
+ [end]
+ [end]
+ [if-any ftp]
+ [for ftp]
+ <option value="[ftp]">[ftp]</option>
+ [end]
+ [end]
+ [if-any backup]
+ [for backup]
+ <option value="[backup]">[backup] (backup)</option>
+ [end]
+ [end]
+ </select>
+ <input type="submit" value="Change"/>
+ </form>
+
+ <p>
+ You may also consult the
+ <a href="http://www.apache.org/mirrors/">complete list of
+ mirrors.</a>
+ </p>
+
+ </subsection>
+
+ <subsection name="${project.name} ${project.version}">
+
+ <p>This is the current stable version of ${project.name}.</p>
+
+ <table>
+ <thead>
+ <tr>
+ <th></th>
+ <th>Link</th>
+ <th>Checksum</th>
+ <th>Signature</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>${project.name} ${project.version} (Source zip)</td>
+ <td><a href="[preferred]maven/plugins/${project.artifactId}-${project.version}-source-release.zip">maven/plugins/${project.artifactId}-${project.version}-source-release.zip</a></td>
+ <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
+ <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
+ </tr>
+ </tbody>
+ </table>
+ </subsection>
+
+ <subsection name="Previous Versions">
+
+ <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/plugins/">archive site</a>.</p>
+
+ </subsection>
+ </section>
+ </body>
+</document>
+
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 20/42: moved Jira from Codehaus to Apache
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit fab4d5e8f38efc3d4b80730154f10fca2a25cc68
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Mon Apr 6 01:33:47 2015 +0000
moved Jira from Codehaus to Apache
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1671466 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 00b0a18..a88461a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
</scm>
<issueManagement>
<system>jira</system>
- <url>http://jira.codehaus.org/browse/MSHARED/component/16150</url>
+ <url>https://issues.apache.org/jira/browse/MSHARED/component/12326454</url>
</issueManagement>
<distributionManagement>
<site>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 28/42: Reformatted code.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit da04268085f8ae033dd8e8bb6b4048b2a1c055be
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Nov 14 12:48:14 2015 +0000
Reformatted code.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714312 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/shared/mapping/DashClassifierValueSource.java | 5 ++---
.../java/org/apache/maven/shared/mapping/MappingUtils.java | 11 +++++------
.../org/apache/maven/shared/mapping/MappingUtilsTest.java | 6 ++++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java b/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
index fd7e9fb..2524060 100644
--- a/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
+++ b/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
@@ -24,9 +24,8 @@ import java.util.Properties;
import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
/**
- * This is a ValueSource, that can be used in an Interpolator. It supports
- * special expressions, like <code>dashClassifier</code> and
- * <code>dashClassifier?</code>.
+ * This is a ValueSource, that can be used in an Interpolator. It supports special expressions, like
+ * <code>dashClassifier</code> and <code>dashClassifier?</code>.
*
* @version $Id$
*/
diff --git a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
index 6668527..ffeee81 100644
--- a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
+++ b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
@@ -29,8 +29,7 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
* Utilities used to evaluate an expression.
* </p>
* <p>
- * The expression might use any field of the {@link Artifact} interface. Some
- * examples might be:
+ * The expression might use any field of the {@link Artifact} interface. Some examples might be:
* </p>
* <ul>
* <li>@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@</li>
@@ -38,9 +37,8 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
* <li>@{artifactId}@.@{extension}@</li>
* </ul>
* <p>
- * Although parts of this code comes from the Assembly Plugin, it cannot be
- * shared with the Assembly Plugin. The reason for this is that the Assembly
- * Plugin always uses a prefix for the expressions, whereas this code does not.
+ * Although parts of this code comes from the Assembly Plugin, it cannot be shared with the Assembly Plugin. The reason
+ * for this is that the Assembly Plugin always uses a prefix for the expressions, whereas this code does not.
* <p/>
*
* @author Stephane Nicoll
@@ -50,6 +48,7 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
public class MappingUtils
{
public static final String DEFAULT_FILE_NAME_MAPPING = "@{artifactId}@-@{baseVersion}@.@{extension}@";
+
public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
"@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@";
@@ -57,7 +56,7 @@ public class MappingUtils
* Evaluates the specified expression for the given artifact.
*
* @param expression the expression to evaluate
- * @param artifact the artifact to use as value object for tokens
+ * @param artifact the artifact to use as value object for tokens
* @return expression the evaluated expression
*/
public static String evaluateFileNameMapping( String expression, Artifact artifact )
diff --git a/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java b/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
index e6d5e5c..b96ec54 100644
--- a/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
@@ -54,7 +54,8 @@ public class MappingUtilsTest
jar.setGroupId( "org.apache.sample" );
jar.setArtifactId( "maven-test-lib" );
jar.setVersion( "1.0" );
- assertEquals( "maven-test-lib.jar", MappingUtils.evaluateFileNameMapping( "@{artifactId}@.@{extension}@", jar ) );
+ assertEquals( "maven-test-lib.jar",
+ MappingUtils.evaluateFileNameMapping( "@{artifactId}@.@{extension}@", jar ) );
}
@@ -66,7 +67,8 @@ public class MappingUtilsTest
jar.setArtifactId( "maven-test-lib" );
jar.setVersion( "1.0" );
assertEquals( "org.apache.sample-maven-test-lib-1.0.jar",
- MappingUtils.evaluateFileNameMapping( "@{groupId}@-@{artifactId}@-@{version}@.@{extension}@", jar ) );
+ MappingUtils.evaluateFileNameMapping( "@{groupId}@-@{artifactId}@-@{version}@.@{extension}@",
+ jar ) );
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 18/42: upgraded parent pom
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 479a6d5da3f18f19810bffb1be0872caf2f4c087
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Thu Oct 30 05:56:01 2014 +0000
upgraded parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1635391 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 585d0b1..ce5d3b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 24/42: [MSHARED-453] Bump version to 3.0.0-SNAPSHOT
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 06bb9aac1841385116b32bf31b1aba0a904f5e94
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Oct 31 14:12:11 2015 +0000
[MSHARED-453] Bump version to 3.0.0-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1711637 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0f6cc2e..dcfc4e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>maven-mapping</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Maven Mapping</name>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 23/42: [MSHARED-452] Removed calling to accessor
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit d1f9a8965b1ef161321d3c2ca459cba200fa3674
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Oct 31 14:09:18 2015 +0000
[MSHARED-452] Removed calling to accessor
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1711636 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/maven/shared/mapping/MappingUtils.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
index 7667838..6668527 100644
--- a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
+++ b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
@@ -65,10 +65,6 @@ public class MappingUtils
{
String value = expression;
- // FIXME: This is BAD! Accessors SHOULD NOT change the behavior of the object.
- // [dennisl; 2013-07-30] This was fixed in Maven 2.0.8
- artifact.isSnapshot();
-
RegexBasedInterpolator interpolator = new RegexBasedInterpolator( "\\@\\{(", ")?([^}]+)\\}@" );
interpolator.addValueSource( new ObjectBasedValueSource( artifact ) );
interpolator.addValueSource( new ObjectBasedValueSource( artifact.getArtifactHandler() ) );
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 03/42: Use maven-javadoc-plugin:2.9.1 to avoid
Javadoc vulnerability.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 9bf5b6f992b43a63c118a0a959b4ee18ebaf32cd
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Fri Aug 9 10:51:36 2013 +0000
Use maven-javadoc-plugin:2.9.1 to avoid Javadoc vulnerability.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1512246 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/pom.xml b/pom.xml
index 5492f49..f6003bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,18 @@
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<profiles>
<profile>
<id>reporting</id>
@@ -103,6 +115,11 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ </plugin>
</plugins>
</reporting>
</profile>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 35/42: Improved code Prevent instantiation and make
the class final.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit fbb5f738b983463a5313f108da3950e891f11704
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 11:55:21 2015 +0000
Improved code
Prevent instantiation and make the class final.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714435 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/maven/shared/mapping/MappingUtils.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
index bd6086e..db946ec 100644
--- a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
+++ b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
@@ -45,8 +45,13 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
* @author Dennis Lundberg
* @version $Id$
*/
-public class MappingUtils
+public final class MappingUtils
{
+ private MappingUtils()
+ {
+ // prevent instantiation.
+ }
+
/**
* Default file name mapping.
*/
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 19/42: changed svnpubsub url from /content to
/components
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 62163dee3e93b8190c5180e153344d24de3c7773
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Mon Mar 30 22:25:48 2015 +0000
changed svnpubsub url from /content to /components
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1670207 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ce5d3b9..00b0a18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
</site>
</distributionManagement>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 07/42: [maven-release-plugin] prepare release
maven-mapping-1.0
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit f886cb45ccd1372fa809f05c4a8be64f48d36295
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Sat Aug 10 22:41:48 2013 +0000
[maven-release-plugin] prepare release maven-mapping-1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1512833 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f6003bd..d12daa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-mapping</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<packaging>jar</packaging>
<name>Apache Maven Mapping</name>
@@ -40,9 +40,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/tags/maven-mapping-1.0</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 33/42: fixVersionIds
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 36745306893c9078c9366da9fd208903427901a9
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 10:26:24 2015 +0000
fixVersionIds
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714426 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index f9bdfc9..a847d79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
<onlyCurrentVersion>true</onlyCurrentVersion>
<sortColumnNames>Key</sortColumnNames>
<versionPrefix>maven-mapping-</versionPrefix>
+ <fixVersionIds>12333967</fixVersionIds>
</configuration>
<reportSets>
<reportSet>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 34/42: Using component for JIRA report instead of
fixVersionIds
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 444f2928d31c8e93ebb7c5fe4f1d5d62357e75c9
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 11:39:55 2015 +0000
Using component for JIRA report instead of fixVersionIds
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714432 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a847d79..cedc935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
<onlyCurrentVersion>true</onlyCurrentVersion>
<sortColumnNames>Key</sortColumnNames>
<versionPrefix>maven-mapping-</versionPrefix>
- <fixVersionIds>12333967</fixVersionIds>
+ <component>12326454</component>
</configuration>
<reportSets>
<reportSet>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 05/42: Add documentation.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 835bd7cc4eb7731f2ae009dcd789ce234f62b059
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Fri Aug 9 12:03:31 2013 +0000
Add documentation.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1512271 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/maven/shared/mapping/MappingUtils.java | 2 +-
src/site/apt/index.apt.vm | 85 ++++++++++++++++++++++
src/site/site.xml | 32 ++++++++
3 files changed, 118 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
index f032612..7667838 100644
--- a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
+++ b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
@@ -26,7 +26,7 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
/**
* <p>
- * Utilities used to evaluate expression.
+ * Utilities used to evaluate an expression.
* </p>
* <p>
* The expression might use any field of the {@link Artifact} interface. Some
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
new file mode 100644
index 0000000..83f1f06
--- /dev/null
+++ b/src/site/apt/index.apt.vm
@@ -0,0 +1,85 @@
+ ------
+ Introduction
+ ------
+ Dennis Lundberg
+ ------
+ 2013-08-09
+ ------
+
+ ~~ 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.name}
+
+ These classes originates from the file name mapping code in Maven WAR Plugin.
+
+ The goal is to provide a shared component for all plugins that need to do
+ mapping.
+
+
+* MappingUtils
+
+ This class ha a single method <<<evaluateFileNameMapping>>> that take an
+ expression and an <<<Artifact>>> as parameters. It returns a <<<String>>>
+ which is the result of interpolating the values from the <<<Artifact>>>
+ object into the expression.
+
+ Here is a bit of code from the WAR Plugin showing how you can use it:
+
++-----
+ protected String getFileName( Artifact artifact )
+ {
+ if ( getOutputFileNameMapping() != null )
+ {
+ // The user has specified a custom file name mapping expression
+ return MappingUtils.evaluateFileNameMapping( getOutputFileNameMapping(), artifact );
+ }
+
+ String classifier = artifact.getClassifier();
+ if ( ( classifier != null ) && !( "".equals( classifier.trim() ) ) )
+ {
+ // The artifact has a classifier - use the default expression for artifacts with classifier
+ return MappingUtils.evaluateFileNameMapping( MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER,
+ artifact );
+ }
+ else
+ {
+ // The artifact does not have a classifier - use the default expression for artifacts
+ return MappingUtils.evaluateFileNameMapping( MappingUtils.DEFAULT_FILE_NAME_MAPPING, artifact );
+ }
+ }
++-----
+
+
+* DashClassifierValueSource
+
+ This is an implementation of the <<<ValueSource>>> interface, and can be used
+ for interpolation. <<<MappingUtils>>> uses it internally. It adds these two
+ tokens to an <<<Interpolator>>>:
+
+ * <<<dashClassifier>>>
+
+ * <<<dashClassifier?>>>
+
+ []
+
+ You can invoke it like this:
+
++-----
+ Interpolator interpolator = StringSearchInterpolator());
+ interpolator.addValueSource( new DashClassifierValueSource( artifact.getClassifier() ) );
++-----
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..b271376
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,32 @@
+<?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.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <!--<item name="Usage" href="usage.html"/>-->
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+ </body>
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 14/42: s/plugins/shared/
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 6d6f0c6831e05934a16af48ef77461798b34852d
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Sun May 18 16:07:51 2014 +0000
s/plugins/shared/
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1595631 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/xdoc/download.xml.vm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 7186d93..46ca4be 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -107,9 +107,9 @@ under the License.
<tbody>
<tr>
<td>${project.name} ${project.version} (Source zip)</td>
- <td><a href="[preferred]maven/plugins/${project.artifactId}-${project.version}-source-release.zip">maven/plugins/${project.artifactId}-${project.version}-source-release.zip</a></td>
- <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
- <td><a href="http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc">maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
+ <td><a href="[preferred]maven/shared/${project.artifactId}-${project.version}-source-release.zip">maven/shared/${project.artifactId}-${project.version}-source-release.zip</a></td>
+ <td><a href="http://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.md5">maven/shared/${project.artifactId}-${project.version}-source-release.zip.md5</a></td>
+ <td><a href="http://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc">maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
</tr>
</tbody>
</table>
@@ -117,7 +117,7 @@ under the License.
<subsection name="Previous Versions">
- <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/plugins/">archive site</a>.</p>
+ <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/shared/">archive site</a>.</p>
</subsection>
</section>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 15/42: [MSHARED-356] - Upgrade build minimum to
2.2.1 and compatibility.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit a82132925308a3024b7144e42f51068684460274
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Sep 27 20:15:05 2014 +0000
[MSHARED-356]
- Upgrade build minimum to 2.2.1 and compatibility.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1627998 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 48d71bc..3f681b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
</distributionManagement>
<properties>
- <mavenVersion>2.0.6</mavenVersion>
+ <mavenVersion>2.2.1</mavenVersion>
</properties>
<dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 17/42: [MSHARED-368] Updated p-i
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit c0bec40d6decc045683b01c055a447edb08b12e4
Author: Kristian Rosenvold <kr...@apache.org>
AuthorDate: Sat Oct 18 06:09:41 2014 +0000
[MSHARED-368] Updated p-i
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1632732 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ab59f7a..585d0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.19</version>
+ <version>1.21</version>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 37/42: [maven-release-plugin] prepare for next
development iteration
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 954efe4d82430aa087f415297f993a0a49f039e0
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 11:57:42 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714438 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1b064fa..0dae1d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>maven-mapping</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<name>Apache Maven Mapping</name>
<description>A shared component to assist in interpolating file names using properties from a Maven project.</description>
@@ -38,9 +38,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-3.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-3.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/shared/tags/maven-mapping-3.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 41/42: [MSHARED-520] Upgrade
maven-shared-components to version 30
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit dd498f6446e8e759a973607deaddf357bee27e66
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat May 28 16:30:40 2016 +0000
[MSHARED-520] Upgrade maven-shared-components to version 30
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1745893 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2432e15..af8cda9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>22</version>
+ <version>30</version>
<relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 12/42: [MNGSITE-152] - Added missing links from
overview to ASF License page and to download area.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit f4ec9e0847b721552bfabaf83406b1c957de334e
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed May 14 19:20:21 2014 +0000
[MNGSITE-152]
- Added missing links from overview to ASF License page
and to download area.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1594680 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/site.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/site/site.xml b/src/site/site.xml
index b271376..ef1009a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -27,6 +27,9 @@ under the License.
<item name="JavaDocs" href="apidocs/index.html"/>
<item name="Source Xref" href="xref/index.html"/>
<!--item name="FAQ" href="faq.html"/-->
+ <!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
+ <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="Download" href="download.html"/>
</menu>
</body>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 16/42: [MSHARED-357] - Upgrade plexus-interpolation
to 1.19
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 731f3a84b44b0b1d36ce8af6e7c22baf491348c2
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Sep 27 20:17:07 2014 +0000
[MSHARED-357]
- Upgrade plexus-interpolation to 1.19
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1627999 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3f681b0..ab59f7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.15</version>
+ <version>1.19</version>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 29/42: [maven-release-plugin] prepare release
maven-mapping-3.0.0
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit a922708bd650fa958aa7ddf4a0ef426933e11cc8
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 09:28:50 2015 +0000
[maven-release-plugin] prepare release maven-mapping-3.0.0
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714418 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f9bdfc9..26ab282 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>maven-mapping</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<name>Apache Maven Mapping</name>
<description>A shared component to assist in interpolating file names using properties from a Maven project.</description>
@@ -38,9 +38,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-3.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-3.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/tags/maven-mapping-3.0.0</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 06/42: Add a link to Maven WAR Plugin.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit d5d83f7018ddc165f0fc0e4948441736e93f422b
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Fri Aug 9 13:41:45 2013 +0000
Add a link to Maven WAR Plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1512302 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/apt/index.apt.vm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 83f1f06..54eaa4d 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -64,6 +64,9 @@ ${project.name}
}
+-----
+ Have a look at the
+ {{{http://maven.apache.org/plugins/maven-war-plugin/examples/file-name-mapping.html}documentation for Maven WAR Plugin}}
+ for some examples of expressions that can be used.
* DashClassifierValueSource
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 13/42: added license header
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 2c234b8202d59544471a354ab098446306180ee7
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Sun May 18 14:26:56 2014 +0000
added license header
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1595626 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/resources/download.cgi | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/site/resources/download.cgi b/src/site/resources/download.cgi
index 495cde1..1b178d2 100644
--- a/src/site/resources/download.cgi
+++ b/src/site/resources/download.cgi
@@ -1,4 +1,22 @@
#!/bin/sh
+#
+# 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.
+#
# Just call the standard mirrors.cgi script. It will use download.html
# as the input template.
exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 25/42: Removed explicit packaging,
cause it's default.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 109cad2e8236a40644c83d6d0ae6885bc775b0a0
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Oct 31 14:13:35 2015 +0000
Removed explicit packaging, cause it's default.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1711638 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index dcfc4e8..e567dc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
<artifactId>maven-mapping</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Apache Maven Mapping</name>
<description>A shared component to assist in interpolating file names using properties from a Maven project.</description>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 08/42: [maven-release-plugin] prepare for next
development iteration
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 202e9486a9bc571ee0ce145917abe7fcd97ea3a7
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Sat Aug 10 22:42:47 2013 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1512836 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d12daa8..5e203e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-mapping</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Maven Mapping</name>
@@ -40,9 +40,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-1.0</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/shared/tags/maven-mapping-1.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 26/42: [MSHARED-457] Upgrade
maven-shared-components parent to version 22
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 766a2d9ab58d25d512ea8df5946ca69d56a79cf0
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Nov 4 20:21:10 2015 +0000
[MSHARED-457] Upgrade maven-shared-components parent to version 22
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1712633 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e567dc5..037e53d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>21</version>
+ <version>22</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 10/42: updated parent pom
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 5463d4f4d4bf125da8579bdab980a1ad47484b97
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Mon Mar 31 20:57:52 2014 +0000
updated parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1583459 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 182c863..48d71bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>19</version>
+ <version>20</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
@@ -57,7 +57,6 @@
<properties>
<mavenVersion>2.0.6</mavenVersion>
- <maven.site.path>shared-archives/${project.artifactId}-LATEST</maven.site.path>
</properties>
<dependencies>
@@ -86,18 +85,6 @@
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<profiles>
<profile>
<id>reporting</id>
@@ -122,11 +109,6 @@
</reportSet>
</reportSets>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- </plugin>
</plugins>
</reporting>
</profile>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 40/42: [MSHARED-518] Upgrade plexus-interpolation
to 1.22
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 9cf42545c033259eb2ecfc0eb36b8aa723dca15f
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat May 21 12:19:32 2016 +0000
[MSHARED-518] Upgrade plexus-interpolation to 1.22
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1744924 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c26785a..2432e15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.21</version>
+ <version>1.22</version>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 36/42: [maven-release-plugin] prepare release
maven-mapping-3.0.0
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit c99d46ae12c1b6c5ebb2e8dd49d43ab4d5b16bbe
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 11:57:26 2015 +0000
[maven-release-plugin] prepare release maven-mapping-3.0.0
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714436 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index cedc935..1b064fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>maven-mapping</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<name>Apache Maven Mapping</name>
<description>A shared component to assist in interpolating file names using properties from a Maven project.</description>
@@ -38,9 +38,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-3.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-3.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/tags/maven-mapping-3.0.0</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 01/42: Start a new shared component for mapping
stuff. The first addition will be the file name mapping code from Maven WAR
Plugin.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 3084478242fe39f0ea036ecd4fac83036a152c84
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Fri Aug 9 10:20:58 2013 +0000
Start a new shared component for mapping stuff.
The first addition will be the file name mapping code from Maven WAR Plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1512234 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 110 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..5492f49
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,110 @@
+<?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.maven.shared</groupId>
+ <artifactId>maven-shared-components</artifactId>
+ <version>19</version>
+ <relativePath>../maven-shared-components/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-mapping</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Apache Maven Mapping</name>
+ <description>A shared component to assist in interpolating file names using properties from a Maven project.</description>
+
+ <prerequisites>
+ <maven>${mavenVersion}</maven>
+ </prerequisites>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MSHARED/component/16150</url>
+ </issueManagement>
+
+ <properties>
+ <mavenVersion>2.0.6</mavenVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ <version>1.15</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Created</columnNames>
+ <maxEntries>200</maxEntries>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <sortColumnNames>Key</sortColumnNames>
+ <versionPrefix>maven-mapping-</versionPrefix>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 30/42: [maven-release-plugin] prepare for next
development iteration
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 6620de37e63ae0042ebb4643280eb856e96815af
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 15 09:29:06 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714420 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26ab282..6f65722 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>maven-mapping</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<name>Apache Maven Mapping</name>
<description>A shared component to assist in interpolating file names using properties from a Maven project.</description>
@@ -38,9 +38,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-3.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-mapping-3.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/shared/tags/maven-mapping-3.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-mapping</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping</url>
</scm>
<issueManagement>
<system>jira</system>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 39/42: updated Jira url
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 2e6d9988399f07f873d25cfcd096e0b5514da292
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Sun May 15 09:15:59 2016 +0000
updated Jira url
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1743896 13f79535-47bb-0310-9956-ffa450edef68
---
src/site/site.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/site.xml b/src/site/site.xml
index ef1009a..34f8723 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -27,7 +27,7 @@ under the License.
<item name="JavaDocs" href="apidocs/index.html"/>
<item name="Source Xref" href="xref/index.html"/>
<!--item name="FAQ" href="faq.html"/-->
- <!-- According to http://jira.codehaus.org/browse/MNGSITE-152 -->
+ <!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
<item name="License" href="http://www.apache.org/licenses/"/>
<item name="Download" href="download.html"/>
</menu>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 27/42: Removed hard coded version for
maven-changes-plugin and let the parent do it's work.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit b8df2e3cca8c45fad783ab87733ebcd4ebc6cdad
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 8 10:22:25 2015 +0000
Removed hard coded version for maven-changes-plugin and let the parent do it's work.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1713219 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 037e53d..f9bdfc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.9</version>
<configuration>
<columnNames>Type,Key,Summary,Assignee,Status,Resolution,Created</columnNames>
<maxEntries>200</maxEntries>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 09/42: configured site deploy to
/shared-archives/-LATEST
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 9699217cd66ea28daa9eac37dca7862c2f7f8498
Author: Herve Boutemy <hb...@apache.org>
AuthorDate: Tue Nov 12 21:33:35 2013 +0000
configured site deploy to /shared-archives/<artifactId>-LATEST
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1541249 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5e203e0..182c863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,9 +48,16 @@
<system>jira</system>
<url>http://jira.codehaus.org/browse/MSHARED/component/16150</url>
</issueManagement>
-
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
+
<properties>
<mavenVersion>2.0.6</mavenVersion>
+ <maven.site.path>shared-archives/${project.artifactId}-LATEST</maven.site.path>
</properties>
<dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 22/42: [MSHARED-449] Upgrade to Maven 3.X only.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit aa11c5da718176798413b1ec85ac96fce7e98c2c
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Oct 31 14:06:23 2015 +0000
[MSHARED-449] Upgrade to Maven 3.X only.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1711635 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a88461a..0f6cc2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
- <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-mapping</artifactId>
<version>1.1-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -56,13 +55,15 @@
</distributionManagement>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0</mavenVersion>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -80,7 +81,7 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.2</version>
+ <version>2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 42/42: Removed maven-compiler-plugin properties,
cause this configuration is already done in parent.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 2cbdf718bdba01f063626b5ae749f5fe9ed566cb
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 22 20:19:37 2016 +0000
Removed maven-compiler-plugin properties,
cause this configuration is already done
in parent.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1757266 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index af8cda9..c7f91a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,6 @@
<properties>
<mavenVersion>3.0</mavenVersion>
- <maven.compiler.target>1.6</maven.compiler.target>
- <maven.compiler.source>1.6</maven.compiler.source>
</properties>
<dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 02/42: [MSHARED-291] Copy code for file name
mapping from Maven WAR Plugin
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 64c0f715e74d4ebb82a39874d7040e453e6b31b6
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Fri Aug 9 10:39:31 2013 +0000
[MSHARED-291] Copy code for file name mapping from Maven WAR Plugin
Copy MappingUtils (with unit test) and DashClassifierValueSource from Maven WAR Plugin.
Modify to fit the new package structure.
Remove unneeded throwing of MojoExecutionException in the unit test.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1512241 13f79535-47bb-0310-9956-ffa450edef68
---
.../shared/mapping/DashClassifierValueSource.java | 65 ++++++++
.../apache/maven/shared/mapping/MappingUtils.java | 76 ++++++++++
.../maven/shared/mapping/MappingUtilsTest.java | 167 +++++++++++++++++++++
3 files changed, 308 insertions(+)
diff --git a/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java b/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
new file mode 100644
index 0000000..8422512
--- /dev/null
+++ b/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
@@ -0,0 +1,65 @@
+package org.apache.maven.shared.mapping;
+
+/*
+ * 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.
+ */
+
+import java.util.Properties;
+
+import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
+
+/**
+ * This is a ValueSource, that can be used in an Interpolator. It supports
+ * special expressions, like <code>dashClassifier</code> and
+ * <code>dashClassifier?</code>.
+ *
+ * @version $Id$
+ * @since 2.5
+ */
+public class DashClassifierValueSource
+ extends PropertiesBasedValueSource
+{
+ /**
+ * Create the ValueSource.
+ *
+ * @param classifier The classifier that should be used during interpolation
+ */
+ public DashClassifierValueSource( String classifier )
+ {
+ super( createDashClassifierProperties( classifier ) );
+ }
+
+ private static Properties createDashClassifierProperties( String classifier )
+ {
+ Properties classifierMask = new Properties();
+
+ if ( classifier != null )
+ {
+ classifierMask.setProperty( "dashClassifier?", "-" + classifier );
+ classifierMask.setProperty( "dashClassifier", "-" + classifier );
+ }
+ else
+ {
+ classifierMask.setProperty( "dashClassifier?", "" );
+ classifierMask.setProperty( "dashClassifier", "" );
+ // Make sure that the classifier property is usable, if it is null
+ classifierMask.setProperty( "classifier", "" );
+ }
+ return classifierMask;
+ }
+}
diff --git a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
new file mode 100644
index 0000000..991077b
--- /dev/null
+++ b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
@@ -0,0 +1,76 @@
+package org.apache.maven.shared.mapping;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.artifact.Artifact;
+import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
+
+/**
+ * Utilities used to evaluate expression.
+ * <p/>
+ * TODO: this comes from the assembly plugin; refactor when it's shared.
+ * <p/>
+ * The expression might use any field of the {@link Artifact} interface. Some
+ * examples might be:
+ * <ul>
+ * <li>@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@</li>
+ * <li>@{artifactId}@-@{version}@.@{extension}@</li>
+ * <li>@{artifactId}@.@{extension}@</li>
+ * </ul>
+ *
+ * @author Stephane Nicoll
+ * @version $Id$
+ */
+public class MappingUtils
+{
+ public static final String DEFAULT_FILE_NAME_MAPPING = "@{artifactId}@-@{baseVersion}@.@{extension}@";
+ public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER =
+ "@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@";
+
+ /**
+ * Evaluates the specified expression for the given artifact.
+ *
+ * @param expression the expression to evaluate
+ * @param artifact the artifact to use as value object for tokens
+ * @return expression the evaluated expression
+ */
+ public static String evaluateFileNameMapping( String expression, Artifact artifact )
+ throws InterpolationException
+ {
+ String value = expression;
+
+ // FIXME: This is BAD! Accessors SHOULD NOT change the behavior of the object.
+ // [dennisl; 2013-07-30] This was fixed in Maven 2.0.8
+ artifact.isSnapshot();
+
+ RegexBasedInterpolator interpolator = new RegexBasedInterpolator( "\\@\\{(", ")?([^}]+)\\}@" );
+ interpolator.addValueSource( new ObjectBasedValueSource( artifact ) );
+ interpolator.addValueSource( new ObjectBasedValueSource( artifact.getArtifactHandler() ) );
+
+ // Support for special expressions, like @{dashClassifier?}@, see MWAR-212
+ interpolator.addValueSource( new DashClassifierValueSource( artifact.getClassifier() ) );
+
+ value = interpolator.interpolate( value, "__artifact" );
+
+ return value;
+ }
+}
diff --git a/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java b/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
new file mode 100644
index 0000000..e6d5e5c
--- /dev/null
+++ b/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
@@ -0,0 +1,167 @@
+package org.apache.maven.shared.mapping;
+
+/*
+ * 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.
+ */
+
+import junit.framework.TestCase;
+
+import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.handler.DefaultArtifactHandler;
+import org.apache.maven.plugin.testing.stubs.ArtifactStub;
+import org.codehaus.plexus.interpolation.InterpolationException;
+
+/**
+ * Tests the mapping of file names.
+ *
+ * @author Stephane Nicoll
+ */
+public class MappingUtilsTest
+ extends TestCase
+{
+
+ public void testCompleteMapping()
+ throws InterpolationException
+ {
+ TestArtifactStub jar = new TestArtifactStub();
+ jar.setGroupId( "org.apache.sample" );
+ jar.setArtifactId( "maven-test-lib" );
+ jar.setVersion( "1.0" );
+ assertEquals( "maven-test-lib-1.0.jar",
+ MappingUtils.evaluateFileNameMapping( "@{artifactId}@-@{version}@.@{extension}@", jar ) );
+
+ }
+
+ public void testNoVersionMapping()
+ throws InterpolationException
+ {
+ TestArtifactStub jar = new TestArtifactStub();
+ jar.setGroupId( "org.apache.sample" );
+ jar.setArtifactId( "maven-test-lib" );
+ jar.setVersion( "1.0" );
+ assertEquals( "maven-test-lib.jar", MappingUtils.evaluateFileNameMapping( "@{artifactId}@.@{extension}@", jar ) );
+
+ }
+
+ public void testMappingWithGroupId()
+ throws InterpolationException
+ {
+ TestArtifactStub jar = new TestArtifactStub();
+ jar.setGroupId( "org.apache.sample" );
+ jar.setArtifactId( "maven-test-lib" );
+ jar.setVersion( "1.0" );
+ assertEquals( "org.apache.sample-maven-test-lib-1.0.jar",
+ MappingUtils.evaluateFileNameMapping( "@{groupId}@-@{artifactId}@-@{version}@.@{extension}@", jar ) );
+
+ }
+
+ public void testMappingWithClassifier()
+ throws InterpolationException
+ {
+ TestArtifactStub jar = new TestArtifactStub();
+ jar.setGroupId( "org.apache.sample" );
+ jar.setArtifactId( "maven-test-lib" );
+ jar.setVersion( "1.0" );
+ jar.setClassifier( "classifier" );
+ assertEquals( "maven-test-lib-1.0-classifier.jar",
+ MappingUtils.evaluateFileNameMapping( MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
+ }
+
+ public void testMappingWithNullClassifier()
+ throws InterpolationException
+ {
+ TestArtifactStub jar = new TestArtifactStub();
+ jar.setGroupId( "org.apache.sample" );
+ jar.setArtifactId( "maven-test-lib" );
+ jar.setVersion( "1.0" );
+ jar.setClassifier( null );
+ assertEquals( "maven-test-lib-1.0-.jar",
+ MappingUtils.evaluateFileNameMapping( MappingUtils.DEFAULT_FILE_NAME_MAPPING_CLASSIFIER, jar ) );
+ }
+
+ /**
+ * Test for MWAR-212.
+ */
+ public void testMappingWithOptionalClassifier()
+ throws InterpolationException
+ {
+ final String MAPPING_WITH_OPTIONAL_CLASSIFIER_1 = "@{artifactId}@-@{version}@@{dashClassifier}@.@{extension}@";
+ final String MAPPING_WITH_OPTIONAL_CLASSIFIER_2 = "@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@";
+
+ TestArtifactStub jar = new TestArtifactStub();
+ jar.setGroupId( "org.apache.sample" );
+ jar.setArtifactId( "maven-test-lib" );
+ jar.setVersion( "1.0" );
+ assertEquals( "maven-test-lib-1.0.jar",
+ MappingUtils.evaluateFileNameMapping( MAPPING_WITH_OPTIONAL_CLASSIFIER_1, jar ) );
+ assertEquals( "maven-test-lib-1.0.jar",
+ MappingUtils.evaluateFileNameMapping( MAPPING_WITH_OPTIONAL_CLASSIFIER_2, jar ) );
+
+ jar = new TestArtifactStub();
+ jar.setGroupId( "org.apache.sample" );
+ jar.setArtifactId( "maven-test-lib" );
+ jar.setVersion( "1.0" );
+ jar.setClassifier( "classifier" );
+ assertEquals( "maven-test-lib-1.0-classifier.jar",
+ MappingUtils.evaluateFileNameMapping( MAPPING_WITH_OPTIONAL_CLASSIFIER_1, jar ) );
+ assertEquals( "maven-test-lib-1.0-classifier.jar",
+ MappingUtils.evaluateFileNameMapping( MAPPING_WITH_OPTIONAL_CLASSIFIER_2, jar ) );
+ }
+
+ // A very dumb stub used to test the mappings
+ class TestArtifactStub
+ extends ArtifactStub
+ {
+ /**
+ * Override in this class because there is no setter in ArtifactStub.
+ */
+ protected String classifier;
+
+ public TestArtifactStub()
+ {
+ super();
+ setType( "jar" );
+ }
+
+ /**
+ * Override in this class because ArtifactStub always returns null.
+ */
+ @Override
+ public ArtifactHandler getArtifactHandler()
+ {
+ return new DefaultArtifactHandler( getType() );
+ }
+
+ @Override
+ public String getBaseVersion()
+ {
+ return getVersion();
+ }
+
+ @Override
+ public String getClassifier()
+ {
+ return classifier;
+ }
+
+ public void setClassifier( String classifier )
+ {
+ this.classifier = classifier;
+ }
+ }
+}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-mapping] 04/42: Improve Javadoc.
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit 55c5778f084701bd0eed40ca8c7dd49d5c2d937f
Author: Dennis Lundberg <de...@apache.org>
AuthorDate: Fri Aug 9 11:38:38 2013 +0000
Improve Javadoc.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1512265 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/shared/mapping/DashClassifierValueSource.java | 1 -
.../java/org/apache/maven/shared/mapping/MappingUtils.java | 13 ++++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java b/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
index 8422512..fd7e9fb 100644
--- a/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
+++ b/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
@@ -29,7 +29,6 @@ import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
* <code>dashClassifier?</code>.
*
* @version $Id$
- * @since 2.5
*/
public class DashClassifierValueSource
extends PropertiesBasedValueSource
diff --git a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
index 991077b..f032612 100644
--- a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
+++ b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
@@ -25,19 +25,26 @@ import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
/**
+ * <p>
* Utilities used to evaluate expression.
- * <p/>
- * TODO: this comes from the assembly plugin; refactor when it's shared.
- * <p/>
+ * </p>
+ * <p>
* The expression might use any field of the {@link Artifact} interface. Some
* examples might be:
+ * </p>
* <ul>
* <li>@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@</li>
* <li>@{artifactId}@-@{version}@.@{extension}@</li>
* <li>@{artifactId}@.@{extension}@</li>
* </ul>
+ * <p>
+ * Although parts of this code comes from the Assembly Plugin, it cannot be
+ * shared with the Assembly Plugin. The reason for this is that the Assembly
+ * Plugin always uses a prefix for the expressions, whereas this code does not.
+ * <p/>
*
* @author Stephane Nicoll
+ * @author Dennis Lundberg
* @version $Id$
*/
public class MappingUtils
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.