Skip to content

Commit

Permalink
Merge main into branch
Browse files Browse the repository at this point in the history
  • Loading branch information
cherylking committed Oct 18, 2023
2 parents 420f2a9 + 2a3285e commit 35bd9d6
Show file tree
Hide file tree
Showing 21 changed files with 950 additions and 69 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
RUNTIME: [ol, wlp]
RUNTIME_VERSION: [23.0.0.6, 23.0.0.3]
RUNTIME_VERSION: [23.0.0.6, 23.0.0.9]
java: [17, 11, 8]
exclude:
- java: 8
RUNTIME_VERSION: 23.0.0.3
RUNTIME_VERSION: 23.0.0.6
- java: 17
RUNTIME_VERSION: 23.0.0.3
RUNTIME_VERSION: 23.0.0.6
name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Linux
steps:
# Checkout repos
Expand Down Expand Up @@ -80,13 +80,13 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
RUNTIME: [ol, wlp]
RUNTIME_VERSION: [23.0.0.6, 23.0.0.3]
RUNTIME_VERSION: [23.0.0.6, 23.0.0.9]
java: [17, 11, 8]
exclude:
- java: 8
RUNTIME_VERSION: 23.0.0.3
RUNTIME_VERSION: 23.0.0.6
- java: 17
RUNTIME_VERSION: 23.0.0.3
RUNTIME_VERSION: 23.0.0.6
name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Windows
steps:
# Checkout repos
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The Liberty Maven plugin supports install and operational control of Liberty run

## Build

Use Maven 3.5.0 or later to build the Liberty Maven plugin.
As of version 3.9 of the plugin, you must use Maven 3.8.6 or later to build the Liberty Maven plugin.
We conveniently provide the [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/index.html) script, so you do not need to download maven yourself if you are not using it yet.

* `./mvnw install` : builds the plugin, skipping all tests
Expand All @@ -32,7 +32,7 @@ We conveniently provide the [maven-wrapper](https://maven.apache.org/wrapper/mav

### Liberty Maven Plugin

The Liberty Maven Plugin provides a number of goals for managing a Liberty server and applications. Maven 3.5.0 or later is recommended to use the Liberty Maven Plugin.
The Liberty Maven Plugin provides a number of goals for managing a Liberty server and applications. As of version 3.9 of the plugin, Maven 3.8.6 or later is required to use the Liberty Maven Plugin.

#### Java Support

Expand All @@ -55,7 +55,7 @@ To enable Liberty Maven Plugin in your project add the following to your `pom.xm
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.8.1</version>
<version>3.9</version>
<!-- Specify configuration, executions for liberty-maven-plugin -->
...
</plugin>
Expand Down Expand Up @@ -104,12 +104,12 @@ Example using the `runtimeArtifact` parameter to install a WebSphere Liberty run
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.8.1</version>
<version>3.9</version>
<configuration>
<runtimeArtifact>
<groupId>com.ibm.websphere.appserver.runtime</groupId>
<artifactId>wlp-webProfile8</artifactId>
<version>23.0.0.2</version>
<version>23.0.0.9</version>
<type>zip</type>
</runtimeArtifact>
</configuration>
Expand All @@ -124,12 +124,12 @@ Example using the `runtimeArtifact` parameter to install an Open Liberty beta ru
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.8.1</version>
<version>3.9</version>
<configuration>
<runtimeArtifact>
<groupId>io.openliberty.beta</groupId>
<artifactId>openliberty-runtime</artifactId>
<version>23.0.0.3-beta</version>
<version>23.0.0.10-beta</version>
<type>zip</type>
</runtimeArtifact>
</configuration>
Expand Down Expand Up @@ -238,7 +238,7 @@ Example:
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>[3.8.1,)</version>
<version>3.9</version>
<extensions>true</extensions>
<configuration>
<installDirectory>/opt/ibm/wlp</installDirectory>
Expand Down
82 changes: 49 additions & 33 deletions docs/dev.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/test-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Example:
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>[3.0.1,)</version>
<version>3.9</version>
<extensions>true</extensions>
<configuration>
<skipTestServer>true</skipTestServer>
Expand Down
2 changes: 1 addition & 1 deletion docs/test-stop.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Example:
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>[3.0.1,)</version>
<version>3.9</version>
<extensions>true</extensions>
<configuration>
<skipTestServer>true</skipTestServer>
Expand Down
4 changes: 2 additions & 2 deletions liberty-maven-app-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven</artifactId>
<version>3.8.3-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>

<artifactId>liberty-maven-app-parent</artifactId>
Expand All @@ -44,7 +44,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.8.3-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
<executions>
<execution>
<id>stop-before-clean</id>
Expand Down
10 changes: 7 additions & 3 deletions liberty-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven</artifactId>
<version>3.8.3-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>

<artifactId>liberty-maven-plugin</artifactId>
Expand Down Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-ant-tasks</artifactId>
<version>1.9.13-SNAPSHOT</version>
<version>1.9.13</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>io.openliberty.tools</groupId>
<artifactId>ci.common</artifactId>
<version>1.8.27-SNAPSHOT</version>
<version>1.8.29</version>
</dependency>
<dependency>
<groupId>org.twdata.maven</groupId>
Expand Down Expand Up @@ -224,6 +224,7 @@
<pomExcludes>
<pomExclude>binary-scanner-it/pom.xml</pomExclude>
<pomExclude>springboot-3-tests/pom.xml</pomExclude>
<pomExclude>dev-container-it/pom.xml</pomExclude>
</pomExcludes>
</configuration>
</plugin>
Expand Down Expand Up @@ -264,6 +265,7 @@
<pomExclude>install-features-it/pom.xml</pomExclude>
<pomExclude>binary-scanner-it/pom.xml</pomExclude>
<pomExclude>springboot-3-tests/pom.xml</pomExclude>
<pomExclude>dev-container-it/pom.xml</pomExclude>
</pomExcludes>
</configuration>
</plugin>
Expand Down Expand Up @@ -300,6 +302,7 @@
<configuration>
<pomExcludes>
<pomExclude>dev-it/pom.xml</pomExclude>
<pomExclude>dev-container-it/pom.xml</pomExclude>
<pomExclude>generate-features-it/pom.xml</pomExclude>
<pomExclude>binary-scanner-it/pom.xml</pomExclude>
<pomExclude>springboot-3-tests/pom.xml</pomExclude>
Expand Down Expand Up @@ -337,6 +340,7 @@
<configuration>
<pomExcludes>
<pomExclude>dev-it/pom.xml</pomExclude>
<pomExclude>dev-container-it/pom.xml</pomExclude>
<pomExclude>basic-it/pom.xml</pomExclude>
<pomExclude>assembly-it/pom.xml</pomExclude>
<pomExclude>assembly-with-code-it/pom.xml</pomExclude>
Expand Down
121 changes: 121 additions & 0 deletions liberty-maven-plugin/src/it/dev-container-it/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.openliberty.tools.it</groupId>
<artifactId>dev-container-it</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>@pom.version@</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
<assemblyArtifact>
<groupId>${runtimeGroupId}</groupId>
<artifactId>${runtimeArtifactId}</artifactId>
<version>${runtimeVersion}</version>
<type>zip</type>
</assemblyArtifact>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<forkedProcessTimeoutInSeconds>2400</forkedProcessTimeoutInSeconds>
<argLine>-enableassertions</argLine>
<workingDirectory>${project.build.directory}</workingDirectory>
<includes>
<include>**/*Test.java</include>
</includes>
<systemPropertyVariables>
<mavenPluginVersion>@pom.version@</mavenPluginVersion>
<runtimeVersion>${runtimeVersion}</runtimeVersion>
</systemPropertyVariables>
<trimStackTrace>false</trimStackTrace>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>integration-test</goal>
</goals>
</execution>
<execution>
<id>verify</id>
<phase>verify</phase>
<goals>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Start with OL runtime.
# tag::from[]
FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
# end::from[]

ARG VERSION=1.0
ARG REVISION=SNAPSHOT
# tag::label[]

LABEL \
org.opencontainers.image.authors="Your Name" \
org.opencontainers.image.vendor="IBM" \
org.opencontainers.image.url="local" \
org.opencontainers.image.source="https://github.com/OpenLiberty/guide-docker" \
org.opencontainers.image.version="$VERSION" \
org.opencontainers.image.revision="$REVISION" \
vendor="Open Liberty" \
name="system" \
version="$VERSION-$REVISION" \
summary="The system microservice from the Docker Guide" \
# tag::description[]
description="This image contains the system microservice running with the Open Liberty runtime."
# end::description[]
# end::label[]


USER root

COPY --chown=1001:0 src/main/liberty/config/server.xml /config/

COPY --chown=1001:0 target/*.war /config/apps/

USER 1001
Loading

0 comments on commit 35bd9d6

Please sign in to comment.