From 5c833fd8553c917abf0e9a4761b3331cd2f71ada Mon Sep 17 00:00:00 2001 From: cFrost Date: Sun, 9 Sep 2018 22:27:32 +0800 Subject: [PATCH 1/5] upgrade parent pom version --- pom.xml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 0b0d30e..227224f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,18 +5,17 @@ net.eulerframework euler-parent - 3 + 4-SNAPSHOT euler-cache - 1.0.0.M1 + 1.0.0.M2-SNAPSHOT euler-cache https://eulerproject.io In Memory Object Cache - 1.7 1.0.0.M2-SNAPSHOT @@ -28,20 +27,6 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - ${jdk.version} - ${jdk.version} - - - - - scm:git:https://github.com/euler-projects/euler-cache.git scm:git:git@github.com:euler-projects/euler-cache.git From f721d2b54d3c53bf018e7d46a4318173e7dbe84d Mon Sep 17 00:00:00 2001 From: cFrost Date: Sun, 9 Sep 2018 22:35:26 +0800 Subject: [PATCH 2/5] license tag --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 33dc47f..26ffeb3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![GitHub issues](https://img.shields.io/github/issues/euler-projects/euler-cache.svg)](https://github.com/euler-projects/euler-cache/issues) [![GitHub release](https://img.shields.io/github/release/euler-projects/euler-cache.svg)](https://github.com/euler-projects/euler-cache/releases) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.eulerframework/euler-cache/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.eulerframework/euler-cache) -[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/euler-projects/euler-cache/master/LICENSE) +[![GitHub license](https://img.shields.io/github/license/euler-projects/euler-cache.svg)](https://raw.githubusercontent.com/euler-projects/euler-cache/master/LICENSE) ## About In Memory Object Cache @@ -10,7 +10,7 @@ In Memory Object Cache Visit [eulerproject.io][] for more info. ## License -This project is released under the [MIT License][]. +This project is released under version 2.0 of the [Apache License][]. -[MIT License]: https://opensource.org/licenses/MIT +[Apache License]: http://www.apache.org/licenses/LICENSE-2.0 [eulerproject.io]: https://eulerproject.io From 1c7ff412880bd72f35392f59d308679fc8b85128 Mon Sep 17 00:00:00 2001 From: cFrost Date: Sun, 9 Sep 2018 22:39:14 +0800 Subject: [PATCH 3/5] build status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26ffeb3..71076a0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://ci.eulerproject.io/job/euler-cache-latest-jdk7/badge/icon)](https://ci.eulerproject.io/job/euler-cache-latest-jdk7) +[![Build Status](https://ci.eulerproject.io/job/euler-cache-latest-jdk8/badge/icon)](https://ci.eulerproject.io/job/euler-cache-latest-jdk8) [![GitHub issues](https://img.shields.io/github/issues/euler-projects/euler-cache.svg)](https://github.com/euler-projects/euler-cache/issues) [![GitHub release](https://img.shields.io/github/release/euler-projects/euler-cache.svg)](https://github.com/euler-projects/euler-cache/releases) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.eulerframework/euler-cache/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.eulerframework/euler-cache) From 1f220524d0feaaefac528b0346d1680b2f823c37 Mon Sep 17 00:00:00 2001 From: cFrost Date: Sun, 9 Sep 2018 22:44:18 +0800 Subject: [PATCH 4/5] Revert "upgrade parent pom version" This reverts commit 5c833fd8553c917abf0e9a4761b3331cd2f71ada. --- pom.xml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 227224f..0b0d30e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,17 +5,18 @@ net.eulerframework euler-parent - 4-SNAPSHOT + 3 euler-cache - 1.0.0.M2-SNAPSHOT + 1.0.0.M1 euler-cache https://eulerproject.io In Memory Object Cache + 1.7 1.0.0.M2-SNAPSHOT @@ -27,6 +28,20 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + ${jdk.version} + ${jdk.version} + + + + + scm:git:https://github.com/euler-projects/euler-cache.git scm:git:git@github.com:euler-projects/euler-cache.git From 1126689c122080467dc6e4788325de662877861e Mon Sep 17 00:00:00 2001 From: cFrost Date: Sun, 9 Sep 2018 22:45:12 +0800 Subject: [PATCH 5/5] euler-common version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b0d30e..9f325f9 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.7 - 1.0.0.M2-SNAPSHOT + 1.0.0.M1