From 306b815e7288646ea41548b335e2f08f7dc00c88 Mon Sep 17 00:00:00 2001 From: crossoverJie Date: Tue, 4 Sep 2018 19:31:16 +0800 Subject: [PATCH 1/3] :bookmark: Releasing / Version tags.1.0.1 --- cicada-core/pom.xml | 4 ++-- cicada-example/pom.xml | 6 +++--- pom.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cicada-core/pom.xml b/cicada-core/pom.xml index d03f379..83a83ae 100644 --- a/cicada-core/pom.xml +++ b/cicada-core/pom.xml @@ -5,12 +5,12 @@ cicada top.crossoverjie.opensource - 1.0.0 + 1.0.1 4.0.0 cicada-core - 1.0.0 + 1.0.1 jar diff --git a/cicada-example/pom.xml b/cicada-example/pom.xml index c4e488a..4569b41 100644 --- a/cicada-example/pom.xml +++ b/cicada-example/pom.xml @@ -5,10 +5,10 @@ cicada top.crossoverjie.opensource - 1.0.0 + 1.0.1 4.0.0 - 1.0.0 + 1.0.1 cicada-example jar @@ -18,7 +18,7 @@ top.crossoverjie.opensource cicada-core - 1.0.0 + 1.0.1 diff --git a/pom.xml b/pom.xml index f02d1be..d7e3d70 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ top.crossoverjie.opensource cicada pom - 1.0.0 + 1.0.1 cicada-core cicada-example From 6f4505f5ab3aed8a39632fb7f0e86e835a9a92c5 Mon Sep 17 00:00:00 2001 From: crossoverJie Date: Tue, 4 Sep 2018 22:35:20 +0800 Subject: [PATCH 2/3] Merge branch 'master' into fix-maven-1.0.1 # Conflicts: # pom.xml --- cicada-core/pom.xml | 6 ++++++ pom.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/cicada-core/pom.xml b/cicada-core/pom.xml index df7394d..5f73f12 100644 --- a/cicada-core/pom.xml +++ b/cicada-core/pom.xml @@ -16,6 +16,12 @@ cicada-core Fast, lightweight Web framework based on Netty https://crossoverjie.top/categories/cicada/ + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + diff --git a/pom.xml b/pom.xml index cb1e3e8..1ddd18e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,12 @@ cicada Fast, lightweight Web framework based on Netty https://crossoverjie.top/categories/cicada/ + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + cicada-core From 2b4b1f4cc84cef36831f2e162dd02c5bafc43a1d Mon Sep 17 00:00:00 2001 From: crossoverJie Date: Tue, 4 Sep 2018 23:44:09 +0800 Subject: [PATCH 3/3] :bookmark: Releasing / Version tags. --- README-ZH.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-ZH.md b/README-ZH.md index ce13a80..3043542 100644 --- a/README-ZH.md +++ b/README-ZH.md @@ -42,7 +42,7 @@ top.crossoverjie.opensource cicada-core - 1.0.0 + 1.0.1 ``` diff --git a/README.md b/README.md index 24942e1..9d229a1 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Create a project with `Maven`, import core dependency. top.crossoverjie.opensource cicada-core - 1.0.0 + 1.0.1 ```