Skip to content

Commit

Permalink
Prepare for 6.0.0 release with 22.09 (#32)
Browse files Browse the repository at this point in the history
* Prepare for 6.0.0 release with 22.09
* Readme update
* Remove coherence-metrics
  • Loading branch information
tmiddlet2666 authored Oct 3, 2022
1 parent d8684c8 commit 8fd8c85
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 17 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/maven-build-jdk17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ jobs:
fail-fast: false
matrix:
version:
- 21.12.4
- 22.06
- 22.06.1
- 22.06.2

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
- 14.1.1-0-10
- 14.1.1-0-9
- 21.12.4
- 22.06
- 22.06.1
- 22.06.2

steps:
- name: Checkout
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ The demonstration uses AngularJS 1.7.5, Bootstrap 3.3.4, and a number of other f

To run the demonstration application, you must have the following software installed:

1. Java 11 or 17 SE Development Kit or Runtime environment.
1. Java 17 SE Development Kit or Runtime environment.

You can download JDK 11 or 17 from [Java SE Development Kit Downloads](https://www.oracle.com/java/technologies/downloads/)
You can download JDK 17 from [Java SE Development Kit Downloads](https://www.oracle.com/java/technologies/downloads/)

1. Maven 3.6.0 or later version installed and configured.

Expand Down Expand Up @@ -100,8 +100,6 @@ location.

## Run the Application Locally

> Note: You *must* first use `git checkout v5.0.1` to use the current 5.0.1 release that supports Coherence CE 22.06.
Build the application using Maven:

```bash
Expand All @@ -121,6 +119,9 @@ Run demo application
mvn exec:exec
```

> Note: If you wish to run against an older Coherence CE version than 22.09 or older than Coherence GE 14.1.1.2206.1, then *must* first use `git checkout v5.0.1` to use the
> current 5.0.1 release that supports these older versions.
The following screenshot shows the application running with 5 cache servers started.

![Coherence Demo](assets/coherence-demo.png "Coherence Demo")
Expand Down
12 changes: 3 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
* File: pom.xml
*
* Copyright (c) 2015, 2020, 2021 Oracle and/or its affiliates.
* Copyright (c) 2015, 2022 Oracle and/or its affiliates.
*
* You may not use this file except in compliance with the Universal Permissive
* License (UPL), Version 1.0 (the "License.")
Expand Down Expand Up @@ -32,7 +32,7 @@

<!-- dependency versions -->
<bedrock.version>6.0.1</bedrock.version>
<coherence.version>22.09-SNAPSHOT</coherence.version>
<coherence.version>22.09</coherence.version>
<jakarta.xml.bind.version>3.0.1</jakarta.xml.bind.version>
<copy.rename.maven.plugin.version>1.0</copy.rename.maven.plugin.version>
<derby.version>10.15.2.0</derby.version>
Expand All @@ -49,7 +49,7 @@
<opentracing.jdbc.version>0.2.10</opentracing.jdbc.version>

<!-- maven configuration -->
<java.version>1.8</java.version>
<java.version>11</java.version>
<maven.assembly.plugin.version>3.0.0</maven.assembly.plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down Expand Up @@ -83,12 +83,6 @@
<artifactId>coherence-management</artifactId>
<version>${coherence.version}</version>
</dependency>

<dependency>
<groupId>${coherence.group.id}</groupId>
<artifactId>coherence-metrics</artifactId>
<version>${coherence.version}</version>
</dependency>

<dependency>
<groupId>${coherence.group.id}</groupId>
Expand Down

0 comments on commit 8fd8c85

Please sign in to comment.