Merge pull request #6164 from chrisrueger/remove-old-workspace-template

Workspace templates: remove old bndtools/workspace
bndtools · Jun 27, 2024 · 16d068f · 16d068f
2 parents ece52d5 + 7a0ca66
commit 16d068f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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();
 

diff --git a/...ools.templating.gitrepo/resources/processed/org/bndtools/templating/jgit/initialrepos.txt b/...ools.templating.gitrepo/resources/processed/org/bndtools/templating/jgit/initialrepos.txt
@@ -1,2 +1 @@
-bndtools/workspace;branch=origin/${version;==;${base.version}},
 bndtools/bndtools.workspace.min
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		bndtools/workspace;branch=origin/${version;==;${base.version}},
		bndtools/bndtools.workspace.min