From 8d7dcb4016076d495c7bac8614eba73e1ad4252b Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Mon, 24 Jun 2024 15:45:08 +0200 Subject: [PATCH 1/2] ws templates: remove bndtools/workspace from initialrepos.txt, because in https://github.com/bndtools/bnd/issues/5955 we kind of agreed to remove https://github.com/bndtools/workspace workspace template and just keep the bndtools/bndtools.workspace.min , because workspace templates will most likely be superseded by Template Fragments Signed-off-by: Christoph Rueger --- .../processed/org/bndtools/templating/jgit/initialrepos.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/org.bndtools.templating.gitrepo/resources/processed/org/bndtools/templating/jgit/initialrepos.txt b/org.bndtools.templating.gitrepo/resources/processed/org/bndtools/templating/jgit/initialrepos.txt index 6ee9e384a2..fed701e7b9 100644 --- a/org.bndtools.templating.gitrepo/resources/processed/org/bndtools/templating/jgit/initialrepos.txt +++ b/org.bndtools.templating.gitrepo/resources/processed/org/bndtools/templating/jgit/initialrepos.txt @@ -1,2 +1 @@ -bndtools/workspace;branch=origin/${version;==;${base.version}}, bndtools/bndtools.workspace.min From 7a0ca665126a941b1db234d53826dba13b79ed05 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Wed, 26 Jun 2024 09:34:00 +0200 Subject: [PATCH 2/2] updated some refs to workspace.min Signed-off-by: Christoph Rueger --- biz.aQute.bndlib/src/aQute/bnd/wstemplates/TemplateID.java | 7 ++++--- bndtools.core/src/bndtools/wizards/newworkspace/Model.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/biz.aQute.bndlib/src/aQute/bnd/wstemplates/TemplateID.java b/biz.aQute.bndlib/src/aQute/bnd/wstemplates/TemplateID.java index 525b93cf0d..dbf096e692 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/wstemplates/TemplateID.java +++ b/biz.aQute.bndlib/src/aQute/bnd/wstemplates/TemplateID.java @@ -26,7 +26,7 @@ public record TemplateID(String organisation, String repository, String path, St g("path", set(lit("/"), SEGMENT_P)), opt(lit("/"))), opt(lit("#"), g("branch", REF_P)) // ); - final static URI ROOT = URI.create("https://github.com/bndtools/workspace#master"); + final static URI ROOT = URI.create("https://github.com/bndtools/bndtools.workspace.min#master"); @Override public int compareTo(TemplateID o) { @@ -58,8 +58,9 @@ public URI uri() { /** * Parse the id into a Template ID. The default is - * `bndtools/workspace#master`. The missing fields are taken from this - * default. If the id does not match the pattern, it is assumed to be a URI. + * `bndtools/bndtools.workspace.min#master`. The missing fields are taken + * from this default. If the id does not match the pattern, it is assumed to + * be a URI. * * @param id id or uri * @return a TemplateId diff --git a/bndtools.core/src/bndtools/wizards/newworkspace/Model.java b/bndtools.core/src/bndtools/wizards/newworkspace/Model.java index 4ab95e4090..001b8ba680 100644 --- a/bndtools.core/src/bndtools/wizards/newworkspace/Model.java +++ b/bndtools.core/src/bndtools/wizards/newworkspace/Model.java @@ -29,7 +29,7 @@ public class Model implements Runnable { static final IWorkspace ECLIPSE_WORKSPACE = ResourcesPlugin.getWorkspace(); static final IWorkspaceRoot ROOT = ECLIPSE_WORKSPACE.getRoot(); static final IPath ROOT_LOCATION = ROOT.getLocation(); - static final URI TEMPLATE_HOME = URI.create("https:://github.com/bndtools/workspace"); + static final URI TEMPLATE_HOME = URI.create("https:://github.com/bndtools/bndtools.workspace.min"); final static File current = ROOT_LOCATION.toFile();