summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaria Odea B. Ching <oching@apache.org>2008-09-08 01:59:25 +0000
committerMaria Odea B. Ching <oching@apache.org>2008-09-08 01:59:25 +0000
commitcb9792bc7dab3a61af33d2e1890ba09d79ef27f3 (patch)
tree7996dedd7a0c19395bb939232265142d0b3d9362
parent14abf5f87e12e38a8ae58f9323bd76d043abed52 (diff)
downloadarchiva-cb9792bc7dab3a61af33d2e1890ba09d79ef27f3.tar.gz
archiva-cb9792bc7dab3a61af33d2e1890ba09d79ef27f3.zip
merge -r692978 (MRM-847: display <plugin> for maven-plugin and change title to POM Snippet in artifact info page) from 1.1.x branch
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@692979 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf17
1 files changed, 15 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
index d15092665..309b8420f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
@@ -109,15 +109,28 @@
</table>
<c:if test="${model.packaging != 'pom'}">
- <h2>POM Dependency Snippet</h2>
+ <h2>POM Snippet</h2>
+ <c:choose>
+ <c:when test="${model.packaging == 'maven-plugin'}">
+<pre class="pom">
+ &lt;plugin>
+ &lt;groupId>${model.groupId}&lt;/groupId>
+ &lt;artifactId>${model.artifactId}&lt;/artifactId>
+ &lt;version>${version}&lt;/version>
+ &lt;/plugin>
+</pre>
+ </c:when>
+ <c:otherwise>
<pre class="pom">
&lt;dependency>
&lt;groupId>${model.groupId}&lt;/groupId>
- &lt;artifactId>${model.artifactId}&lt;/artifactId>
+ &lt;artifactId>${model.artifactId}&lt;/artifactId>
&lt;version>${version}&lt;/version><c:if test="${model.packaging != 'jar'}">
&lt;type>${model.packaging}&lt;/type></c:if>
&lt;/dependency>
</pre>
+ </c:otherwise>
+ </c:choose>
</c:if>
<c:if test="${!empty (model.url) || model.organization != null || !empty (model.licenses)