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

jetty 12.0.x merge from 11.0.x #10395

Merged
merged 18 commits into from
Aug 24, 2023
+4 −4
Merged

jetty 12.0.x merge from 11.0.x #10395

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
21a16bd
Bump org.asciidoctor:asciidoctorj-diagram from 2.2.10 to 2.2.11
dependabot[bot] Aug 23, 2023
79c697f
Merge pull request #10366 from eclipse/dependabot/maven/jetty-10.0.x/…
dependabot[bot] Aug 24, 2023
1a094b9
Bump org.testcontainers:testcontainers-bom from 1.18.3 to 1.19.0
dependabot[bot] Aug 24, 2023
9c3ac43
Merge branch 'jetty-10.0.x' into jetty-11.0.x
olamy Aug 24, 2023
9ca9695
Merge pull request #10376 from eclipse/dependabot/maven/jetty-10.0.x/…
dependabot[bot] Aug 24, 2023
91eb1a4
Bump ant.version from 1.10.13 to 1.10.14
dependabot[bot] Aug 24, 2023
7b35e50
Merge branch 'jetty-10.0.x' into jetty-11.0.x
olamy Aug 24, 2023
ce0efe2
Merge pull request #10370 from eclipse/dependabot/maven/jetty-10.0.x/…
dependabot[bot] Aug 24, 2023
4d56e7d
Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.3.0 to 3.4.0
dependabot[bot] Aug 24, 2023
8b6f5a9
Merge branch 'jetty-10.0.x' into jetty-11.0.x
olamy Aug 24, 2023
56d8b1d
Merge pull request #10373 from eclipse/dependabot/maven/jetty-10.0.x/…
dependabot[bot] Aug 24, 2023
4592f77
Bump org.eclipse.tycho:tycho-p2-repository-plugin from 4.0.1 to 4.0.2
dependabot[bot] Aug 24, 2023
f691d20
Merge pull request #10375 from eclipse/dependabot/maven/jetty-10.0.x/…
dependabot[bot] Aug 24, 2023
c40989d
Bump org.jboss.logmanager:jboss-logmanager
dependabot[bot] Aug 24, 2023
6588cc8
Merge branch 'jetty-10.0.x' into jetty-11.0.x
olamy Aug 24, 2023
e4c8722
Merge pull request #10379 from eclipse/dependabot/maven/jetty-10.0.x/…
dependabot[bot] Aug 24, 2023
1309c65
Merge branch 'jetty-10.0.x' into jetty-11.0.x
olamy Aug 24, 2023
b90cc16
Merge branch 'jetty-11.0.x' into jetty-12.0.x-merge-from-11.0.x
olamy Aug 24, 2023
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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@

<!-- dependency versions -->
<alpn.agent.version>2.0.10</alpn.agent.version>
<ant.version>1.10.13</ant.version>
<ant.version>1.10.14</ant.version>
<apache.avro.version>1.11.2</apache.avro.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
<apache.httpcore.version>4.4.16</apache.httpcore.version>
<asciidoctorj-diagram.version>2.2.9</asciidoctorj-diagram.version>
<asciidoctorj-diagram.version>2.2.11</asciidoctorj-diagram.version>
sbordet marked this conversation as resolved.
Show resolved Hide resolved
<asciidoctorj.version>2.5.10</asciidoctorj.version>
<mina.core.version>2.2.2</mina.core.version>
<asm.version>9.5</asm.version>
Expand Down Expand Up @@ -87,7 +87,7 @@
<jboss.logging.annotations.version>2.2.1.Final</jboss.logging.annotations.version>
<jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<jboss-logmanager.version>3.0.1.Final</jboss-logmanager.version>
<jboss-logmanager.version>3.0.2.Final</jboss-logmanager.version>
<jboss-threads.version>3.5.0.Final</jboss-threads.version>
<jetty-assembly-descriptors.version>1.1</jetty-assembly-descriptors.version>
<jetty.perf-helper.version>1.0.7</jetty.perf-helper.version>
Expand Down Expand Up @@ -168,7 +168,7 @@
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.6.0</maven.dependency.plugin.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<maven.enforcer.plugin.version>3.3.0</maven.enforcer.plugin.version>
<maven.enforcer.plugin.version>3.4.0</maven.enforcer.plugin.version>
<maven.exec.plugin.version>3.1.0</maven.exec.plugin.version>
<maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
<maven.install.plugin.version>3.1.1</maven.install.plugin.version>
Expand Down