Author: oching
Date: Sun Sep 7 18:59:25 2008
New Revision: 692979
URL: http://svn.apache.org/viewvc?rev=692979&view=rev
Log:
merge -r692978 (MRM-847: display <plugin> for maven-plugin and change title to
POM Snippet in artifact info page) from 1.1.x branch
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf?rev=692979&r1=692978&r2=692979&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
Sun Sep 7 18:59:25 2008
@@ -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">
+ <plugin>
+ <groupId>${model.groupId}</groupId>
+ <artifactId>${model.artifactId}</artifactId>
+ <version>${version}</version>
+ </plugin>
+</pre>
+ </c:when>
+ <c:otherwise>
<pre class="pom">
<dependency>
<groupId>${model.groupId}</groupId>
- <artifactId>${model.artifactId}</artifactId>
+ <artifactId>${model.artifactId}</artifactId>
<version>${version}</version><c:if test="${model.packaging !=
'jar'}">
<type>${model.packaging}</type></c:if>
</dependency>
</pre>
+ </c:otherwise>
+ </c:choose>
</c:if>
<c:if test="${!empty (model.url) || model.organization != null || !empty
(model.licenses)