MPJNLP-7. Added extra property maven.jnlp.cert.version to support certificate renewals.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114762 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
evenisse committed
1 parent
21cf46d451
commit
646831a364
3 files changed
+50
-12
No files matched your search
+26
-6
@@ -48,6 +48,10 @@
|
||||
<jnlp spec="${maven.jnlp.spec}"
|
||||
codebase="${maven.jnlp.http.codebase}"
|
||||
href="${pom.artifactId}.jnlp">
|
||||
<j:if test="${context.getVariable('maven.jnlp.cert.version') != null}">
|
||||
<j:set var="certVer" value="${maven.jnlp.cert.version}"/>
|
||||
<ant:echo>Appending Certificate Version: ${certVer}</ant:echo>
|
||||
</j:if>
|
||||
|
||||
<information>
|
||||
<title>${maven.jnlp.title}</title>
|
||||
@@ -97,13 +101,17 @@
|
||||
|
||||
<j:forEach var="lib" items="${pom.artifacts}">
|
||||
<j:set var="dep" value="${lib.dependency}"/>
|
||||
<j:set var="depVer" value="${dep.version}"/>
|
||||
<j:if test="${context.getVariable('maven.jnlp.cert.version') != null}">
|
||||
<j:set var="depVer" value="${depVer.concat('-').concat(certVer)}"/>
|
||||
</j:if>
|
||||
<j:if test="${dep.getProperty('jnlp.jar')=='true'}">
|
||||
<j:choose>
|
||||
<j:when test="${dep.getProperty('jnlp.main.jar')=='true'}">
|
||||
<j:set var="mainExists" value="true"/>
|
||||
<j:choose>
|
||||
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
|
||||
<jar href="${lib.file.name}" main="true" version="${dep.version}"/>
|
||||
<jar href="${lib.file.name}" main="true" version="${depVer}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${lib.file.name}" main="true"/>
|
||||
@@ -113,7 +121,7 @@
|
||||
<j:otherwise>
|
||||
<j:choose>
|
||||
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (dep.version.indexOf('SNAPSHOT') lt 0)}">
|
||||
<jar href="${lib.file.name}" version="${dep.version}"/>
|
||||
<jar href="${lib.file.name}" version="${depVer}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${lib.file.name}" />
|
||||
@@ -126,11 +134,15 @@
|
||||
<nativelib href="${lib.file.name}"/>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
<j:set var="depVer" value="${pom.currentVersion}"/>
|
||||
<j:if test="${context.getVariable('maven.jnlp.cert.version') != null}">
|
||||
<j:set var="depVer" value="${depVer.concat('-').concat(certVer)}"/>
|
||||
</j:if>
|
||||
<j:choose>
|
||||
<j:when test="${mainExists=='false'}">
|
||||
<j:choose>
|
||||
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
|
||||
<jar href="${final.jar.name}" main="true" version="${pom.currentVersion}"/>
|
||||
<jar href="${final.jar.name}" main="true" version="${depVer}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${final.jar.name}" main="true"/>
|
||||
@@ -140,7 +152,7 @@
|
||||
<j:otherwise>
|
||||
<j:choose>
|
||||
<j:when test="${(context.getVariable('maven.jnlp.usejarversions') != null) and (pom.currentVersion.indexOf('SNAPSHOT') lt 0)}">
|
||||
<jar href="${final.jar.name}" version="${pom.currentVersion}"/>
|
||||
<jar href="${final.jar.name}" version="${depVer}"/>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<jar href="${final.jar.name}" />
|
||||
@@ -199,7 +211,11 @@
|
||||
<resource>
|
||||
<pattern>
|
||||
<name>${lib.file.name}</name>
|
||||
<version-id>${dep.version}</version-id>
|
||||
<j:set var="depVer" value="${dep.version}"/>
|
||||
<j:if test="${context.getVariable('maven.jnlp.cert.version') != null}">
|
||||
<j:set var="depVer" value="${depVer.concat('-').concat(certVer)}"/>
|
||||
</j:if>
|
||||
<version-id>${depVer}</version-id>
|
||||
</pattern>
|
||||
<file>${lib.file.name}</file>
|
||||
</resource>
|
||||
@@ -209,7 +225,11 @@
|
||||
<resource>
|
||||
<pattern>
|
||||
<name>${final.jar.name}</name>
|
||||
<version-id>${pom.currentVersion}</version-id>
|
||||
<j:set var="depVer" value="${pom.currentVersion}"/>
|
||||
<j:if test="${context.getVariable('maven.jnlp.cert.version') != null}">
|
||||
<j:set var="depVer" value="${depVer.concat('-').concat(certVer)}"/>
|
||||
</j:if>
|
||||
<version-id>${depVer}</version-id>
|
||||
</pattern>
|
||||
<file>${final.jar.name}</file>
|
||||
</resource>
|
||||
|
||||
@@ -8,14 +8,16 @@
|
||||
|
||||
<body>
|
||||
<release version="1.3" date="In CVS">
|
||||
<action dev="evenisse" type="fix">
|
||||
MPJNLP-6. Updated jarversions support to take SNAPSHOT jars into account.
|
||||
<action dev="evenisse" type="add" issue="MPJNLP-7">
|
||||
Added extra property maven.jnlp.cert.version to support certificate renewals.
|
||||
</action>
|
||||
<action dev="evenisse" type="fix">
|
||||
MPJNLP-1.
|
||||
<action dev="evenisse" type="fix" issue="MPJNLP-6">
|
||||
Updated jarversions support to take SNAPSHOT jars into account.
|
||||
</action>
|
||||
<action dev="evenisse" type="fix">
|
||||
MPJNLP-4. Add support for jar versions
|
||||
<action dev="evenisse" type="fix" issue="MPJNLP-1">
|
||||
</action>
|
||||
<action dev="evenisse" type="fix" issue="MPJNLP-4">
|
||||
Add support for jar versions.
|
||||
</action>
|
||||
<action dev="jvanzyl" type="update">
|
||||
Remove the need for ${pom} interpolation in properties. The
|
||||
|
||||
@@ -255,6 +255,22 @@
|
||||
</td>
|
||||
<td>false</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.jnlp.cert.version</td>
|
||||
<td>Yes</td>
|
||||
<td>
|
||||
A version string to be appended to each dependency version when generating
|
||||
version.xml. (This is only useful if maven.jnlp.usejarversions is set to true).
|
||||
This comes in handy, when your code signing certificate expires and is renewed.
|
||||
Java Web Start requires that ALL jars be signed with the same certificate. When
|
||||
renewing a certificate you must change all of the version numbers of all jars, so
|
||||
that the JWS client will re-download the jars that haven't changed, but have only
|
||||
been re-signed by the new key. With this property, when you get a renewed key,
|
||||
all you have to do, is update the maven.jnlp.cert.version string to a new value,
|
||||
and the new version.xml will have all new version strings for ALL jars.
|
||||
</td>
|
||||
<td>false</td>
|
||||
</tr>
|
||||
</table>
|
||||
</section>
|
||||
<section name="Keystore settings">
|
||||
|
||||
Reference in new issue
Block a user