From 2f48a5bf34361bbe121c2ca23f51dd9d6f3daeae Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 22 May 2023 17:14:16 +0200 Subject: [PATCH 01/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2e45695f..4541808e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. plexus-utils - 4.0.0 + 4.0.1-SNAPSHOT Plexus Common Utilities A collection of various utility classes to ease working with strings, files, command lines and @@ -33,7 +33,7 @@ limitations under the License. scm:git:https://github.com/codehaus-plexus/plexus-utils.git ${project.scm.connection} - plexus-utils-4.0.0 + master https://github.com/codehaus-plexus/plexus-utils/tree/master/ @@ -48,7 +48,7 @@ limitations under the License. - 2023-05-22T15:13:56Z + 2023-05-22T15:14:16Z From e4c8a1c717bc4704436132d525015f692a90f5b5 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 22 May 2023 17:22:41 +0200 Subject: [PATCH 02/16] Remove unused snapshot repository --- pom.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pom.xml b/pom.xml index 4541808e..ea696b4a 100644 --- a/pom.xml +++ b/pom.xml @@ -66,19 +66,6 @@ limitations under the License. - - - - false - - - true - - oss.snapshots - https://oss.sonatype.org/content/repositories/plexus-snapshots/ - - - From acde33f6762f8637191633e452b6c465a039ae2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 May 2023 02:56:43 +0000 Subject: [PATCH 03/16] Bump junit-jupiter from 5.9.2 to 5.9.3 Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea696b4a..612e3eca 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ limitations under the License. org.junit.jupiter junit-jupiter - 5.9.2 + 5.9.3 test From a9a1632d0505994445297a1522e3e361e7dc7414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sun, 28 May 2023 17:40:49 +0200 Subject: [PATCH 04/16] pom.mxl and site.xml cleanup --- pom.xml | 20 +++----------------- src/site/site.xml | 5 +++++ 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 612e3eca..8e13d904 100644 --- a/pom.xml +++ b/pom.xml @@ -29,16 +29,17 @@ limitations under the License. Plexus Common Utilities A collection of various utility classes to ease working with strings, files, command lines and more. + https://codehaus-plexus.github.io/plexus-utils/ scm:git:https://github.com/codehaus-plexus/plexus-utils.git ${project.scm.connection} master - https://github.com/codehaus-plexus/plexus-utils/tree/master/ + https://github.com/codehaus-plexus/plexus-utils/tree/${project.scm.tag}/ github - http://github.com/codehaus-plexus/plexus-utils/issues + https://github.com/codehaus-plexus/plexus-utils/issues @@ -77,21 +78,6 @@ limitations under the License. - - maven-compiler-plugin - - - default-compile - - compile - - - 1.8 - 1.8 - - - - org.apache.maven.plugins maven-scm-publish-plugin diff --git a/src/site/site.xml b/src/site/site.xml index 38cbad8a..5de0c6cb 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -4,6 +4,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0%20http://maven.apache.org/xsd/decoration-1.0.0.xsd"> + + + + + From b9a32a7500bfef9491e60fc4ae485782fed3c7ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 02:26:15 +0000 Subject: [PATCH 05/16] Bump org.junit.jupiter:junit-jupiter from 5.9.3 to 5.10.0 Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e13d904..64a719f7 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ limitations under the License. org.junit.jupiter junit-jupiter - 5.9.3 + 5.10.0 test From c4f6eae9e42c0533aadd9490da48ab8964ff531d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 02:44:54 +0000 Subject: [PATCH 06/16] Bump org.codehaus.plexus:plexus from 13 to 14 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 13 to 14. - [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases) - [Commits](https://github.com/codehaus-plexus/plexus-pom/commits) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64a719f7..a3069a44 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.codehaus.plexus plexus - 13 + 14 plexus-utils From 26f683a352d538090542018ab3ee03ba2a19ee08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 02:35:08 +0000 Subject: [PATCH 07/16] Bump plexus-xml from 4.0.0 to 4.0.2 Bumps [plexus-xml](https://github.com/codehaus-plexus/plexus-xml) from 4.0.0 to 4.0.2. - [Release notes](https://github.com/codehaus-plexus/plexus-xml/releases) - [Commits](https://github.com/codehaus-plexus/plexus-xml/compare/plexus-xml-4.0.0...plexus-xml-4.0.2) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-xml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a3069a44..08f8d4cc 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ limitations under the License. org.codehaus.plexus plexus-xml - 4.0.0 + 4.0.2 true From b2cf572555a060e6c20ee223fb247c3d1e2139ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sat, 9 Sep 2023 12:23:30 +0200 Subject: [PATCH 08/16] describe optional dependency on plexus-xml --- README.md | 4 +++- src/site/markdown/index.md | 7 +++++++ src/site/site.xml | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/site/markdown/index.md diff --git a/README.md b/README.md index a956a58a..f8c78740 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,6 @@ For publishing [the site](https://codehaus-plexus.github.io/plexus-utils/) do th mvn -Preporting verify site site:stage scm-publish:publish-scm ``` -Starting with version 4, XML classes (in `org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`) have been extracted to a separate [`plexus-xml`](https://github.com/codehaus-plexus/plexus-xml/) 4: if you need them, just use this new artifact. +Starting with version 4, XML classes (in `org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`) have been extracted to a separate [`plexus-xml`](https://github.com/codehaus-plexus/plexus-xml/) library: if you need them, just use this new artifact. + +`plexus-utils` 4 keeps an optional dependency on `plexus-xml` to keep compatibility with the few XML-oriented methods of `ReaderFactory` and `WriterFactory`: these classes are deprecated, you should migrate as explained in javadoc. diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md new file mode 100644 index 00000000..5b8f4a0e --- /dev/null +++ b/src/site/markdown/index.md @@ -0,0 +1,7 @@ +## Plexus Common Utilities + +A collection of various utility classes to ease working with strings, files, command lines and more. + +Starting with version 4, XML classes (in `org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`) have been extracted to a separate [`plexus-xml`](../plexus-xml/) library: if you need them, just use this new artifact. + +`plexus-utils` 4 keeps an optional dependency on `plexus-xml` to keep compatibility with the few XML-oriented methods of [`ReaderFactory`](./apidocs/org/codehaus/plexus/util/ReaderFactory.html) and [`WriterFactory`](./apidocs/org/codehaus/plexus/util/WriterFactory.html): these classes are deprecated, you should migrate as explained in javadoc. diff --git a/src/site/site.xml b/src/site/site.xml index 5de0c6cb..0d5a3d79 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -4,6 +4,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0%20http://maven.apache.org/xsd/decoration-1.0.0.xsd"> + + + From e0106e4bff35cf92b3429871cf69e725a7d71755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Tue, 12 Sep 2023 08:01:40 +0200 Subject: [PATCH 09/16] downgrade plexus-xml from 4 to 3: keep Maven 3 compatibility --- README.md | 2 +- pom.xml | 3 ++- src/site/markdown/index.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f8c78740..8877b7ef 100644 --- a/README.md +++ b/README.md @@ -16,4 +16,4 @@ mvn -Preporting verify site site:stage scm-publish:publish-scm Starting with version 4, XML classes (in `org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`) have been extracted to a separate [`plexus-xml`](https://github.com/codehaus-plexus/plexus-xml/) library: if you need them, just use this new artifact. -`plexus-utils` 4 keeps an optional dependency on `plexus-xml` to keep compatibility with the few XML-oriented methods of `ReaderFactory` and `WriterFactory`: these classes are deprecated, you should migrate as explained in javadoc. +`plexus-utils` 4 keeps an optional dependency on `plexus-xml` 3 to keep compatibility with the few XML-oriented methods of `ReaderFactory` and `WriterFactory`: these classes are deprecated, you should migrate as explained in javadoc. And keep `plexus-xml` to 3 if you want Maven 3 compatibility, as `plexus-xml` 4 works only in Maven 4. diff --git a/pom.xml b/pom.xml index 08f8d4cc..bd8ee8af 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,8 @@ limitations under the License. org.codehaus.plexus plexus-xml - 4.0.2 + 3.0.0 + true diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 5b8f4a0e..d8eff619 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -4,4 +4,4 @@ A collection of various utility classes to ease working with strings, files, com Starting with version 4, XML classes (in `org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`) have been extracted to a separate [`plexus-xml`](../plexus-xml/) library: if you need them, just use this new artifact. -`plexus-utils` 4 keeps an optional dependency on `plexus-xml` to keep compatibility with the few XML-oriented methods of [`ReaderFactory`](./apidocs/org/codehaus/plexus/util/ReaderFactory.html) and [`WriterFactory`](./apidocs/org/codehaus/plexus/util/WriterFactory.html): these classes are deprecated, you should migrate as explained in javadoc. +`plexus-utils` 4 keeps an optional dependency on `plexus-xml` 3 to keep compatibility with the few XML-oriented methods of [`ReaderFactory`](./apidocs/org/codehaus/plexus/util/ReaderFactory.html) and [`WriterFactory`](./apidocs/org/codehaus/plexus/util/WriterFactory.html): these classes are deprecated, you should migrate as explained in javadoc. And keep `plexus-xml` to 3 if you want Maven 3 compatibility, as `plexus-xml` 4 works only in Maven 4.. From 014185bd3799a304e81f1b45a4180def559eafde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 02:31:55 +0000 Subject: [PATCH 10/16] Bump org.codehaus.plexus:plexus from 14 to 15 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 14 to 15. - [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases) - [Commits](https://github.com/codehaus-plexus/plexus-pom/commits) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd8ee8af..bc315988 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.codehaus.plexus plexus - 14 + 15 plexus-utils From d4f0d2de40c5d6cb5d80c8a199fa4f32a4e59879 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Wed, 4 Oct 2023 19:16:45 +0200 Subject: [PATCH 11/16] Cleanup after pom update --- pom.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index bc315988..eb428f10 100644 --- a/pom.xml +++ b/pom.xml @@ -62,22 +62,12 @@ limitations under the License. org.junit.jupiter - junit-jupiter - 5.10.0 + junit-jupiter-api test - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - - org.apache.maven.plugins From c7b6e18e1234c9debf72424e6abcdc2aa7bd6ba7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 02:30:26 +0000 Subject: [PATCH 12/16] Bump org.codehaus.plexus:plexus from 15 to 16 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 15 to 16. - [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases) - [Commits](https://github.com/codehaus-plexus/plexus-pom/commits) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb428f10..04766d72 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.codehaus.plexus plexus - 15 + 16 plexus-utils From 13c1d5108a480cda6dd78c9b259690ac0f47822e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 02:17:58 +0000 Subject: [PATCH 13/16] Bump release-drafter/release-drafter from 5 to 6 Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5 to 6. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](https://github.com/release-drafter/release-drafter/compare/v5...v6) --- updated-dependencies: - dependency-name: release-drafter/release-drafter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 4000f8c4..4c09c8a7 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -7,6 +7,6 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From d44d2ec844fe3e420407936bbda0c015a386b5c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 02:03:41 +0000 Subject: [PATCH 14/16] Bump org.codehaus.plexus:plexus from 16 to 17 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 16 to 17. - [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases) - [Commits](https://github.com/codehaus-plexus/plexus-pom/commits) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04766d72..631f8eaf 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.codehaus.plexus plexus - 16 + 17 plexus-utils From 2f541fdfb253757a1f3beca33d75a86b124f78f5 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 8 Apr 2024 23:09:48 +0200 Subject: [PATCH 15/16] Add .gitignore to default excludes --- src/main/java/org/codehaus/plexus/util/AbstractScanner.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/plexus/util/AbstractScanner.java b/src/main/java/org/codehaus/plexus/util/AbstractScanner.java index a10f43c7..d650c6df 100644 --- a/src/main/java/org/codehaus/plexus/util/AbstractScanner.java +++ b/src/main/java/org/codehaus/plexus/util/AbstractScanner.java @@ -41,7 +41,7 @@ public abstract class AbstractScanner implements Scanner { *
  • Mac: **/.DS_Store
    • *
  • Serena Dimension: **/.metadata, **/.metadata/**
    • *
  • Mercurial: **/.hg, **/.hg/**
    • - *
  • Git: **/.git, **/.git/**
    • + *
  • Git: **/.git, **/.git/**, **/.gitignore
    • *
  • Bitkeeper: **/BitKeeper, **/BitKeeper/**, **/ChangeSet, * **/ChangeSet/**
    • *
  • Darcs: **/_darcs, **/_darcs/**, **/.darcsrepo, @@ -106,6 +106,7 @@ public abstract class AbstractScanner implements Scanner { // git "**/.git", "**/.git/**", + "**/.gitignore", // BitKeeper "**/BitKeeper", From 31ef81812095709ebbfa0e4b707e1c3ad00a51e5 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sat, 13 Apr 2024 11:07:00 +0200 Subject: [PATCH 16/16] [maven-release-plugin] prepare release plexus-utils-4.0.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 631f8eaf..c8904ebb 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. plexus-utils - 4.0.1-SNAPSHOT + 4.0.1 Plexus Common Utilities A collection of various utility classes to ease working with strings, files, command lines and @@ -34,7 +34,7 @@ limitations under the License. scm:git:https://github.com/codehaus-plexus/plexus-utils.git ${project.scm.connection} - master + plexus-utils-4.0.1 https://github.com/codehaus-plexus/plexus-utils/tree/${project.scm.tag}/ @@ -49,7 +49,7 @@ limitations under the License. - 2023-05-22T15:14:16Z + 2024-04-13T09:06:44Z