Commit Graph

3751 Commits

Author SHA1 Message Date
Joakim Erdfelt 8368deea7e
Issue #11263 - Reduce usage of glob lib/foo/*.jar in modules (#11264)
* Using @foo.version@ technique and proper
  lib lists to allow arbitrary version
  updates from properties
* Fix spotless
* Remove duplicate entries
* Only replace System property "jetty.version" with manifest-ver if blank/null
* Fixing bad module definitions
2024-01-16 10:46:58 -06:00
Joakim Erdfelt 540280381d
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2024-01-15 06:37:38 -06:00
dependabot[bot] 9abb524ce9
Bump org.eclipse.jetty.toolchain:jetty-test-helper from 6.0 to 6.2 (#11103)
* Bump org.eclipse.jetty.toolchain:jetty-test-helper from 6.0 to 6.2

Bumps [org.eclipse.jetty.toolchain:jetty-test-helper](https://github.com/eclipse/jetty.toolchain) from 6.0 to 6.2.
- [Commits](https://github.com/eclipse/jetty.toolchain/compare/jetty-test-helper-6.0...jetty-test-helper-6.2)

---
updated-dependencies:
- dependency-name: org.eclipse.jetty.toolchain:jetty-test-helper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-10 08:38:49 -06:00
Joakim Erdfelt 724c29613c
Merge pull request #11247 from jetty/dependabot/maven/jetty-11.0.x/com.diffplug.spotless-spotless-maven-plugin-2.41.1
Bump com.diffplug.spotless:spotless-maven-plugin from 2.39.0 to 2.41.1
2024-01-09 11:45:43 -06:00
dependabot[bot] a62069da3b
Bump com.diffplug.spotless:spotless-maven-plugin from 2.39.0 to 2.41.1
Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.39.0 to 2.41.1.
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/lib/2.39.0...maven/2.41.1)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 16:37:11 +00:00
dependabot[bot] 83bf4195f3
Bump google.errorprone.version from 2.24.0 to 2.24.1
Bumps `google.errorprone.version` from 2.24.0 to 2.24.1.

Updates `com.google.errorprone:error_prone_annotations` from 2.24.0 to 2.24.1
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.24.0...v2.24.1)

Updates `com.google.errorprone:error_prone_core` from 2.24.0 to 2.24.1
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.24.0...v2.24.1)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.errorprone:error_prone_core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 16:35:36 +00:00
Joakim Erdfelt 1f03b3e649
Remove duplicate `<dependency>` declarations 2024-01-03 11:14:47 -06:00
Joakim Erdfelt 71778c25f9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2024-01-03 10:49:54 -06:00
Joakim Erdfelt ee0e1d47fe
Prevent rogue slf4j-impl coming from wildfly-elytron-2.2.2.Final.jar
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-03 10:41:38 -06:00
Joakim Erdfelt c557c2de70
Excluding older javax.annotations 2024-01-03 10:41:30 -06:00
Joakim Erdfelt af14a65e4c
Results of: mvn spotless:apply (for sortModules) 2024-01-03 10:41:20 -06:00
Joakim Erdfelt 847e1f782d
Cleanup of top level pom comments 2024-01-03 10:40:53 -06:00
Joakim Erdfelt 2f3c9257d1
Results of: mvn spotless:apply 2024-01-03 10:40:38 -06:00
Joakim Erdfelt d2e4b5d7d9
Adding spotless-maven-plugin config 2024-01-03 10:39:59 -06:00
Joakim Erdfelt 36a80b9622
Prevent rogue slf4j-impl coming from wildfly-elytron-2.2.2.Final.jar
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-03 08:06:54 -06:00
Joakim Erdfelt 85bc00725b
Excluding older javax.annotations 2024-01-03 04:59:28 -06:00
Joakim Erdfelt 35daa51ef5
Merge remote-tracking branch 'origin/jetty-10.0.x' into fix/10.0.x/add-spotless-plugin 2024-01-03 03:18:51 -06:00
Joakim Erdfelt 204b293d62
Results of: mvn spotless:apply (for sortModules) 2024-01-03 03:16:02 -06:00
Joakim Erdfelt e9373bf505
Cleanup of top level pom comments 2024-01-03 03:15:42 -06:00
Joakim Erdfelt 9a18dc8722
Results of: mvn spotless:apply 2024-01-03 03:12:56 -06:00
Joakim Erdfelt 7bb8c2c6f9
Adding spotless-maven-plugin config 2024-01-03 03:08:01 -06:00
Joakim Erdfelt 8770cc15ea Do not use ${user.home} for unixdomain.dir
(it causes an OOM for the huge file list it produces)
2024-01-02 15:10:49 -06:00
Simone Bordet 8d3ea3b8b1
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-01-02 19:44:16 +01:00
Joakim Erdfelt 3910b09ba6
Cleaning up top level dependencies.
* Removing dependencies that belong to ee#
  specific environments.
* Removing references to dependencies that
  do not exist anymore.
* Removing exclusions that are no longer
  relevant.
2024-01-02 11:42:57 -06:00
Joakim Erdfelt e36e12408c
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2024-01-02 10:39:25 -06:00
Joakim Erdfelt c758ecdd2e
Merge pull request #11207 from jetty/dependabot/maven/jetty-10.0.x/biz.aQute.bnd-biz.aQute.bndlib-6.4.1
Bump biz.aQute.bnd:biz.aQute.bndlib from 6.3.1 to 6.4.1
2024-01-02 08:26:16 -06:00
Joakim Erdfelt 727affb9fb
Revert "Bump com.hazelcast:hazelcast from 5.2.1 to 5.3.6"
This reverts commit 85695867

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-01 17:05:36 -06:00
dependabot[bot] 36f2533cd2
Bump org.mortbay.jetty:h2spec-maven-plugin from 1.0.10 to 1.0.11
Bumps [org.mortbay.jetty:h2spec-maven-plugin](https://github.com/jetty-project/h2spec-maven-plugin) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/jetty-project/h2spec-maven-plugin/releases)
- [Commits](https://github.com/jetty-project/h2spec-maven-plugin/compare/h2spec-maven-plugin-1.0.10...h2spec-maven-plugin-1.0.11)

---
updated-dependencies:
- dependency-name: org.mortbay.jetty:h2spec-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 22:04:31 +00:00
Joakim Erdfelt fa8af2f9ad
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2024-01-01 16:03:04 -06:00
dependabot[bot] 4802604792
Bump biz.aQute.bnd:biz.aQute.bndlib from 6.3.1 to 6.4.1
Bumps [biz.aQute.bnd:biz.aQute.bndlib](https://github.com/bndtools/bnd) from 6.3.1 to 6.4.1.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/compare/6.3.1...6.4.1)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd:biz.aQute.bndlib
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 21:38:39 +00:00
Joakim Erdfelt 467064f385
Revert "Bump biz.aQute.bnd:biz.aQute.bndlib from 6.3.1 to 7.0.0"
This reverts commit dc916c0ec0.
2024-01-01 12:16:10 -06:00
Joakim Erdfelt ddda2e5682
Revert "Bump jakarta.xml.ws:jakarta.xml.ws-api from 2.3.3 to 4.0.1"
This reverts commit edc9e582

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-01 12:11:38 -06:00
Joakim Erdfelt 5f27f4462d
Revert "Bump com.google.inject:guice from 5.1.0 to 7.0.0"
This reverts commit 0d7807f9

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-01-01 12:00:48 -06:00
Joakim Erdfelt fb36831f71
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.osgi-org.osgi.util.promise-1.3.0' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:33:38 -06:00
Joakim Erdfelt 7a71666482
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.mongodb-mongo-java-driver-3.12.14' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:33:16 -06:00
Joakim Erdfelt 930aa8c577
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.mariadb.jdbc-mariadb-java-client-3.3.2' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:33:13 -06:00
Joakim Erdfelt 5a3a6fed7c
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.junit-junit-bom-5.10.1' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:32:59 -06:00
Joakim Erdfelt 805df6f552
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.jolokia-jolokia-war-1.7.2' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:32:56 -06:00
Joakim Erdfelt c72d73e912
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.jboss.logmanager-jboss-logmanager-3.0.4.Final' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:32:38 -06:00
Joakim Erdfelt bef7ffb12f
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.jacoco-jacoco-maven-plugin-0.8.11' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:32:35 -06:00
Joakim Erdfelt 755b20d198
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.glassfish.jaxb-jaxb-runtime-2.3.9' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:32:31 -06:00
Joakim Erdfelt b1472f1efe
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.plexus-plexus-xml-4.0.3' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:31:44 -06:00
Joakim Erdfelt 0edb1ee20d
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.plexus-plexus-component-annotations-2.2.0' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:31:41 -06:00
Joakim Erdfelt 17424acc19
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.mojo-versions-maven-plugin-2.16.2' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:31:37 -06:00
Joakim Erdfelt 6421096884
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.mojo-flatten-maven-plugin-1.5.0' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:31:20 -06:00
Joakim Erdfelt 6febfda405
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.codehaus.mojo-build-helper-maven-plugin-3.5.0' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:31:15 -06:00
Joakim Erdfelt 3e18d06ce3
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.asciidoctor-asciidoctorj-diagram-2.2.14' into fix/10.0.x/dependency-rollup-2024-jan
# Conflicts:
#	pom.xml
2024-01-01 11:31:12 -06:00
Joakim Erdfelt f4fe9717ff
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.asciidoctor-asciidoctorj-2.5.11' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:30:54 -06:00
Joakim Erdfelt a5dec15b8f
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-javadoc-plugin-3.6.3' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:30:51 -06:00
Joakim Erdfelt b1dc95f5a9
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-compiler-plugin-3.12.1' into fix/10.0.x/dependency-rollup-2024-jan 2024-01-01 11:30:47 -06:00