From 0911ac8caed1b7393980c06517e904e1aa8ff34d Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Mon, 1 Jul 2024 20:21:09 +0200 Subject: [PATCH 1/4] replace placeholder <> with <> this better reflects the intention of this place holder, especially when display in the repo browser. Before someone could get the wrong impression e.g. that it means a repo is 'empty'. Signed-off-by: Christoph Rueger --- .../src/aQute/bnd/service/tags/Tagged.java | 5 ----- bndtools.core/_plugin.xml | 12 ++++++------ docs/_instructions/runrepos.md | 4 ++-- docs/_plugins/filerepo.md | 2 +- docs/_plugins/localindexrepo.md | 2 +- docs/_plugins/maven.md | 2 +- docs/_plugins/osgirepo.md | 2 +- docs/_plugins/p2repo.md | 2 +- docs/_plugins/pomrepo.md | 2 +- 9 files changed, 14 insertions(+), 19 deletions(-) diff --git a/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tagged.java b/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tagged.java index e14a1a5e72..fd9bf6ea11 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tagged.java +++ b/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tagged.java @@ -5,11 +5,6 @@ * repositories. */ public interface Tagged { - - /** - * Dummy placeholder for "empty tags". - */ - String EMPTY_TAGS = "<>"; /** * @return a non-null list of tags. Default is empty (meaning 'no tags'). diff --git a/bndtools.core/_plugin.xml b/bndtools.core/_plugin.xml index 6d8f9fd321..a5f23cb1be 100644 --- a/bndtools.core/_plugin.xml +++ b/bndtools.core/_plugin.xml @@ -839,7 +839,7 @@ helpUrl="https://bnd.bndtools.org/plugins/filerepo.html"> - + @@ -850,7 +850,7 @@ helpUrl="https://bnd.bndtools.org/plugins/osgirepo.html"> - + - + - + @@ -922,7 +922,7 @@ name="P2Repository" helpUrl="https://bnd.bndtools.org/plugins/p2repo.html"> - + @@ -932,7 +932,7 @@ name="Maven POM Repository" helpUrl="https://bnd.bndtools.org/plugins/pomrepo.html"> - + diff --git a/docs/_instructions/runrepos.md b/docs/_instructions/runrepos.md index 38fc8930e6..0cbf7a4ed3 100644 --- a/docs/_instructions/runrepos.md +++ b/docs/_instructions/runrepos.md @@ -65,7 +65,7 @@ For example the following repository definition in `/cnf/build.bnd` would be exc ``` aQute.bnd.repository.maven.provider.MavenBndRepository;\ - tags = "<>"; \ + tags = "<>"; \ name="Maven Central";\ releaseUrl="${mavencentral}";\ snapshotUrl="${ossrh}";\ @@ -73,6 +73,6 @@ aQute.bnd.repository.maven.provider.MavenBndRepository;\ readOnly=true,\ ``` -because it has a `<>` tag (and thus no `resolve` tag). +because it has a `<>` tag (and thus no `resolve` tag). An example use case is exclude the baseline-repository from resolution. In the case, you would not add the `resolve` tag to the baseline-repo, and then it won't be considered for resolution in a `.bndrun`. \ No newline at end of file diff --git a/docs/_plugins/filerepo.md b/docs/_plugins/filerepo.md index 1eed6401c0..4c35cfb471 100644 --- a/docs/_plugins/filerepo.md +++ b/docs/_plugins/filerepo.md @@ -14,7 +14,7 @@ The following properties are supported: |`location` | The local filesystem directory. | Yes. | |`readonly` |Whether the repository should be read-only,| No. Default: false | | |i.e. disabled for editing from Bndtools.| | -| `tags` | Comma separated list of tags. (e.g. resolve, baseline, release) Use the <<EMPTY>> placeholder for no tags. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| No +| `tags` | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| No ## Tagging diff --git a/docs/_plugins/localindexrepo.md b/docs/_plugins/localindexrepo.md index 360dd52668..b2cee5cead 100644 --- a/docs/_plugins/localindexrepo.md +++ b/docs/_plugins/localindexrepo.md @@ -26,7 +26,7 @@ Merging the information from both tables into one, we get the following comprehe | `timeout` | `integer` | | If there is a cached file, then just use it if the cached file is within the `timeout` period OR `online` is `false`. | | | `online` | `BOOLEAN` | `true` | Specifies if this repository is online. If `false` then cached resources are used. | | | `type` | `STRING` | `R5` | The type (format) of index to generate. See _Note 1_ below. | No. | -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use the <<EMPTY>> The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. | No +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. | No **Note 1**: The index is generated by default in R5 format. To request alternative format(s), specify a list of format names separated by the "|" (pipe) character. For example, to generate both R5 and OBR formats specify `type=R5|OBR`. diff --git a/docs/_plugins/maven.md b/docs/_plugins/maven.md index fab12313a6..895d9d3867 100644 --- a/docs/_plugins/maven.md +++ b/docs/_plugins/maven.md @@ -87,7 +87,7 @@ The class name of the plugin is `aQute.bnd.repository.maven.provider.MavenBndRep | `readOnly` | `true|false` | `false` | If set to _truthy_ then this repository is read only.| | `name` | `NAME`| `Maven` | The name of the repository.| | `index` | `PATH`| `cnf/.mvn` | The path to the _index_ file. The index file is a list of Maven _coordinates_.| -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use the <<EMPTY>> placeholder for no tags. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| | `source` | `STRING`| `org.osgi:org.osgi.service.log:1.3.0 org.osgi:org.osgi.service.log:1.2.0` | A space, comma, semicolon, or newline separated GAV string. | | `noupdateOnRelease` | `true|false` | `false` | If set to _truthy_ then this repository will not update the `index` when a non-snapshot artifact is released.| | `poll.time` | `integer` | 5 seconds | Number of seconds between checks for changes to the `index` file. If the value is negative or the workspace is in batch/CI mode, then no polling takes place.| diff --git a/docs/_plugins/osgirepo.md b/docs/_plugins/osgirepo.md index 2e788d3857..5dc3f57298 100644 --- a/docs/_plugins/osgirepo.md +++ b/docs/_plugins/osgirepo.md @@ -17,7 +17,7 @@ The class name of the plugin is `aQute.bnd.repository.osgi.OSGiRepository`. It c | `cache` | `STRING`| The workspace cache folder | The location, the downloaded bundles are stored. | | `max.stale` | `integer` | one year | Bnd has it's own download cache. `max.stale` configures for how many _seconds_ the downloaded index file stays in the internal download cache. Use _-1_ to always check if there is a newer file on the server. | | `poll.time` | `integer` | 5 seconds | Number of seconds between checks for polls on the `index` file. If the value is negative or the workspace is in batch/CI mode, then no polling takes place. | -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use the <<EMPTY>> The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. ## Example diff --git a/docs/_plugins/p2repo.md b/docs/_plugins/p2repo.md index b6f50f8a04..88e14c7f10 100644 --- a/docs/_plugins/p2repo.md +++ b/docs/_plugins/p2repo.md @@ -19,7 +19,7 @@ It can take the following configuration properties: | `name` | `NAME` | p2 + `url` | The name of the repository. | | `url` | `URI` | | The URL to either the P2 repository (a directory) or an Eclipse target platform definition file. | | `location` | `STRING` | | The location to store the _index_ file and where bundles will be downloaded to. | -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use the <<EMPTY>> placeholder for no tags. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| ## Example diff --git a/docs/_plugins/pomrepo.md b/docs/_plugins/pomrepo.md index 4d5e5b3714..b2b547624b 100644 --- a/docs/_plugins/pomrepo.md +++ b/docs/_plugins/pomrepo.md @@ -69,7 +69,7 @@ The query must return a JSON response. | `transitive` | `true|false` | `true` | If set to _truthy_ then dependencies are transitive.| | `poll.time` | `integer`| 5 minutes | Number of seconds between checks for changes to POM files referenced by `pom` or `revision`. If the value is negative or the workspace is in batch/CI mode, then no polling takes place.| | `dependencyManagement` | `boolean`| false | If set to `true`, dependencies in the `dependencyManagement` section will be handled as actual dependencies.| -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use the <<EMPTY>> The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. One, and only one, of the `pom`, `revision`, or `query` configurations can be set. If multiple are set then the first in `[pom, revision, query]` is used and the remainders are ignored. From 6c1586e6bdca07a4d5913947ce9f293ebb398636 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Mon, 1 Jul 2024 20:48:36 +0200 Subject: [PATCH 2/4] tune wording Signed-off-by: Christoph Rueger --- bndtools.core/_plugin.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bndtools.core/_plugin.xml b/bndtools.core/_plugin.xml index a5f23cb1be..ea838722c5 100644 --- a/bndtools.core/_plugin.xml +++ b/bndtools.core/_plugin.xml @@ -839,7 +839,7 @@ helpUrl="https://bnd.bndtools.org/plugins/filerepo.html"> - + @@ -850,7 +850,7 @@ helpUrl="https://bnd.bndtools.org/plugins/osgirepo.html"> - + - + - + @@ -922,7 +922,7 @@ name="P2Repository" helpUrl="https://bnd.bndtools.org/plugins/p2repo.html"> - + @@ -932,7 +932,7 @@ name="Maven POM Repository" helpUrl="https://bnd.bndtools.org/plugins/pomrepo.html"> - + From b39f60040161117519c1d1d6387106da1270ba85 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Tue, 2 Jul 2024 16:52:22 +0200 Subject: [PATCH 3/4] revert prev change partly to use <> again we keep <> as a placeholder, but we do not display it in the repo browser Signed-off-by: Christoph Rueger --- .../src/aQute/bnd/service/tags/Tagged.java | 6 ++++++ .../src/aQute/bnd/service/tags/Tags.java | 19 +++++++++++++++++++ .../maven/provider/WorkspaceTest.java | 11 +++++++++++ bndtools.core/_plugin.xml | 12 ++++++------ .../repo/RepositoryTreeLabelProvider.java | 5 +---- docs/_instructions/runrepos.md | 4 ++-- docs/_plugins/filerepo.md | 2 +- docs/_plugins/localindexrepo.md | 2 +- docs/_plugins/maven.md | 2 +- docs/_plugins/osgirepo.md | 2 +- docs/_plugins/p2repo.md | 2 +- docs/_plugins/pomrepo.md | 2 +- 12 files changed, 51 insertions(+), 18 deletions(-) diff --git a/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tagged.java b/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tagged.java index fd9bf6ea11..16a9fc3358 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tagged.java +++ b/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tagged.java @@ -6,6 +6,11 @@ */ public interface Tagged { + /** + * Dummy placeholder for "empty tags". + */ + String EMPTY_TAGS = "<>"; + /** * @return a non-null list of tags. Default is empty (meaning 'no tags'). */ @@ -13,4 +18,5 @@ default Tags getTags() { return Tags.NO_TAGS; } + } diff --git a/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tags.java b/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tags.java index b1ca71a129..367fb6581a 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tags.java +++ b/biz.aQute.bndlib/src/aQute/bnd/service/tags/Tags.java @@ -160,4 +160,23 @@ public static Tags parse(String csvTags, Tags defaultTags) { .collect(Collectors.toCollection(LinkedHashSet::new))); } + /** + * Helper printing a csv-string of the tags for display purposes. The + * {@link Tagged#EMPTY_TAGS} is treated specially. + * + * @return a comma separated string of tags. If tags contains just 1 tag + * which is {@link Tagged#EMPTY_TAGS} then "-" is returned. If there + * are more than 1 tags, then {@link Tagged#EMPTY_TAGS} is omitted. + */ + public static String print(Tags tags) { + if (tags.internalSet.size() == 1 && tags.internalSet.contains(Tagged.EMPTY_TAGS)) { + return "-"; + } + + return tags.internalSet.stream() + .filter(tag -> !Tagged.EMPTY_TAGS.equals(tag)) + .collect(Collectors.joining(",")); + } + + } diff --git a/biz.aQute.repository/test/aQute/bnd/repository/maven/provider/WorkspaceTest.java b/biz.aQute.repository/test/aQute/bnd/repository/maven/provider/WorkspaceTest.java index dd7667493a..5ba383ac81 100644 --- a/biz.aQute.repository/test/aQute/bnd/repository/maven/provider/WorkspaceTest.java +++ b/biz.aQute.repository/test/aQute/bnd/repository/maven/provider/WorkspaceTest.java @@ -19,6 +19,7 @@ import aQute.bnd.build.Workspace; import aQute.bnd.osgi.Constants; import aQute.bnd.service.tags.Tagged; +import aQute.bnd.service.tags.Tags; import aQute.bnd.test.jupiter.InjectTemporaryDirectory; import aQute.http.testservers.HttpTestServer.Config; import aQute.lib.io.IO; @@ -134,4 +135,14 @@ void config(Map override) throws Exception { } } + @Test + public void testTagDisplay() { + assertEquals("", Tags.print(Tags.of())); + assertEquals("", Tags.print(Tags.NO_TAGS)); + assertEquals("foo", Tags.print(Tags.of("foo"))); + assertEquals("bar,foo", Tags.print(Tags.of("foo", "bar"))); + assertEquals("-", Tags.print(Tags.of(Tagged.EMPTY_TAGS))); + assertEquals("foo", Tags.print(Tags.of(Tagged.EMPTY_TAGS, "foo"))); + assertEquals("bar,foo", Tags.print(Tags.of(Tagged.EMPTY_TAGS, "foo", "bar"))); + } } diff --git a/bndtools.core/_plugin.xml b/bndtools.core/_plugin.xml index ea838722c5..9f40443b19 100644 --- a/bndtools.core/_plugin.xml +++ b/bndtools.core/_plugin.xml @@ -839,7 +839,7 @@ helpUrl="https://bnd.bndtools.org/plugins/filerepo.html"> - + @@ -850,7 +850,7 @@ helpUrl="https://bnd.bndtools.org/plugins/osgirepo.html"> - + - + - + @@ -922,7 +922,7 @@ name="P2Repository" helpUrl="https://bnd.bndtools.org/plugins/p2repo.html"> - + @@ -932,7 +932,7 @@ name="Maven POM Repository" helpUrl="https://bnd.bndtools.org/plugins/pomrepo.html"> - + diff --git a/bndtools.core/src/bndtools/model/repo/RepositoryTreeLabelProvider.java b/bndtools.core/src/bndtools/model/repo/RepositoryTreeLabelProvider.java index 69f1a5bf3d..1f553997b4 100644 --- a/bndtools.core/src/bndtools/model/repo/RepositoryTreeLabelProvider.java +++ b/bndtools.core/src/bndtools/model/repo/RepositoryTreeLabelProvider.java @@ -1,7 +1,5 @@ package bndtools.model.repo; -import java.util.stream.Collectors; - import org.bndtools.core.ui.icons.Icons; import org.bndtools.core.ui.icons.Icons.IconBuilder; import org.bndtools.utils.jface.HyperlinkStyler; @@ -52,8 +50,7 @@ public void update(ViewerCell cell) { Tags tags = repo.getTags(); if (!tags.isEmpty()) { - label.append(" " + tags.stream() - .collect(Collectors.joining(",")), StyledString.QUALIFIER_STYLER); + label.append(" " + Tags.print(tags), StyledString.QUALIFIER_STYLER); } IconBuilder ib = Icons.builder(repo.getIcon()); diff --git a/docs/_instructions/runrepos.md b/docs/_instructions/runrepos.md index 0cbf7a4ed3..38fc8930e6 100644 --- a/docs/_instructions/runrepos.md +++ b/docs/_instructions/runrepos.md @@ -65,7 +65,7 @@ For example the following repository definition in `/cnf/build.bnd` would be exc ``` aQute.bnd.repository.maven.provider.MavenBndRepository;\ - tags = "<>"; \ + tags = "<>"; \ name="Maven Central";\ releaseUrl="${mavencentral}";\ snapshotUrl="${ossrh}";\ @@ -73,6 +73,6 @@ aQute.bnd.repository.maven.provider.MavenBndRepository;\ readOnly=true,\ ``` -because it has a `<>` tag (and thus no `resolve` tag). +because it has a `<>` tag (and thus no `resolve` tag). An example use case is exclude the baseline-repository from resolution. In the case, you would not add the `resolve` tag to the baseline-repo, and then it won't be considered for resolution in a `.bndrun`. \ No newline at end of file diff --git a/docs/_plugins/filerepo.md b/docs/_plugins/filerepo.md index 4c35cfb471..4aefd83516 100644 --- a/docs/_plugins/filerepo.md +++ b/docs/_plugins/filerepo.md @@ -14,7 +14,7 @@ The following properties are supported: |`location` | The local filesystem directory. | Yes. | |`readonly` |Whether the repository should be read-only,| No. Default: false | | |i.e. disabled for editing from Bndtools.| | -| `tags` | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| No +| `tags` | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<EMPTY>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| No ## Tagging diff --git a/docs/_plugins/localindexrepo.md b/docs/_plugins/localindexrepo.md index b2cee5cead..164f3f9c1d 100644 --- a/docs/_plugins/localindexrepo.md +++ b/docs/_plugins/localindexrepo.md @@ -26,7 +26,7 @@ Merging the information from both tables into one, we get the following comprehe | `timeout` | `integer` | | If there is a cached file, then just use it if the cached file is within the `timeout` period OR `online` is `false`. | | | `online` | `BOOLEAN` | `true` | Specifies if this repository is online. If `false` then cached resources are used. | | | `type` | `STRING` | `R5` | The type (format) of index to generate. See _Note 1_ below. | No. | -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. | No +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<EMPTY>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. | No **Note 1**: The index is generated by default in R5 format. To request alternative format(s), specify a list of format names separated by the "|" (pipe) character. For example, to generate both R5 and OBR formats specify `type=R5|OBR`. diff --git a/docs/_plugins/maven.md b/docs/_plugins/maven.md index 895d9d3867..b2763fb7d4 100644 --- a/docs/_plugins/maven.md +++ b/docs/_plugins/maven.md @@ -87,7 +87,7 @@ The class name of the plugin is `aQute.bnd.repository.maven.provider.MavenBndRep | `readOnly` | `true|false` | `false` | If set to _truthy_ then this repository is read only.| | `name` | `NAME`| `Maven` | The name of the repository.| | `index` | `PATH`| `cnf/.mvn` | The path to the _index_ file. The index file is a list of Maven _coordinates_.| -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<EMPTY>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| | `source` | `STRING`| `org.osgi:org.osgi.service.log:1.3.0 org.osgi:org.osgi.service.log:1.2.0` | A space, comma, semicolon, or newline separated GAV string. | | `noupdateOnRelease` | `true|false` | `false` | If set to _truthy_ then this repository will not update the `index` when a non-snapshot artifact is released.| | `poll.time` | `integer` | 5 seconds | Number of seconds between checks for changes to the `index` file. If the value is negative or the workspace is in batch/CI mode, then no polling takes place.| diff --git a/docs/_plugins/osgirepo.md b/docs/_plugins/osgirepo.md index 5dc3f57298..41c740839b 100644 --- a/docs/_plugins/osgirepo.md +++ b/docs/_plugins/osgirepo.md @@ -17,7 +17,7 @@ The class name of the plugin is `aQute.bnd.repository.osgi.OSGiRepository`. It c | `cache` | `STRING`| The workspace cache folder | The location, the downloaded bundles are stored. | | `max.stale` | `integer` | one year | Bnd has it's own download cache. `max.stale` configures for how many _seconds_ the downloaded index file stays in the internal download cache. Use _-1_ to always check if there is a newer file on the server. | | `poll.time` | `integer` | 5 seconds | Number of seconds between checks for polls on the `index` file. If the value is negative or the workspace is in batch/CI mode, then no polling takes place. | -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<EMPTY>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. ## Example diff --git a/docs/_plugins/p2repo.md b/docs/_plugins/p2repo.md index 88e14c7f10..0f522f8ac8 100644 --- a/docs/_plugins/p2repo.md +++ b/docs/_plugins/p2repo.md @@ -19,7 +19,7 @@ It can take the following configuration properties: | `name` | `NAME` | p2 + `url` | The name of the repository. | | `url` | `URI` | | The URL to either the P2 repository (a directory) or an Eclipse target platform definition file. | | `location` | `STRING` | | The location to store the _index_ file and where bundles will be downloaded to. | -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<EMPTY>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction.| ## Example diff --git a/docs/_plugins/pomrepo.md b/docs/_plugins/pomrepo.md index b2b547624b..04a71f9c68 100644 --- a/docs/_plugins/pomrepo.md +++ b/docs/_plugins/pomrepo.md @@ -69,7 +69,7 @@ The query must return a JSON response. | `transitive` | `true|false` | `true` | If set to _truthy_ then dependencies are transitive.| | `poll.time` | `integer`| 5 minutes | Number of seconds between checks for changes to POM files referenced by `pom` or `revision`. If the value is negative or the workspace is in batch/CI mode, then no polling takes place.| | `dependencyManagement` | `boolean`| false | If set to `true`, dependencies in the `dependencyManagement` section will be handled as actual dependencies.| -| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<NO_RESOLVE>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. +| `tags` | `STRING`| | Comma separated list of tags. (e.g. resolve, baseline, release) Use a placeholder like <<EMPTY>> to exclude the repo from resolution. The `resolve` tag is picked up by the [-runrepos](/instructions/runrepos.html) instruction. One, and only one, of the `pom`, `revision`, or `query` configurations can be set. If multiple are set then the first in `[pom, revision, query]` is used and the remainders are ignored. From cc84d3ef371812ce08ce0a3566b433c51eded0ae Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Thu, 4 Jul 2024 09:42:43 +0200 Subject: [PATCH 4/4] wording of tooltip Signed-off-by: Christoph Rueger --- bndtools.core/_plugin.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bndtools.core/_plugin.xml b/bndtools.core/_plugin.xml index 9f40443b19..3a80b90d88 100644 --- a/bndtools.core/_plugin.xml +++ b/bndtools.core/_plugin.xml @@ -839,7 +839,7 @@ helpUrl="https://bnd.bndtools.org/plugins/filerepo.html"> - + @@ -850,7 +850,7 @@ helpUrl="https://bnd.bndtools.org/plugins/osgirepo.html"> - + - + - + @@ -922,7 +922,7 @@ name="P2Repository" helpUrl="https://bnd.bndtools.org/plugins/p2repo.html"> - + @@ -932,7 +932,7 @@ name="Maven POM Repository" helpUrl="https://bnd.bndtools.org/plugins/pomrepo.html"> - +