You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by de...@apache.org on 2016/04/01 23:48:49 UTC
[1/7] lens git commit: LENS-983 : Make default response type as XML
on all resources
Repository: lens
Updated Branches:
refs/heads/master 125a429ad -> 2f8fae750
LENS-983 : Make default response type as XML on all resources
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/1bcdfd1a
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/1bcdfd1a
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/1bcdfd1a
Branch: refs/heads/master
Commit: 1bcdfd1aeedd49a657b84753d8461357fe1dadca
Parents: e93f96a
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Wed Mar 9 15:32:03 2016 +0530
Committer: Deepak Kumar Barr <de...@gmail.com>
Committed: Wed Mar 9 16:16:52 2016 +0530
----------------------------------------------------------------------
.../lens/ml/server/MLServiceResource.java | 6 ++--
.../server/metastore/MetastoreResource.java | 2 +-
.../lens/server/query/QueryServiceResource.java | 32 ++++++++++----------
.../server/query/save/SavedQueryResource.java | 12 ++------
.../lens/server/session/SessionResource.java | 14 ++++-----
.../lens/server/ui/MetastoreUIResource.java | 6 ++--
.../lens/server/ui/QueryServiceUIResource.java | 10 +++---
.../lens/server/ui/SessionUIResource.java | 4 +--
.../server/session/TestSessionResource.java | 22 ++++++++++++++
9 files changed, 62 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
index 53bac7d..ea29d24 100644
--- a/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
+++ b/lens-ml-lib/src/main/java/org/apache/lens/ml/server/MLServiceResource.java
@@ -51,7 +51,7 @@ import lombok.extern.slf4j.Slf4j;
* Machine Learning service.
*/
@Path("/ml")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Slf4j
public class MLServiceResource {
@@ -209,7 +209,7 @@ public class MLServiceResource {
* @throws LensException the lens exception
*/
@DELETE
- @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
@Path("models/{algorithm}/{modelID}")
public String deleteModel(@PathParam("algorithm") String algorithm, @PathParam("modelID") String modelID)
throws LensException {
@@ -373,7 +373,7 @@ public class MLServiceResource {
*/
@DELETE
@Path("reports/{algorithm}/{reportID}")
- @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public String deleteTestReport(@PathParam("algorithm") String algorithm, @PathParam("reportID") String reportID)
throws LensException {
getMlService().deleteTestReport(algorithm, reportID);
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java b/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
index e7d545c..684e2ed 100644
--- a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
@@ -49,7 +49,7 @@ import lombok.extern.slf4j.Slf4j;
* This provides api for all things metastore.
*/
@Path("metastore")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Slf4j
public class MetastoreResource {
public static final ObjectFactory X_CUBE_OBJECT_FACTORY = new ObjectFactory();
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java
index 6e1a709..a043550 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryServiceResource.java
@@ -152,7 +152,7 @@ public class QueryServiceResource {
*/
@GET
@Path("queries")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public List<QueryHandle> getAllQueries(@QueryParam("sessionid") LensSessionHandle sessionid,
@DefaultValue("") @QueryParam("state") String state, @DefaultValue("") @QueryParam("queryName") String queryName,
@DefaultValue("") @QueryParam("user") String user, @DefaultValue("") @QueryParam("driver") String driver,
@@ -205,7 +205,7 @@ public class QueryServiceResource {
@POST
@Path("queries")
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
@MultiPurposeResource(formParamName = "operation")
public LensAPIResult<QuerySubmitResult> query(@FormDataParam("sessionid") LensSessionHandle sessionid,
@FormDataParam("query") String query, @FormDataParam("operation") String operation,
@@ -267,7 +267,7 @@ public class QueryServiceResource {
*/
@DELETE
@Path("queries")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult cancelAllQueries(@QueryParam("sessionid") LensSessionHandle sessionid,
@DefaultValue("") @QueryParam("state") String state, @DefaultValue("") @QueryParam("user") String user,
@DefaultValue("") @QueryParam("queryName") String queryName, @DefaultValue("") @QueryParam("driver") String driver,
@@ -315,7 +315,7 @@ public class QueryServiceResource {
*/
@GET
@Path("preparedqueries")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public List<QueryPrepareHandle> getAllPreparedQueries(@QueryParam("sessionid") LensSessionHandle sessionid,
@DefaultValue("") @QueryParam("user") String user, @DefaultValue("") @QueryParam("queryName") String queryName,
@DefaultValue("-1") @QueryParam("fromDate") long fromDate, @DefaultValue("-1") @QueryParam("toDate") long toDate) {
@@ -349,7 +349,7 @@ public class QueryServiceResource {
@POST
@Path("preparedqueries")
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
@MultiPurposeResource(formParamName = "operation")
public LensAPIResult<QuerySubmitResult> prepareQuery(
@FormDataParam("sessionid") LensSessionHandle sessionid, @FormDataParam("query") String query,
@@ -402,7 +402,7 @@ public class QueryServiceResource {
*/
@DELETE
@Path("preparedqueries")
- @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN })
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN })
public APIResult destroyPreparedQueries(@QueryParam("sessionid") LensSessionHandle sessionid,
@DefaultValue("") @QueryParam("user") String user, @DefaultValue("") @QueryParam("queryName") String queryName,
@DefaultValue("-1") @QueryParam("fromDate") long fromDate,
@@ -472,7 +472,7 @@ public class QueryServiceResource {
*/
@GET
@Path("preparedqueries/{prepareHandle}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public LensPreparedQuery getPreparedQuery(@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("prepareHandle") String prepareHandle) {
checkSessionId(sessionid);
@@ -494,7 +494,7 @@ public class QueryServiceResource {
*/
@DELETE
@Path("preparedqueries/{prepareHandle}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult destroyPrepared(@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("prepareHandle") String prepareHandle) {
checkSessionId(sessionid);
@@ -515,7 +515,7 @@ public class QueryServiceResource {
*/
@GET
@Path("queries/{queryHandle}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public LensQuery getStatus(@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("queryHandle") String queryHandle) {
checkSessionId(sessionid);
@@ -537,7 +537,7 @@ public class QueryServiceResource {
*/
@DELETE
@Path("queries/{queryHandle}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult cancelQuery(@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("queryHandle") String queryHandle) {
checkSessionId(sessionid);
@@ -591,7 +591,7 @@ public class QueryServiceResource {
@PUT
@Path("queries/{queryHandle}")
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult updateConf(@FormDataParam("sessionid") LensSessionHandle sessionid,
@PathParam("queryHandle") String queryHandle, @FormDataParam("conf") LensConf conf) {
checkSessionId(sessionid);
@@ -620,7 +620,7 @@ public class QueryServiceResource {
@PUT
@Path("preparedqueries/{prepareHandle}")
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult updatePreparedConf(@FormDataParam("sessionid") LensSessionHandle sessionid,
@PathParam("prepareHandle") String prepareHandle, @FormDataParam("conf") LensConf conf) {
checkSessionId(sessionid);
@@ -656,7 +656,7 @@ public class QueryServiceResource {
@POST
@Path("preparedqueries/{prepareHandle}")
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
@MultiPurposeResource(formParamName = "operation")
public QuerySubmitResult executePrepared(@FormDataParam("sessionid") LensSessionHandle sessionid,
@PathParam("prepareHandle") String prepareHandle,
@@ -696,7 +696,7 @@ public class QueryServiceResource {
*/
@GET
@Path("queries/{queryHandle}/resultsetmetadata")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public QueryResultSetMetadata getResultSetMetadata(@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("queryHandle") String queryHandle) {
checkSessionId(sessionid);
@@ -718,7 +718,7 @@ public class QueryServiceResource {
*/
@GET
@Path("queries/{queryHandle}/resultset")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public QueryResult getResultSet(@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("queryHandle") String queryHandle, @QueryParam("fromindex") long startIndex,
@QueryParam("fetchsize") int fetchSize) {
@@ -759,7 +759,7 @@ public class QueryServiceResource {
*/
@DELETE
@Path("queries/{queryHandle}/resultset")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult closeResultSet(@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("queryHandle") String queryHandle) {
checkSessionId(sessionid);
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java
index 02541c5..e568184 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryResource.java
@@ -64,6 +64,7 @@ import lombok.NonNull;
* <p></p>
* CRUD on saved query
*/
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public class SavedQueryResource {
final SavedQueryService savedQueryService;
@@ -107,7 +108,6 @@ public class SavedQueryResource {
@GET
@Path("/savedqueries")
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public ListResponse getList(
@QueryParam("sessionid") LensSessionHandle sessionid,
@Context UriInfo info,
@@ -131,7 +131,6 @@ public class SavedQueryResource {
*/
@GET
@Path("/savedqueries/{id}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public SavedQuery getByID(
@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("id") long id) throws LensException {
@@ -152,7 +151,6 @@ public class SavedQueryResource {
*/
@DELETE
@Path("/savedqueries/{id}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public ResourceModifiedResponse deleteById(
@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("id") long id) throws LensException {
@@ -176,8 +174,7 @@ public class SavedQueryResource {
*/
@POST
@Path(("/savedqueries"))
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public ResourceModifiedResponse create(
@QueryParam("sessionid") LensSessionHandle sessionid,
SavedQuery savedQuery,
@@ -206,8 +203,7 @@ public class SavedQueryResource {
*/
@PUT
@Path("/savedqueries/{id}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public ResourceModifiedResponse update(
@QueryParam("sessionid") LensSessionHandle sessionid,
@PathParam("id") long id,
@@ -233,7 +229,6 @@ public class SavedQueryResource {
*/
@POST
@Path("/savedqueries/parameters")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public ParameterParserResponse getParameters(
@QueryParam("sessionid") LensSessionHandle sessionid,
@FormDataParam("query") String query) {
@@ -252,7 +247,6 @@ public class SavedQueryResource {
*/
@POST
@Path("/savedqueries/{id}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
public LensAPIResult<QueryHandle> run(
@PathParam("id") long id,
@Context UriInfo info,
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java b/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java
index ac77418..a36c552 100644
--- a/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/session/SessionResource.java
@@ -83,7 +83,7 @@ public class SessionResource {
*/
@POST
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public LensSessionHandle openSession(@FormDataParam("username") String username,
@FormDataParam("password") String password,
@FormDataParam("database") @DefaultValue("") String database,
@@ -108,7 +108,7 @@ public class SessionResource {
* @return APIResult object indicating if the operation was successful (check result.getStatus())
*/
@DELETE
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult closeSession(@QueryParam("sessionid") LensSessionHandle sessionid) {
try {
sessionService.closeSession(sessionid);
@@ -136,7 +136,7 @@ public class SessionResource {
@PUT
@Path("resources/add")
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult addResource(@FormDataParam("sessionid") LensSessionHandle sessionid,
@FormDataParam("type") String type, @FormDataParam("path") String path) {
ScannedPaths scannedPaths = new ScannedPaths(path, type);
@@ -169,7 +169,7 @@ public class SessionResource {
*/
@GET
@Path("resources/list")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public StringList listResources(@QueryParam("sessionid") LensSessionHandle sessionid,
@QueryParam("type") String type) {
List<String> resources = sessionService.listAllResources(sessionid, type);
@@ -193,7 +193,7 @@ public class SessionResource {
@Path("resources/delete")
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult deleteResource(@FormDataParam("sessionid") LensSessionHandle sessionid,
@FormDataParam("type") String type, @FormDataParam("path") String path) {
ScannedPaths scannedPaths = new ScannedPaths(path, type);
@@ -232,7 +232,7 @@ public class SessionResource {
*/
@GET
@Path("params")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public StringList getParams(@QueryParam("sessionid") LensSessionHandle sessionid,
@DefaultValue("false") @QueryParam("verbose") boolean verbose, @DefaultValue("") @QueryParam("key") String key) {
try {
@@ -257,7 +257,7 @@ public class SessionResource {
*/
@PUT
@Path("params")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult setParam(@FormDataParam("sessionid") LensSessionHandle sessionid, @FormDataParam("key") String key,
@FormDataParam("value") String value) {
sessionService.setSessionParameter(sessionid, key, value);
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java
index faaf172..27388a7 100644
--- a/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/ui/MetastoreUIResource.java
@@ -76,7 +76,7 @@ public class MetastoreUIResource {
*/
@GET
@Path("tables")
- @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public String getAllTables(@QueryParam("publicId") UUID publicId) {
LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId);
checkSessionHandle(sessionHandle);
@@ -139,7 +139,7 @@ public class MetastoreUIResource {
*/
@GET
@Path("tables/{name}")
- @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public String getDescription(@QueryParam("publicId") UUID publicId, @QueryParam("type") String type,
@PathParam("name") String name) {
LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId);
@@ -211,7 +211,7 @@ public class MetastoreUIResource {
*/
@GET
@Path("searchablefields")
- @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public String getFilterResults(@QueryParam("publicId") UUID publicId, @QueryParam("keyword") String keyword) {
LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId);
checkSessionHandle(sessionHandle);
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java
index 424bd87..304dc8e 100644
--- a/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/ui/QueryServiceUIResource.java
@@ -114,7 +114,7 @@ public class QueryServiceUIResource {
*/
@GET
@Path("queries")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public List<QueryHandle> getAllQueries(@QueryParam("publicId") UUID publicId,
@DefaultValue("") @QueryParam("state") String state, @DefaultValue("") @QueryParam("user") String user,
@DefaultValue("") @QueryParam("driver") String driver, @DefaultValue("") @QueryParam("queryName") String queryName,
@@ -141,7 +141,7 @@ public class QueryServiceUIResource {
@POST
@Path("queries")
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public QuerySubmitResult query(@FormDataParam("publicId") UUID publicId, @FormDataParam("query") String query,
@DefaultValue("") @FormDataParam("queryName") String queryName) {
LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId);
@@ -165,7 +165,7 @@ public class QueryServiceUIResource {
*/
@GET
@Path("queries/{queryHandle}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public LensQuery getStatus(@QueryParam("publicId") UUID publicId, @PathParam("queryHandle") String queryHandle) {
LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId);
checkSessionHandle(sessionHandle);
@@ -187,7 +187,7 @@ public class QueryServiceUIResource {
*/
@GET
@Path("queries/{queryHandle}/resultset")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public ResultRow getResultSet(@QueryParam("publicId") UUID publicId, @PathParam("queryHandle") String queryHandle,
@QueryParam("pageNumber") int pageNumber, @QueryParam("fetchsize") int fetchSize) {
LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId);
@@ -230,7 +230,7 @@ public class QueryServiceUIResource {
*/
@DELETE
@Path("queries/{queryHandle}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult cancelQuery(@QueryParam("sessionid") UUID publicId, @PathParam("queryHandle") String queryHandle) {
LensSessionHandle sessionHandle = SessionUIResource.getOpenSession(publicId);
checkSessionHandle(sessionHandle);
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java b/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java
index f38e70d..37bf094 100644
--- a/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/ui/SessionUIResource.java
@@ -104,7 +104,7 @@ public class SessionUIResource {
*/
@POST
@Consumes({MediaType.MULTIPART_FORM_DATA})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public LensSessionHandle openSession(@FormDataParam("username") String username,
@FormDataParam("password") String password,
@FormDataParam("database") @DefaultValue("") String database,
@@ -132,7 +132,7 @@ public class SessionUIResource {
*/
@DELETE
@Path("{publicId}")
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN})
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
public APIResult closeSession(@PathParam("publicId") UUID publicId) {
log.info("Closing session with id: {}", publicId);
LensSessionHandle sessionHandle = getOpenSession(publicId);
http://git-wip-us.apache.org/repos/asf/lens/blob/1bcdfd1a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
index bde7b9b..011aa5b 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
@@ -105,6 +105,28 @@ public class TestSessionResource extends LensJerseyTest {
return new SessionApp();
}
+ @Test
+ public void testDefaultResponseType() {
+ final WebTarget target = target().path("session");
+ final FormDataMultiPart mp = new FormDataMultiPart();
+ mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("username").build(), "foo"));
+ mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("password").build(), "bar"));
+ mp.bodyPart(new FormDataBodyPart(FormDataContentDisposition.name("sessionconf").fileName("sessionconf").build(),
+ new LensConf(), defaultMT));
+
+ final String handle = target.request().post(Entity.entity(mp, MediaType.MULTIPART_FORM_DATA_TYPE),
+ String.class);
+ Assert.assertNotNull(handle);
+ Assert.assertTrue(handle.contains("xml"), "Handle is " + handle);
+ Assert.assertTrue(handle.contains("publicId"), "Handle is " + handle);
+ Assert.assertTrue(handle.contains("secretId"), "Handle is " + handle);
+
+ String result = target.queryParam("sessionid", handle).request().delete(String.class);
+ Assert.assertNotNull(result);
+ Assert.assertTrue(result.contains("xml"), "Result is " + result);
+ Assert.assertTrue(result.contains("succeeded"), "Result is " + result);
+ }
+
/**
* Test session.
*/
[5/7] lens git commit: [maven-release-plugin] prepare release
apache-lens-2.5.0-beta
Posted by de...@apache.org.
[maven-release-plugin] prepare release apache-lens-2.5.0-beta
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/f73cb8b9
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/f73cb8b9
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/f73cb8b9
Branch: refs/heads/master
Commit: f73cb8b9205fe2c1809fedc8e20f43fdcfb49543
Parents: efa5a59
Author: Deepak Kumar Barr <de...@gmail.com>
Authored: Fri Mar 18 12:23:10 2016 +0530
Committer: Deepak Kumar Barr <de...@gmail.com>
Committed: Fri Mar 18 12:23:10 2016 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +++++-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-es/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-ship-jars/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
lens-ui/pom.xml | 2 +-
pom.xml | 8 ++++----
20 files changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 2b3eda0..7309f56 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
<build>
<plugins>
@@ -49,4 +49,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>apache-lens-2.5.0-beta</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 1704b62..76323af 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 9082417..a2d33e6 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 5f2f3a9..4e4ccce 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 0212725..98fcde2 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index f987438..1d8a882 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-driver-es/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-es/pom.xml b/lens-driver-es/pom.xml
index 5705cd2..795f2b6 100644
--- a/lens-driver-es/pom.xml
+++ b/lens-driver-es/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-driver-es</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 48007dd..c3dc215 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index f84513b..86e4172 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 0a5a744..683d688 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index 5bd48a8..7357d3f 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 67215e1..c9fe9ec 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 2eec781..9075bcb 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 807d3b2..4691fea 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index d836c16..d559999 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 064197d..373e02a 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-ship-jars/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml
index ece22a1..edfd005 100644
--- a/lens-ship-jars/pom.xml
+++ b/lens-ship-jars/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-ship-jars</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 0272be5..034909f 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/lens-ui/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ui/pom.xml b/lens-ui/pom.xml
index ab3f576..a8134fc 100644
--- a/lens-ui/pom.xml
+++ b/lens-ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</parent>
<artifactId>lens-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f73cb8b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 349b71c..1ccc61e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -356,7 +356,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/lens.git</url>
- <tag>HEAD</tag>
+ <tag>apache-lens-2.5.0-beta</tag>
</scm>
<reporting>
@@ -685,7 +685,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</dependency>
</dependencies>
<executions>
@@ -1703,7 +1703,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.5.0-beta-SNAPSHOT</version>
+ <version>2.5.0-beta</version>
</dependency>
</dependencies>
<executions>
[4/7] lens git commit: Added jersey-media-jaxb to NOTICE and LICENSE
Posted by de...@apache.org.
Added jersey-media-jaxb to NOTICE and LICENSE
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/efa5a597
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/efa5a597
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/efa5a597
Branch: refs/heads/master
Commit: efa5a59720265fac0dd139e6881200f2ae1e1666
Parents: f8197a6
Author: Deepak Barr <de...@apache.org>
Authored: Tue Mar 15 23:29:31 2016 +0530
Committer: Deepak Kumar Barr <de...@gmail.com>
Committed: Tue Mar 15 23:29:31 2016 +0530
----------------------------------------------------------------------
bin-dist-files/LICENSE | 12 ++++++------
bin-dist-files/NOTICE | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/efa5a597/bin-dist-files/LICENSE
----------------------------------------------------------------------
diff --git a/bin-dist-files/LICENSE b/bin-dist-files/LICENSE
index f0e4c16..1ba30a4 100644
--- a/bin-dist-files/LICENSE
+++ b/bin-dist-files/LICENSE
@@ -358,15 +358,15 @@ The text of the license is also available at https://glassfish.java.net/nonav/pu
For javax.ws.rs, jaxb-api, jersey-server, jersey-client, jersey-media-multipart, jersey-media-json-jackson,
jersey-media-moxy, jersey-container-grizzly2-servlet, jersey-container-grizzly2-http, jersey-container-servlet,
-jersey-container-servlet-core, jersey-entity-filtering, jersey-common, grizzly-http-server, grizzly-framework,
-grizzly-http, grizzly-http-servlet, hk2-locator, asm-all-repackaged, cglib, hk2-utils, hk2-api, javax.inject,
-mimepull
+jersey-container-servlet-core, jersey-entity-filtering, jersey-common, jersey-media-jaxb, grizzly-http-server,
+grizzly-framework, grizzly-http, grizzly-http-servlet, hk2-locator, asm-all-repackaged, cglib, hk2-utils, hk2-api,
+javax.inject, mimepull
javax.ws.rs, jaxb-api, jersey-server, jersey-client, jersey-media-multipart, jersey-media-json-jackson,
jersey-media-moxy, jersey-container-grizzly2-servlet, jersey-container-grizzly2-http, jersey-container-servlet,
-jersey-container-servlet-core, jersey-entity-filtering, jersey-common, grizzly-http-server, grizzly-framework,
-grizzly-http, grizzly-http-servlet, hk2-locator, asm-all-repackaged, cglib, hk2-utils, hk2-api, javax.inject,
-mimepull are dual licensed under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+jersey-container-servlet-core, jersey-entity-filtering, jersey-common, jersey-media-jaxb, grizzly-http-server,
+grizzly-framework, grizzly-http, grizzly-http-servlet, hk2-locator, asm-all-repackaged, cglib, hk2-utils, hk2-api,
+javax.inject, mimepull are dual licensed under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
and The GNU Generas Public License (GPL) Version 2, June 1991 with classpath exception.
Full text if the license is available in file LICENSE-CDDLv1.1-GPLv2_withCPE
The text of the license is also available at https://glassfish.java.net/public/CDDL+GPL_1_1.html
http://git-wip-us.apache.org/repos/asf/lens/blob/efa5a597/bin-dist-files/NOTICE
----------------------------------------------------------------------
diff --git a/bin-dist-files/NOTICE b/bin-dist-files/NOTICE
index d731a68..aa8b28c 100644
--- a/bin-dist-files/NOTICE
+++ b/bin-dist-files/NOTICE
@@ -11,8 +11,8 @@ https://glassfish.java.net/javaee5/mail/
This product includes jersey libraries : jersey-server, jersey-client, jersey-media-multipart, jersey-media-json-jackson,
jersey-media-moxy, jersey-container-grizzly2-servlet, jersey-container-grizzly2-http, jersey-container-servlet,
-jersey-container-servlet-core, jersey-entity-filtering and jersey-common. The details on how to obtain those modules
-are available at https://jersey.java.net/.
+jersey-container-servlet-core, jersey-entity-filtering, jersey-media-jaxb and jersey-common. The details on how to
+obtain those modules are available at https://jersey.java.net/.
This product includes grizzly libraries : grizzly-http-server, grizzly-framework, grizzly-http, grizzly-http-servlet.
The details on how to obtain those libraries is available at https://grizzly.java.net/.
[2/7] lens git commit: LENS-985 : Lens UI module changes after
LENS-983
Posted by de...@apache.org.
LENS-985 : Lens UI module changes after LENS-983
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/5790fff7
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/5790fff7
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/5790fff7
Branch: refs/heads/master
Commit: 5790fff793c4aa5b528a750af5691c5af84157d0
Parents: 1bcdfd1
Author: Ankeet Maini <an...@gmail.com>
Authored: Thu Mar 10 14:40:12 2016 +0530
Committer: Deepak Kumar Barr <de...@gmail.com>
Committed: Thu Mar 10 14:42:40 2016 +0530
----------------------------------------------------------------------
lens-ui/app/adapters/BaseAdapter.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/5790fff7/lens-ui/app/adapters/BaseAdapter.js
----------------------------------------------------------------------
diff --git a/lens-ui/app/adapters/BaseAdapter.js b/lens-ui/app/adapters/BaseAdapter.js
index abe3bcf..a2b12d5 100644
--- a/lens-ui/app/adapters/BaseAdapter.js
+++ b/lens-ui/app/adapters/BaseAdapter.js
@@ -21,6 +21,9 @@ import Config from 'config.json';
import fetch from 'isomorphic-fetch';
function makeReqwest (url, method, data, options = {}) {
+ if (!options.headers) options.headers = {};
+ options.headers['Accept'] = 'application/json';
+
return fetch(url, {
method: method,
body: data,
[7/7] lens git commit: Merge branch 'current-release-line'
Posted by de...@apache.org.
Merge branch 'current-release-line'
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/2f8fae75
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/2f8fae75
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/2f8fae75
Branch: refs/heads/master
Commit: 2f8fae750bfcec719a6f1fe61080b7d59e0102bf
Parents: 125a429 911a6f9
Author: Deepak Kumar Barr <de...@gmail.com>
Authored: Sat Apr 2 03:12:54 2016 +0530
Committer: Deepak Kumar Barr <de...@gmail.com>
Committed: Sat Apr 2 03:12:54 2016 +0530
----------------------------------------------------------------------
bin-dist-files/LICENSE | 12 ++++++------
bin-dist-files/NOTICE | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[3/7] lens git commit: LENS-944 : Update 2.5 release documentation
Posted by de...@apache.org.
LENS-944 : Update 2.5 release documentation
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/f8197a6d
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/f8197a6d
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/f8197a6d
Branch: refs/heads/master
Commit: f8197a6dc6d8c3c1af773ef3dd82ff449704542e
Parents: 5790fff
Author: Deepak Barr <de...@apache.org>
Authored: Fri Mar 11 13:33:16 2016 +0530
Committer: Deepak Kumar Barr <de...@apache.org>
Committed: Fri Mar 11 13:33:16 2016 +0530
----------------------------------------------------------------------
src/site/apt/releases/download.apt | 2 +-
src/site/apt/releases/release-history.apt | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/f8197a6d/src/site/apt/releases/download.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/download.apt b/src/site/apt/releases/download.apt
index 37ac480..d0b313f 100644
--- a/src/site/apt/releases/download.apt
+++ b/src/site/apt/releases/download.apt
@@ -20,7 +20,7 @@
Download
The latest release of Apache Lens can be
- {{{http://www.apache.org/dyn/closer.lua/lens/2.4-beta}downloaded from the ASF}}.
+ {{{http://www.apache.org/dyn/closer.lua/lens/2.5-beta}downloaded from the ASF}}.
Older releases may be found {{{http://archive.apache.org/dist/lens}in the archives}}.
Releases prior to graduation may be found {{{http://archive.apache.org/dist/incubator/lens}in the incubator archives}}.
http://git-wip-us.apache.org/repos/asf/lens/blob/f8197a6d/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index 1879acc..95891be 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -23,6 +23,8 @@ All Apache Lens releases
*--+--+---+--+--+--+--+
|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
*--+--+---+--+--+--+--+
+|2.5.0-beta| Support for multiple instances of a driver, REST API enhancements, Derived cube validation, Per-queue driver max launched queries constraint, New error codes for Hive and JDBC Driver, Lens CLI improvements, Query result retention policy, UI Enhancements, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.5.0-beta/index.html} 2.5.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333326&projectId=12315923} 2.5 release notes}} |{{{http://archive.apache.org/dist/lens/2.5-beta/} Download}} |{{{#a2.5.x_from_2.4.x} 2.5.x-incompatibilities}} | - |
+*--+--+---+--+--+--+--+
|2.4.0-beta| JDK8 support, new web client, Saved Query and Parameterization, Support flattening of columns selected through bridge-tables(many-to-many relationships), column name mapping for columns in underlying storage tables, Enhancements cube.xsd and jdbc driver, Improvements in Error codes, Doc improvements, bug fixes| {{{../versions/2.4.0-beta/index.html} 2.4.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12333087} 2.4 release notes}} |{{{http://archive.apache.org/dist/lens/2.4-beta/} Download}} |{{{#a2.4.x_from_2.3.x} 2.4.x-incompatibilities}} | - |
*--+--+---+--+--+--+--+
|2.3.0-beta | Per Query Logs, Server side XML validation, File size in query result, File name suggestions in CLI, Phase 1 Query rewriter, Elastic Search driver, Query launching constraints, Update partition api, Lens Service Health check, Doc/javadoc improvements, Code cleanup, bug fixes| {{{../versions/2.3.0-beta/index.html} 2.3.x docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12332350&projectId=12315923} 2.3 release notes}}| {{{http://archive.apache.org/dist/lens/2.3-beta/} Download}} | {{{#a2.3.x_from_2.2.x} 2.3.x-incompatibilities}} | - |
@@ -42,6 +44,25 @@ All Apache Lens releases
* Incompatibilities
+** 2.5.x from 2.4.x
+
+ * LENS-817: Metadata class information is no longer persisted in DB due to redundancy. The 'metadataclass' column is
+ removed from finished_queries table.
+
+ * LENS-735: TableReferences can not be used to define reference dim-attributes. Now, reference dim-attribute
+ should be defined as chained column only.
+
+ * LENS-933: Driver query pre-submit hook can throw LensException now.
+
+ * LENS-920: All REST APIs will work with both application/xml and application/json accept headers. All the name="type"
+ specification in cube xsd is changed to name="_type". This makes measure type, dim_attribute type, expression type
+ and column type fields to be specified as "_type". REST API for creating fact and dimtable is changed to pass
+ sessionid as query param instead of multi-form data. Also, org.apache.lens.api.result.QueryCostTo.type is renamed to
+ org.apache.lens.api.result.QueryCostTo.costType.
+
+ * LENS-123: Multiple different instances of same driver class can be loaded. Driver config file location has changed.
+ For e.g. hivedriver-site.xml should be present in $LENS_HOME/server/conf/drivers/hive/hive1 directory.
+
** 2.4.x from 2.3.x
* LENS-187: Moved all errors from inmobi hive to lens. All errors will be having same error code but all exceptions
[6/7] lens git commit: [maven-release-plugin] prepare for next
development iteration
Posted by de...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/911a6f92
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/911a6f92
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/911a6f92
Branch: refs/heads/master
Commit: 911a6f929c7654815eba8acb5008642371d8a710
Parents: f73cb8b
Author: Deepak Kumar Barr <de...@gmail.com>
Authored: Fri Mar 18 12:27:31 2016 +0530
Committer: Deepak Kumar Barr <de...@gmail.com>
Committed: Fri Mar 18 12:27:31 2016 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +-----
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-es/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-ship-jars/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
lens-ui/pom.xml | 2 +-
pom.xml | 8 ++++----
20 files changed, 23 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 7309f56..f680560 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
<build>
<plugins>
@@ -49,8 +49,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>apache-lens-2.5.0-beta</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 76323af..e4a89ff 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index a2d33e6..bfa6f06 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 4e4ccce..4fd01fb 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 98fcde2..0533f44 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 1d8a882..2e180ac 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-driver-es/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-es/pom.xml b/lens-driver-es/pom.xml
index 795f2b6..89736ab 100644
--- a/lens-driver-es/pom.xml
+++ b/lens-driver-es/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-es</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index c3dc215..e80fab8 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 86e4172..0dd0fb5 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 683d688..c97392e 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index 7357d3f..d2dd2de 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index c9fe9ec..0472b70 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 9075bcb..29dbbe1 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 4691fea..1943ab2 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index d559999..8304279 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 373e02a..8dba837 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-ship-jars/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml
index edfd005..651bba8 100644
--- a/lens-ship-jars/pom.xml
+++ b/lens-ship-jars/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-ship-jars</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 034909f..ed58341 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/lens-ui/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ui/pom.xml b/lens-ui/pom.xml
index a8134fc..6639f97 100644
--- a/lens-ui/pom.xml
+++ b/lens-ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</parent>
<artifactId>lens-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/911a6f92/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ccc61e..bc81d81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -356,7 +356,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/lens.git</url>
- <tag>apache-lens-2.5.0-beta</tag>
+ <tag>HEAD</tag>
</scm>
<reporting>
@@ -685,7 +685,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1703,7 +1703,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.5.0-beta</version>
+ <version>2.6.0-beta-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>