Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 33 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,34 @@
version: 2

updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 5
labels:
- "Dependencies"
- "Java"
reviewers:
- frankframework/maintainers
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
- dependency-name: "org.ibissource:ibis-ladybug"
- dependency-name: "com.aspose:*"
- dependency-name: "com.sap.jco3:sapidoc"
- dependency-name: "org.frankframework:frankframework-ear"
- dependency-name: "org.filesys:jfileserver-enterprise"
- dependency-name: "org.eclipse.m2e:lifecycle-mapping"

- package-ecosystem: "npm"
directory: "/console/frontend/src/main/frontend"
schedule:
interval: "daily"
labels:
- "Dependencies"
- "JavaScript"
reviewers:
- frankframework/maintainers
ignore:
- dependency-name: "org.ibissource:ibis-ladybug"
- dependency-name: "com.aspose:*"
Expand All @@ -21,7 +43,10 @@ updates:
labels:
- "Dependencies"
- "Backport"
- "Java"
- "7.8"
reviewers:
- frankframework/maintainers
target-branch: "7.8-release"
ignore:
- dependency-name: "org.ibissource:ibis-ladybug"
Expand All @@ -43,7 +68,10 @@ updates:
labels:
- "Dependencies"
- "Backport"
- "Java"
- "7.9"
reviewers:
- frankframework/maintainers
target-branch: "7.9-release"
ignore:
- dependency-name: "org.ibissource:ibis-ladybug"
Expand All @@ -58,10 +86,12 @@ updates:
# End of versions not available for JDK 8

- package-ecosystem: "docker"
directory: "/docker"
directories:
- "/docker/**/*"
schedule:
interval: "daily"
open-pull-requests-limit: 5
labels:
- "Dependencies"
- "Docker"
reviewers:
- frankframework/maintainers
3 changes: 1 addition & 2 deletions docker/Tomcat/webapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG TOMCAT_VERSION=10.1.28-jre21
FROM tomcat:${TOMCAT_VERSION}
FROM tomcat:10.1.28-jre21
ARG GID=2000
ARG UID=2000

Expand Down
3 changes: 1 addition & 2 deletions docker/WildFly/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG WILDFLY_VERSION=33.0.0.Final-jdk21
FROM quay.io/wildfly/wildfly:${WILDFLY_VERSION}
FROM quay.io/wildfly/wildfly:33.0.0.Final-jdk21

COPY target/dependencies/secrets/ /opt/frank/secrets/
# use * when copying into existing folders
Expand Down
2 changes: 1 addition & 1 deletion docker/embedded/console/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:21-jre-alpine
FROM eclipse-temurin:21.0.5_11-jre-alpine

COPY target/frankframework-console-webapp.war /app/frankframework-console-webapp.war

Expand Down
2 changes: 1 addition & 1 deletion docker/nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: ''

services:
nginx:
image: nginx
image: nginx:1.27.2
ports:
- "80:80"
- "443:443"
Expand Down
2 changes: 1 addition & 1 deletion messaging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mq.allclient</artifactId>
<version>9.4.0.5</version>
<version>9.4.1.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down