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.

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

Update main #301

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ USER 1001
# Stage 2: Place application on a liberty server
# TODO: Invest in using a kernel build and use the feature manager to install
# needed Liberty features
FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi
FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi

ARG VERSION=1.0
ARG REVISION=SNAPSHOT
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
<version>1.26.0</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
Expand Down Expand Up @@ -114,7 +114,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.11.1</version>
<version>3.11.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gradle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'war'
id 'io.openliberty.tools.gradle.Liberty' version '3.9.1'
id 'io.openliberty.tools.gradle.Liberty' version '3.9.2'
}

version '1.0-SNAPSHOT'
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.11.1</version>
<version>3.11.2</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.List;
import java.util.Map;

import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;

public class MockZipOutputStream extends ZipArchiveOutputStream {
Expand All @@ -34,7 +34,7 @@ public MockZipOutputStream() {
}

@Override
public void putArchiveEntry(ArchiveEntry e) {
public void putArchiveEntry(ZipArchiveEntry e) {
String name = e.getName();
fileNames.add(name);
if (filesToCapture.contains(name)) {
Expand Down
Loading