Skip to content

Commit

Permalink
Merge pull request #388 from cherylking/addJava17InBuild
Browse files Browse the repository at this point in the history
Update for Java 17
  • Loading branch information
cherylking authored Oct 19, 2022
2 parents 261a0ce + 7459673 commit 9bf5e06
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
os: [ ubuntu-latest, windows-latest ]
java: [ 8, 11 ]
java: [ 8, 11, 17 ]

steps:
- name: Checkout ci.common
Expand Down
84 changes: 42 additions & 42 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
<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>
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>net.wasdev.maven.parent</groupId>
<artifactId>parent</artifactId>
<version>1.4</version>
<relativePath />
</parent>
<parent>
<groupId>net.wasdev.maven.parent</groupId>
<artifactId>parent</artifactId>
<version>1.4</version>
<relativePath />
</parent>

<groupId>io.openliberty.tools</groupId>
<artifactId>ci.common</artifactId>
<version>1.8.23-SNAPSHOT</version>
<packaging>jar</packaging>
<groupId>io.openliberty.tools</groupId>
<artifactId>ci.common</artifactId>
<version>1.8.23-SNAPSHOT</version>
<packaging>jar</packaging>

<name>ci.common</name>
<name>ci.common</name>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>https://raw.github.com/openliberty/ci.common/main/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>https://raw.github.com/openliberty/ci.common/main/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:git:[email protected]:openliberty/ci.maven.git</connection>
<developerConnection>scm:git:[email protected]:openliberty/ci.common.git</developerConnection>
<url>[email protected]:openliberty/ci.common.git</url>
<tag>HEAD</tag>
</scm>
<scm>
<connection>scm:git:[email protected]:openliberty/ci.maven.git</connection>
<developerConnection>scm:git:[email protected]:openliberty/ci.common.git</developerConnection>
<url>[email protected]:openliberty/ci.common.git</url>
<tag>HEAD</tag>
</scm>

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

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.12</version>
<version>2.3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-ant-tasks</artifactId>
<version>1.9.10</version>
<version>1.9.11</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.6.3</version>
</dependency>
</dependencies>
</dependencies>
</project>

0 comments on commit 9bf5e06

Please sign in to comment.