Skip to content

Commit

Permalink
Merge branch 'jetty-10.0.x' into jetty-11.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
olamy committed Sep 8, 2021
2 parents 9ebda80 + 97f62e4 commit 8f7ce84
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 2 deletions.
66 changes: 66 additions & 0 deletions .github/dependabot.yml
@@ -0,0 +1,66 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "maven"
directory: "/"
target-branch: "jetty-9.4.x"
schedule:
interval: "weekly"
ignore:
# Restrict updates in this branch to jetty in the 9.4.x space
- dependency-name: "javax.servlet:*"
versions: [ ">=4.0.0" ]
- dependency-name: "javax.activation:*"
versions: [ ">=1.3.0" ]
- dependency-name: "javax.annotation:*"
versions: [ ">=2.0.0" ]
- dependency-name: "javax.el:*"
versions: [ ">=4.0.0" ]
- dependency-name: "javax.inject:*"
versions: [ ">=2.0.0" ]
- dependency-name: "javax.websocket:*"
versions: [ ">=1.1.0" ]

- package-ecosystem: "maven"
directory: "/"
target-branch: "jetty-10.0.x"
schedule:
interval: "weekly"
ignore:
# Restrict updates in this branch to jetty in the 10.x.x space
- dependency-name: "jakarta.servlet:*"
versions: [ ">=5.0.0" ]
- dependency-name: "jakarta.activation:*"
versions: [ ">=2.0.0" ]
- dependency-name: "jakarta.annotation:*"
versions: [ ">=2.0.0" ]
- dependency-name: "jakarta.el:*"
versions: [ ">=4.0.0" ]
- dependency-name: "jakarta.inject:*"
versions: [ ">=2.0.0" ]
- dependency-name: "jakarta.websocket:*"
versions: [ ">=2.0.0" ]

- package-ecosystem: "maven"
directory: "/"
target-branch: "jetty-11.0.x"
schedule:
interval: "weekly"
ignore:
# Restrict updates in this branch to jetty in the 11.x.x space
- dependency-name: "jakarta.servlet:*"
versions: [ ">=6.0.0" ]
- dependency-name: "jakarta.activation:*"
versions: [ ">=2.1.0" ]
- dependency-name: "jakarta.annotation:*"
versions: [ ">=3.0.0" ]
- dependency-name: "jakarta.el:*"
versions: [ ">=5.0.0" ]
- dependency-name: "jakarta.inject:*"
versions: [ ">=3.0.0" ]
- dependency-name: "jakarta.websocket:*"
versions: [ ">=3.0.0" ]
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -995,7 +995,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>h2spec-maven-plugin</artifactId>
<version>1.0.6</version>
<version>1.0.7</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -1255,7 +1255,7 @@
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-constants</artifactId>
<version>0.10.0</version>
<version>0.10.2</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
Expand Down

0 comments on commit 8f7ce84

Please sign in to comment.