Commit Graph

2869 Commits

Author SHA1 Message Date
Jan Bartel b521fc4e7e Merge remote-tracking branch 'origin/jetty-12.0.x-enable-distribution-tests-rebase' into jetty-12.0.x 2022-07-09 16:08:36 +10:00
Joakim Erdfelt 1031bf1374
Restore stage separated Jenkinsfile (#8272)
* Restore stage separated Jenkinsfile

* add -Dmaven.test.failure.ignore=true

* change -f jetty-home to -pl :jetty-home

* update script ci.sh with -pl :jetty-home

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-08 19:06:04 +10:00
Greg Wilkins 33487b5fd8 reenable ee9 distribution tests
Signed-off-by: Jan Bartel <janb@webtide.com>
2022-07-08 09:51:29 +10:00
Greg Wilkins fe83ea87dc Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-04 11:32:33 +10:00
dependabot[bot] ecbeceeca0
Bump jakarta.annotation-api from 2.1.0 to 2.1.1 (#8249)
Bumps [jakarta.annotation-api](https://github.com/eclipse-ee4j/common-annotations-api) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/eclipse-ee4j/common-annotations-api/releases)
- [Commits](https://github.com/eclipse-ee4j/common-annotations-api/compare/2.1.0...2.1.1)

---
updated-dependencies:
- dependency-name: jakarta.annotation:jakarta.annotation-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-03 07:08:01 -05:00
dependabot[bot] c65438d2f3
Merge pull request #8239 from eclipse/dependabot/maven/jetty-11.0.x/com.puppycrawl.tools-checkstyle-10.3.1 2022-07-02 10:41:51 +00:00
dependabot[bot] b4de79c0fc
Merge pull request #8240 from eclipse/dependabot/maven/jetty-11.0.x/org.mariadb.jdbc-mariadb-java-client-3.0.6 2022-07-02 07:47:51 +00:00
Joakim Erdfelt 26c44f4033
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-01 16:25:50 -05:00
dependabot[bot] cb3c50ffa6
Merge pull request #8248 from eclipse/dependabot/maven/jetty-11.0.x/org.apache.maven.plugins-maven-enforcer-plugin-3.1.0 2022-07-01 09:29:16 +00:00
dependabot[bot] 2ab437bfad
Merge pull request #8243 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-enforcer-plugin-3.1.0 2022-07-01 09:26:46 +00:00
dependabot[bot] 417d5c5064
Merge pull request #8231 from eclipse/dependabot/maven/jetty-10.0.x/maven.version-3.8.6 2022-07-01 05:40:49 +00:00
dependabot[bot] 629ae05e65
Merge pull request #8234 from eclipse/dependabot/maven/jetty-10.0.x/org.testcontainers-testcontainers-bom-1.17.3 2022-07-01 05:39:15 +00:00
dependabot[bot] 91a3d53c08
Bump maven-enforcer-plugin from 3.0.0 to 3.1.0
Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0...enforcer-3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:07:55 +00:00
dependabot[bot] c8f8e6fcc7
Bump maven.version from 3.8.4 to 3.8.6
Bumps `maven.version` from 3.8.4 to 3.8.6.

Updates `maven-artifact` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-core` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-model` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-plugin-api` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-resolver-provider` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-settings` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-model
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-plugin-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-resolver-provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-settings
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:06:48 +00:00
dependabot[bot] 57548cd6c1
Bump maven-enforcer-plugin from 3.0.0 to 3.1.0
Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0...enforcer-3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:06:30 +00:00
dependabot[bot] 465d0cc2ed
Bump mariadb-java-client from 3.0.5 to 3.0.6
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.0.5 to 3.0.6.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.0.5...3.0.6)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:05:56 +00:00
dependabot[bot] 587bd67158
Bump checkstyle from 10.3 to 10.3.1
Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.3 to 10.3.1.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.3...checkstyle-10.3.1)

---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:05:49 +00:00
dependabot[bot] 2ffac3daf1
Bump testcontainers-bom from 1.17.2 to 1.17.3
Bumps [testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.17.2 to 1.17.3.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.2...1.17.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:05:06 +00:00
dependabot[bot] 79c30effc0
Bump maven.version from 3.8.4 to 3.8.6
Bumps `maven.version` from 3.8.4 to 3.8.6.

Updates `maven-artifact` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-core` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-model` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-plugin-api` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-resolver-provider` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

Updates `maven-settings` from 3.8.4 to 3.8.6
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.8.6)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-model
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-plugin-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-resolver-provider
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-settings
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:04:34 +00:00
dependabot[bot] 5974f74129
Bump jna-jpms from 5.11.0 to 5.12.1
Bumps [jna-jpms](https://github.com/java-native-access/jna) from 5.11.0 to 5.12.1.
- [Release notes](https://github.com/java-native-access/jna/releases)
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.11.0...5.12.1)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna-jpms
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:03:45 +00:00
Jan Bartel 5703fe5890 Include jetty-ee8 in build 2022-07-01 11:40:41 +10:00
Joakim Erdfelt 25d867f362
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-30 07:03:32 -05:00
Olivier Lamy db9eb08148
add jetty-osgi dependency to jetty-p2 to be sure it is included (#8034)
* add jetty-osgi dependency to jetty-p2 to be sure it is included

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-30 07:03:20 -05:00
Greg Wilkins ea5bedf072
Jetty 12.0.x deployment (#8208)
Deploy webapps for different environments from the same webapps directory.
The maximal environment known to the AppProviders is used as the default environment.
An explicit environment can be set in a properties file for an application, which is also used for property substitution in any context xml file.
2022-06-30 09:51:19 +10:00
Joakim Erdfelt d9e157b82f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-25 20:01:01 -05:00
Tamas Cservenak fb4c6228c1
Drop MAT (#8182)
* Drop MAT

As Maven 3.0 is not being supported, no need for artifical indirection
between sonatype/eclipse package for resolver.

* Drop unused property

* Stabilize dependencies

Declare all the used deps, as MAT is removed, and usage
has changed to resolver API (so declare it).

Plexus Utils is used as well, so declare it explicitly.
2022-06-25 20:00:11 -05:00
Joakim Erdfelt eddff4d2ee
Merge Release 11.0.11 back into `jetty-11.0.x` (#8193)
* Updating to version 11.0.11

* Updating to version 11.0.12-SNAPSHOT
2022-06-22 16:24:57 -05:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194)
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
2022-06-22 16:24:48 -05:00
Jan Bartel 9893c81abf
Jetty 12.0.x update jakarta api versions (#8192)
* update to latest jakarta official releases
2022-06-22 10:32:54 +10:00
Joakim Erdfelt a3616cad80
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-21 15:27:24 -05:00
Tamas Cservenak 3fabe540a5
Fix test-distribution classpath re resolver (#8187)
* Fix test-distribution classpath re resolver

As currently it seems mixed versions of resolver artifacts are
present on classpath. Resolver 1.8.0 introduces a binary
breakage.

Anyway, this fixes the thing, as impl was actually coming in
as transitive dep of maven-resolver-provider, that is NOT
the same version as the rest of resolver dependencies.

Relying on transitive while fixing other versions is wrong.

* Update to resolver 1.8.1

And add exclusion to banned dependency, that is used when
running in SISU container.
2022-06-21 15:27:06 -05:00
Joakim Erdfelt 8149350c10
Merge Release 11.0.10 back into `jetty-11.0.x` (#8181)
* Updating to version 11.0.11-SNAPSHOT
2022-06-21 14:45:00 +02:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180)
* Updating to version 10.0.11-SNAPSHOT
2022-06-21 14:41:41 +02:00
Jan Bartel eccbfce6dd Rename infinspan-xxx to jetty-infinispan-xxx 2022-06-16 16:31:42 +10:00
Joakim Erdfelt d1e5ffa4d9
Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-06-09 09:04:44 -05:00
Joakim Erdfelt 69216a5e3d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-08 12:46:30 -05:00
dependabot[bot] 346136ad6c
Bump biz.aQute.bndlib from 6.3.0 to 6.3.1 (#8142)
Bumps [biz.aQute.bndlib](https://github.com/bndtools/bnd) from 6.3.0 to 6.3.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.0...6.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-08 08:06:15 -05:00
Olivier Lamy b52f6182c6 repository.apache.org/content/repositories/snapshots not needed anymore
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-07 13:57:22 +10:00
Olivier Lamy 253dc1e577 Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-06-07 11:18:38 +10:00
Olivier Lamy a6e320c693 use surefire 3.0.0-M7 release
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-07 09:43:18 +10:00
dependabot[bot] a15ef9632b
Merge pull request #8117 from eclipse/dependabot/maven/jetty-11.0.x/io.grpc-grpc-core-1.47.0 2022-06-06 23:36:00 +00:00
dependabot[bot] be27880374
Merge pull request #8116 from eclipse/dependabot/maven/jetty-11.0.x/biz.aQute.bnd-biz.aQute.bndlib-6.3.0 2022-06-06 23:35:40 +00:00
dependabot[bot] 6af44e70eb
Bump org.apache.felix.framework from 7.0.4 to 7.0.5 (#8123)
Bumps org.apache.felix.framework from 7.0.4 to 7.0.5.

---
updated-dependencies:
- dependency-name: org.apache.felix:org.apache.felix.framework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-06 11:49:57 -05:00
dependabot[bot] af696528f5
Bump org.apache.felix.framework from 7.0.4 to 7.0.5
Bumps org.apache.felix.framework from 7.0.4 to 7.0.5.

---
updated-dependencies:
- dependency-name: org.apache.felix:org.apache.felix.framework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 09:25:47 +00:00
dependabot[bot] e74cad2084
Bump grpc-core from 1.46.0 to 1.47.0
Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.46.0 to 1.47.0.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.46.0...v1.47.0)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 09:23:52 +00:00
dependabot[bot] aebdb79953
Bump biz.aQute.bndlib from 6.2.0 to 6.3.0
Bumps [biz.aQute.bndlib](https://github.com/bndtools/bnd) from 6.2.0 to 6.3.0.
- [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.2.0...6.3.0)

---
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>
2022-06-06 09:23:15 +00:00
dependabot[bot] efca12641f
Merge pull request #8099 from eclipse/dependabot/maven/jetty-10.0.x/biz.aQute.bnd-biz.aQute.bndlib-6.3.0 2022-06-03 11:35:08 +00:00
dependabot[bot] 646090c747
Bump grpc-core from 1.46.0 to 1.47.0
Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.46.0 to 1.47.0.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.46.0...v1.47.0)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-02 09:21:59 +00:00
dependabot[bot] e14c1b34f2
Bump biz.aQute.bndlib from 6.2.0 to 6.3.0
Bumps [biz.aQute.bndlib](https://github.com/bndtools/bnd) from 6.2.0 to 6.3.0.
- [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.2.0...6.3.0)

---
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>
2022-06-02 09:21:41 +00:00
Simone Bordet cbeeb67e93
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-06-01 15:18:53 +02:00