diff options
| author | Ed Merks | 2021-11-16 18:17:34 +0000 |
|---|---|---|
| committer | Ed Merks | 2021-11-16 18:17:34 +0000 |
| commit | 2918b6b2560c783b5225f9ba921105c5b6ca8c7e (patch) | |
| tree | 0f8c0d7279eab56ab865a38e878fd9314316e7e5 | |
| parent | 5d63aa61c30125f5f63146a8092ea6501a978a01 (diff) | |
| download | justj.tools-2918b6b2560c783b5225f9ba921105c5b6ca8c7e.tar.gz justj.tools-2918b6b2560c783b5225f9ba921105c5b6ca8c7e.tar.xz justj.tools-2918b6b2560c783b5225f9ba921105c5b6ca8c7e.zip | |
Bug 577291 - The a.jre.* IU should not include a minor nor micro version
| -rw-r--r-- | plugins/org.eclipse.justj.codegen/src/org/eclipse/justj/codegen/templates/plugin/P2Inf.java | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.justj.codegen/templates/plugin/p2.inf.jet | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.justj.codegen/src/org/eclipse/justj/codegen/templates/plugin/P2Inf.java b/plugins/org.eclipse.justj.codegen/src/org/eclipse/justj/codegen/templates/plugin/P2Inf.java index dd5e5ee..8b765f5 100644 --- a/plugins/org.eclipse.justj.codegen/src/org/eclipse/justj/codegen/templates/plugin/P2Inf.java +++ b/plugins/org.eclipse.justj.codegen/src/org/eclipse/justj/codegen/templates/plugin/P2Inf.java @@ -110,7 +110,7 @@ public class P2Inf Model model = jvm.getModel(); String modelName = model.getName(); String version = jvm.getVersion(); - String minorlessVersion = version.replaceAll("\\.[0-9]$", ".0"); + String minorlessVersion = version.replaceAll("\\.[0-9]+\\.[0-9]+$", ".0.0"); String fullName = modelName + '.' + jvmName; builder.append(_50); builder.append(org.eclipse.justj.codegen.model.util.Generator.getCopyright(argument, "# ", NL)); diff --git a/plugins/org.eclipse.justj.codegen/templates/plugin/p2.inf.jet b/plugins/org.eclipse.justj.codegen/templates/plugin/p2.inf.jet index 05880b4..c67b7b6 100644 --- a/plugins/org.eclipse.justj.codegen/templates/plugin/p2.inf.jet +++ b/plugins/org.eclipse.justj.codegen/templates/plugin/p2.inf.jet @@ -14,7 +14,7 @@ SPDX-License-Identifier: EPL-2.0 Model model = jvm.getModel(); String modelName = model.getName(); String version = jvm.getVersion(); - String minorlessVersion = version.replaceAll("\\.[0-9]$", ".0"); + String minorlessVersion = version.replaceAll("\\.[0-9]+\\.[0-9]+$", ".0.0"); String fullName = modelName + '.' + jvmName;%> <%@include file="../copyright.properties.jetinc"%> |