Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workspace templates: remove old bndtools/workspace #6164

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Workspace templates: remove old bndtools/workspace #6164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d7dcb4
ws templates: remove bndtools/workspace
chrisrueger Jun 24, 2024
7a0ca66
updated some refs to workspace.min
chrisrueger Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions biz.aQute.bndlib/src/aQute/bnd/wstemplates/TemplateID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bndtools.core/src/bndtools/wizards/newworkspace/Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
1 change: 0 additions & 1 deletion ...ools.templating.gitrepo/resources/processed/org/bndtools/templating/jgit/initialrepos.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
bndtools/workspace;branch=origin/${version;==;${base.version}},
bndtools/bndtools.workspace.min