You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/12/07 07:25:28 UTC
griffin git commit: Fix version mismatch
Repository: griffin
Updated Branches:
refs/heads/master d02752b46 -> 0a6b0fc74
Fix version mismatch
Revise build version, remove 'incubating' tag
Author: Eugene <li...@apache.org>
Closes #467 from toyboxman/version.
Project: http://git-wip-us.apache.org/repos/asf/griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/griffin/commit/0a6b0fc7
Tree: http://git-wip-us.apache.org/repos/asf/griffin/tree/0a6b0fc7
Diff: http://git-wip-us.apache.org/repos/asf/griffin/diff/0a6b0fc7
Branch: refs/heads/master
Commit: 0a6b0fc749ec8fc3cc22fb772b7b823d194badb8
Parents: d02752b
Author: Eugene <li...@apache.org>
Authored: Fri Dec 7 15:25:22 2018 +0800
Committer: William Guo <gu...@apache.org>
Committed: Fri Dec 7 15:25:22 2018 +0800
----------------------------------------------------------------------
measure/pom.xml | 2 +-
pom.xml | 2 +-
service/pom.xml | 2 +-
.../java/org/apache/griffin/core/info/GriffinInfoController.java | 2 +-
.../org/apache/griffin/core/info/GriffinInfoControllerTest.java | 2 +-
ui/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/griffin/blob/0a6b0fc7/measure/pom.xml
----------------------------------------------------------------------
diff --git a/measure/pom.xml b/measure/pom.xml
index 82d1bc2..f1adbe1 100644
--- a/measure/pom.xml
+++ b/measure/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
</parent>
<artifactId>measure</artifactId>
http://git-wip-us.apache.org/repos/asf/griffin/blob/0a6b0fc7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 76b8897..983658a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.griffin</groupId>
<artifactId>griffin</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Griffin ${project.version}</name>
<url>http://griffin.apache.org</url>
http://git-wip-us.apache.org/repos/asf/griffin/blob/0a6b0fc7/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index 98a0319..325ae71 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
</parent>
<artifactId>service</artifactId>
http://git-wip-us.apache.org/repos/asf/griffin/blob/0a6b0fc7/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java b/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
index ee0d777..4280095 100644
--- a/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
+++ b/service/src/main/java/org/apache/griffin/core/info/GriffinInfoController.java
@@ -29,6 +29,6 @@ public class GriffinInfoController {
@RequestMapping(value = "/version", method = RequestMethod.GET)
public String greeting() {
- return "0.3.0";
+ return "0.4.0";
}
}
http://git-wip-us.apache.org/repos/asf/griffin/blob/0a6b0fc7/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java b/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
index d868ae3..e6e1941 100644
--- a/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
+++ b/service/src/test/java/org/apache/griffin/core/info/GriffinInfoControllerTest.java
@@ -43,6 +43,6 @@ public class GriffinInfoControllerTest {
public void testGreeting() throws Exception {
mockMvc.perform(get(URLHelper.API_VERSION_PATH + "/version"))
.andExpect(status().isOk())
- .andExpect(jsonPath("$", is("0.3.0")));
+ .andExpect(jsonPath("$", is("0.4.0")));
}
}
http://git-wip-us.apache.org/repos/asf/griffin/blob/0a6b0fc7/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index 93f0edb..6262415 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
</parent>
<artifactId>ui</artifactId>
<packaging>pom</packaging>