You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2015/07/16 11:54:03 UTC
[1/6] incubator-lens git commit: LENS-637 : Fix jline dependency in
ml-dist
Repository: incubator-lens
Updated Branches:
refs/heads/master 7f4d793fb -> 9cfb4fef4
LENS-637 : Fix jline dependency in ml-dist
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/787c4f96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/787c4f96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/787c4f96
Branch: refs/heads/master
Commit: 787c4f96deac3fa42eb24dd39087f6a348ea670e
Parents: b0edfb9
Author: Varadharajan <sr...@gmail.com>
Authored: Mon Jun 29 14:05:59 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Jun 29 14:09:49 2015 +0530
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/787c4f96/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ec782af..364293d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1162,6 +1162,12 @@
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId>
<version>${spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jline</artifactId>
+ <groupId>jline</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
[4/6] incubator-lens git commit: [maven-release-plugin] prepare
release apache-lens-2.2.0-beta-incubating
Posted by am...@apache.org.
[maven-release-plugin] prepare release apache-lens-2.2.0-beta-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/9c45f1cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/9c45f1cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/9c45f1cb
Branch: refs/heads/master
Commit: 9c45f1cb4c69ec5de6fe3320abdd5bd85c250e9f
Parents: f85e2c2
Author: jdhok <jd...@apache.org>
Authored: Tue Jul 7 16:50:23 2015 +0530
Committer: jdhok <jd...@apache.org>
Committed: Tue Jul 7 16:50:23 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 9 ++++++---
lens-api/pom.xml | 5 ++---
lens-cli/pom.xml | 5 ++---
lens-client/pom.xml | 5 ++---
lens-cube/pom.xml | 5 ++---
lens-dist/pom.xml | 5 ++---
lens-driver-hive/pom.xml | 5 ++---
lens-driver-jdbc/pom.xml | 20 +++++++++-----------
lens-examples/pom.xml | 5 ++---
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 5 ++---
lens-query-lib/pom.xml | 5 ++---
lens-regression/pom.xml | 5 ++---
lens-server-api/pom.xml | 5 ++---
lens-server/pom.xml | 22 ++++++++++------------
lens-storage-db/pom.xml | 5 ++---
pom.xml | 11 +++++------
17 files changed, 55 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 9bbbe6c..cd45d00 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
<build>
<plugins>
@@ -50,4 +49,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>apache-lens-2.2.0-beta-incubating</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 184f8a8..250102d 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens API</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 7b98523..26d34d7 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens CLI</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 540c203..708c399 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -19,13 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 47601c1..eb750e1 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Cube</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 8581362..b5c6b6c 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Distribution</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index d156d0c..cebed79 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Hive Driver</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 380b16a..e73895d 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Driver for JDBC</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
@@ -103,17 +102,16 @@
</goals>
<configuration>
<target>
- <property name="build.compiler" value="extJavac"/>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <mkdir dir="${project.build.directory}/additional-classes"/>
- <javac includeantruntime="false" srcdir="src/additional/java"
- destdir="${project.build.directory}/additional-classes" classpath="${compile_classpath}"/>
- <mkdir dir="${project.build.directory}/testjars"/>
+ <property name="build.compiler" value="extJavac" />
+ <property name="compile_classpath" refid="maven.compile.classpath" />
+ <mkdir dir="${project.build.directory}/additional-classes" />
+ <javac includeantruntime="false" srcdir="src/additional/java" destdir="${project.build.directory}/additional-classes" classpath="${compile_classpath}" />
+ <mkdir dir="${project.build.directory}/testjars" />
<jar destfile="${project.build.directory}/testjars/test.jar">
- <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass.class"/>
+ <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass.class" />
</jar>
<jar destfile="${project.build.directory}/testjars/serde.jar">
- <fileset dir="${project.build.directory}/additional-classes" includes="DatabaseJarSerde.class"/>
+ <fileset dir="${project.build.directory}/additional-classes" includes="DatabaseJarSerde.class" />
</jar>
</target>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index aae70a4..e9ae2a8 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Examples</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index 26be98d..d7b69f5 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.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 63d72da..32a3be8 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens ML Lib</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 05c42b0..6a7837f 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Query Library</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 59d1284..5679a72 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Regression</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 45ea8e4..09871f4 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -19,13 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 1a90f69..e436e32 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Server</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<properties>
@@ -289,20 +288,19 @@
</goals>
<configuration>
<target>
- <property name="build.compiler" value="extJavac"/>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <mkdir dir="${project.build.directory}/additional-classes"/>
- <javac includeantruntime="false" srcdir="src/additional/java"
- destdir="${project.build.directory}/additional-classes" classpath="${compile_classpath}"/>
- <mkdir dir="${project.build.directory}/testjars"/>
+ <property name="build.compiler" value="extJavac" />
+ <property name="compile_classpath" refid="maven.compile.classpath" />
+ <mkdir dir="${project.build.directory}/additional-classes" />
+ <javac includeantruntime="false" srcdir="src/additional/java" destdir="${project.build.directory}/additional-classes" classpath="${compile_classpath}" />
+ <mkdir dir="${project.build.directory}/testjars" />
<jar destfile="${project.build.directory}/testjars/test.jar">
- <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass.class"/>
+ <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass.class" />
</jar>
<jar destfile="${project.build.directory}/testjars/test2.jar">
- <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass2.class"/>
+ <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass2.class" />
</jar>
<jar destfile="${project.build.directory}/testjars/serde.jar">
- <fileset dir="${project.build.directory}/additional-classes" includes="DatabaseJarSerde.class"/>
+ <fileset dir="${project.build.directory}/additional-classes" includes="DatabaseJarSerde.class" />
</jar>
</target>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index baca606..ce27408 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -19,15 +19,14 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens DB storage</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9c45f1cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a937dda..e665568 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,7 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -115,7 +114,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -300,7 +299,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-lens.git</url>
- <tag>HEAD</tag>
+ <tag>apache-lens-2.2.0-beta-incubating</tag>
</scm>
<reporting>
@@ -575,7 +574,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</dependency>
</dependencies>
<executions>
@@ -1323,7 +1322,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.2.0-beta-incubating-SNAPSHOT</version>
+ <version>2.2.0-beta-incubating</version>
</dependency>
</dependencies>
<executions>
[3/6] incubator-lens git commit: LENS-626 : Update release
documentation for 2.2-beta release
Posted by am...@apache.org.
LENS-626 : Update release documentation for 2.2-beta release
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/f85e2c20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/f85e2c20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/f85e2c20
Branch: refs/heads/master
Commit: f85e2c20be410224c967da13a7e5c7ee259223c0
Parents: 50c3617
Author: Jaideep Dhok <jd...@apache.org>
Authored: Mon Jul 6 16:21:54 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Jul 6 16:40:37 2015 +0530
----------------------------------------------------------------------
src/site/apt/releases/download.apt | 2 +-
src/site/apt/releases/release-history.apt | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f85e2c20/src/site/apt/releases/download.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/download.apt b/src/site/apt/releases/download.apt
index 2c99186..e9d4821 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.cgi/incubator/lens/2.1-beta-incubating}downloaded from the ASF}}.
+ {{{http://www.apache.org/dyn/closer.cgi/incubator/lens/2.2-beta-incubating}downloaded from the ASF}}.
Older releases may be found {{{http://archive.apache.org/dist/incubator/lens} in the archives}}.
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/f85e2c20/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 82625c7..58ac279 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.2.0-beta-incubating| CLI Improvements, Support for multiple expressions and and union queries, More descriptive error codes, Zeppelin integration, Code cleanup| {{{../versions/2.2.0-beta-incubating/index.html} 2.2.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12329586&projectId=12315923} 2.2 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.2-beta-incubating/} Download}} | {{{#a2.2.x_from_2.1.x} 2.2.x-incompatibilities}} | - |
+*--+--+---+--+--+--+--+
|2.1.0-beta-incubating| Estimate api, Partition timeline, DB resources, Timers on REST api| {{{../versions/2.1.0-beta-incubating/index.html} 2.1.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328991} 2.1 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.1-beta-incubating/} Download}} | {{{#a2.1.x_from_2.0.x} 2.1.x-incompatibilities}} | - |
*--+--+---+--+--+--+--+
|2.0.1-beta-incubating| First release in Apache| {{{../versions/2.0.1-beta-incubating/index.html} 2.0.x-incubating docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12328990} 2.0 release notes}}| {{{http://archive.apache.org/dist/incubator/lens/2.0-beta-incubating/} Download}} | - | - |
@@ -36,6 +38,27 @@ All Apache Lens releases
* Incompatibilities
+** 2.2.x from 2.1.x
+
+ * LENS-484 : Fact table weight is a mandatory field now, for creating facts from the web interface. Please refer to
+ cube xsd for further details.
+
+ * LENS-553 : Java compilation version moved to Java 7 from Java 6.
+
+ * LENS-546 : Parameter names in Lens CLI will have _ (underscore) instead of - (hyphen) as a separator
+
+ * LENS-256 : Use explicit keywords for different parameter names in Lens-CLI
+
+ * LENS-486 : More structured and informative error responses for the REST interface
+
+ * LENS-487 : Consistent error response display in Lens-CLI. The output shown is different than the previous version.
+
+ * LENS-550 : Removed support for multi table select in cube queries
+
+ * LENS-563 : There was a length limitation of the property value of string that specified 'valid' column list for
+ a fact table. This change has fixed the length limitation by allowing users to set a size parameter, and multiple
+ numerically indexed keys for specifying the bigger column list.
+
** 2.1.x from 2.0.x
* LENS-437 : Removed counts and weights from QueryPlan. The values are no longer available. If any usecase requires
[5/6] incubator-lens git commit: [maven-release-plugin] prepare for
next development iteration
Posted by am...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/68166c97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/68166c97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/68166c97
Branch: refs/heads/master
Commit: 68166c97854384f6ad04407bc15398e00791493b
Parents: 9c45f1c
Author: jdhok <jd...@apache.org>
Authored: Tue Jul 7 16:50:58 2015 +0530
Committer: jdhok <jd...@apache.org>
Committed: Tue Jul 7 16:50:58 2015 +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-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-storage-db/pom.xml | 2 +-
pom.xml | 8 ++++----
17 files changed, 20 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index cd45d00..b57a2f7 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
<build>
<plugins>
@@ -49,8 +49,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>apache-lens-2.2.0-beta-incubating</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 250102d..c3f7fb7 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 26d34d7..cb83eeb 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 708c399..d22e9de 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index eb750e1..74be429 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index b5c6b6c..43ddc1c 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index cebed79..4489779 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index e73895d..4d884d4 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index e9ae2a8..75b58cc 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index d7b69f5..6130a50 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 32a3be8..aad2c0d 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 6a7837f..2100d84 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 5679a72..14148ff 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 09871f4..fe66040 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index e436e32..c7df0a1 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index ce27408..0c6886b 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.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/68166c97/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e665568..ce24f1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -299,7 +299,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/incubator-lens.git</url>
- <tag>apache-lens-2.2.0-beta-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<reporting>
@@ -574,7 +574,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1322,7 +1322,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.2.0-beta-incubating</version>
+ <version>2.2.1-beta-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
[2/6] incubator-lens git commit: LENS-350 : Remove test jars from
source code dist (amareshwari)
Posted by am...@apache.org.
LENS-350 : Remove test jars from source code dist (amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/50c36175
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/50c36175
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/50c36175
Branch: refs/heads/master
Commit: 50c3617537244feba185aab03c2c9441871f2ac8
Parents: 787c4f9
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Mon Jul 6 10:33:16 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Jul 6 10:33:50 2015 +0530
----------------------------------------------------------------------
lens-driver-jdbc/pom.xml | 33 +++++++++++++++++
.../additional/java/ClassLoaderTestClass.java | 23 ++++++++++++
.../src/additional/java/DatabaseJarSerde.java | 36 +++++++++++++++++++
.../driver/jdbc/TestColumnarSQLRewriter.java | 2 +-
.../testdata/ClassLoaderTestClass.java | 23 ------------
.../testdata/ClassLoaderTestClass2.java | 23 ------------
lens-driver-jdbc/testdata/DatabaseJarSerde.java | 36 -------------------
lens-driver-jdbc/testdata/serde.jar | Bin 733 -> 0 bytes
lens-driver-jdbc/testdata/test.jar | Bin 726 -> 0 bytes
lens-driver-jdbc/testdata/test2.jar | Bin 700 -> 0 bytes
lens-ml-lib/testjars/serde.jar | Bin 1369 -> 0 bytes
lens-ml-lib/testjars/test.jar | Bin 697 -> 0 bytes
lens-server/pom.xml | 32 +++++++++++++++++
.../additional/java/ClassLoaderTestClass.java | 23 ++++++++++++
.../additional/java/ClassLoaderTestClass2.java | 23 ++++++++++++
.../src/additional/java/DatabaseJarSerde.java | 36 +++++++++++++++++++
.../org/apache/lens/server/LensTestUtil.java | 9 +++--
.../lens/server/query/TestQueryService.java | 2 +-
.../server/session/TestSessionClassLoaders.java | 2 +-
lens-server/src/test/resources/log4j.properties | 8 ++---
lens-server/testdata/ClassLoaderTestClass.java | 23 ------------
lens-server/testdata/ClassLoaderTestClass2.java | 23 ------------
lens-server/testdata/DatabaseJarSerde.java | 36 -------------------
lens-server/testdata/serde.jar | Bin 1033 -> 0 bytes
lens-server/testdata/test.jar | Bin 726 -> 0 bytes
lens-server/testdata/test2.jar | Bin 700 -> 0 bytes
pom.xml | 8 +++--
27 files changed, 226 insertions(+), 175 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 615410b..380b16a 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -89,4 +89,37 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-test-additional-jars</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <property name="build.compiler" value="extJavac"/>
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <mkdir dir="${project.build.directory}/additional-classes"/>
+ <javac includeantruntime="false" srcdir="src/additional/java"
+ destdir="${project.build.directory}/additional-classes" classpath="${compile_classpath}"/>
+ <mkdir dir="${project.build.directory}/testjars"/>
+ <jar destfile="${project.build.directory}/testjars/test.jar">
+ <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass.class"/>
+ </jar>
+ <jar destfile="${project.build.directory}/testjars/serde.jar">
+ <fileset dir="${project.build.directory}/additional-classes" includes="DatabaseJarSerde.class"/>
+ </jar>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/src/additional/java/ClassLoaderTestClass.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/additional/java/ClassLoaderTestClass.java b/lens-driver-jdbc/src/additional/java/ClassLoaderTestClass.java
new file mode 100644
index 0000000..b295133
--- /dev/null
+++ b/lens-driver-jdbc/src/additional/java/ClassLoaderTestClass.java
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/** Test class which is added to test2.jar used in TestDatabaseResourceService */
+public class ClassLoaderTestClass {
+ public static final boolean TEST_FIELD = true;
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/src/additional/java/DatabaseJarSerde.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/additional/java/DatabaseJarSerde.java b/lens-driver-jdbc/src/additional/java/DatabaseJarSerde.java
new file mode 100644
index 0000000..4fd98c9
--- /dev/null
+++ b/lens-driver-jdbc/src/additional/java/DatabaseJarSerde.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.hadoop.hive.serde2.SerDeException;
+import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+
+/**
+ * Simple serde used during test of database jar
+ */
+public class DatabaseJarSerde extends LazySimpleSerDe {
+ // This should load class from test.jar
+ public static final ClassLoaderTestClass testClassInstance = new ClassLoaderTestClass();
+ static {
+ System.out.println("@@@@ SUCCESSFULLY_LOADED CLASS " + DatabaseJarSerde.class);
+ }
+
+ public DatabaseJarSerde() throws SerDeException {
+ super();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
index 6d35b80..db554f4 100644
--- a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
+++ b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
@@ -803,7 +803,7 @@ public class TestColumnarSQLRewriter {
*/
@Test
public void testReplaceDBName() throws Exception {
- File jarDir = new File("testdata");
+ File jarDir = new File("target/testjars");
File testJarFile = new File(jarDir, "test.jar");
File serdeJarFile = new File(jarDir, "serde.jar");
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/testdata/ClassLoaderTestClass.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/ClassLoaderTestClass.java b/lens-driver-jdbc/testdata/ClassLoaderTestClass.java
deleted file mode 100644
index b295133..0000000
--- a/lens-driver-jdbc/testdata/ClassLoaderTestClass.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/** Test class which is added to test2.jar used in TestDatabaseResourceService */
-public class ClassLoaderTestClass {
- public static final boolean TEST_FIELD = true;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/testdata/ClassLoaderTestClass2.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/ClassLoaderTestClass2.java b/lens-driver-jdbc/testdata/ClassLoaderTestClass2.java
deleted file mode 100644
index 2c4e5a0..0000000
--- a/lens-driver-jdbc/testdata/ClassLoaderTestClass2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/** Test class which is added to test2.jar used in TestDatabaseResourceService */
-public class ClassLoaderTestClass2 {
- public static final boolean TEST_FIELD = true;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/testdata/DatabaseJarSerde.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/DatabaseJarSerde.java b/lens-driver-jdbc/testdata/DatabaseJarSerde.java
deleted file mode 100644
index 4fd98c9..0000000
--- a/lens-driver-jdbc/testdata/DatabaseJarSerde.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-
-/**
- * Simple serde used during test of database jar
- */
-public class DatabaseJarSerde extends LazySimpleSerDe {
- // This should load class from test.jar
- public static final ClassLoaderTestClass testClassInstance = new ClassLoaderTestClass();
- static {
- System.out.println("@@@@ SUCCESSFULLY_LOADED CLASS " + DatabaseJarSerde.class);
- }
-
- public DatabaseJarSerde() throws SerDeException {
- super();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/testdata/serde.jar
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/serde.jar b/lens-driver-jdbc/testdata/serde.jar
deleted file mode 100644
index b4c0500..0000000
Binary files a/lens-driver-jdbc/testdata/serde.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/testdata/test.jar
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/test.jar b/lens-driver-jdbc/testdata/test.jar
deleted file mode 100644
index bd0aa60..0000000
Binary files a/lens-driver-jdbc/testdata/test.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-driver-jdbc/testdata/test2.jar
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/testdata/test2.jar b/lens-driver-jdbc/testdata/test2.jar
deleted file mode 100644
index 8f54d8d..0000000
Binary files a/lens-driver-jdbc/testdata/test2.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-ml-lib/testjars/serde.jar
----------------------------------------------------------------------
diff --git a/lens-ml-lib/testjars/serde.jar b/lens-ml-lib/testjars/serde.jar
deleted file mode 100644
index ec86e49..0000000
Binary files a/lens-ml-lib/testjars/serde.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-ml-lib/testjars/test.jar
----------------------------------------------------------------------
diff --git a/lens-ml-lib/testjars/test.jar b/lens-ml-lib/testjars/test.jar
deleted file mode 100644
index 1644d8c..0000000
Binary files a/lens-ml-lib/testjars/test.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index bb12e00..1a90f69 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -278,6 +278,38 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-test-additional-jars</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <property name="build.compiler" value="extJavac"/>
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <mkdir dir="${project.build.directory}/additional-classes"/>
+ <javac includeantruntime="false" srcdir="src/additional/java"
+ destdir="${project.build.directory}/additional-classes" classpath="${compile_classpath}"/>
+ <mkdir dir="${project.build.directory}/testjars"/>
+ <jar destfile="${project.build.directory}/testjars/test.jar">
+ <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass.class"/>
+ </jar>
+ <jar destfile="${project.build.directory}/testjars/test2.jar">
+ <fileset dir="${project.build.directory}/additional-classes" includes="ClassLoaderTestClass2.class"/>
+ </jar>
+ <jar destfile="${project.build.directory}/testjars/serde.jar">
+ <fileset dir="${project.build.directory}/additional-classes" includes="DatabaseJarSerde.class"/>
+ </jar>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/src/additional/java/ClassLoaderTestClass.java
----------------------------------------------------------------------
diff --git a/lens-server/src/additional/java/ClassLoaderTestClass.java b/lens-server/src/additional/java/ClassLoaderTestClass.java
new file mode 100644
index 0000000..b295133
--- /dev/null
+++ b/lens-server/src/additional/java/ClassLoaderTestClass.java
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/** Test class which is added to test2.jar used in TestDatabaseResourceService */
+public class ClassLoaderTestClass {
+ public static final boolean TEST_FIELD = true;
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/src/additional/java/ClassLoaderTestClass2.java
----------------------------------------------------------------------
diff --git a/lens-server/src/additional/java/ClassLoaderTestClass2.java b/lens-server/src/additional/java/ClassLoaderTestClass2.java
new file mode 100644
index 0000000..2c4e5a0
--- /dev/null
+++ b/lens-server/src/additional/java/ClassLoaderTestClass2.java
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/** Test class which is added to test2.jar used in TestDatabaseResourceService */
+public class ClassLoaderTestClass2 {
+ public static final boolean TEST_FIELD = true;
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/src/additional/java/DatabaseJarSerde.java
----------------------------------------------------------------------
diff --git a/lens-server/src/additional/java/DatabaseJarSerde.java b/lens-server/src/additional/java/DatabaseJarSerde.java
new file mode 100644
index 0000000..4fd98c9
--- /dev/null
+++ b/lens-server/src/additional/java/DatabaseJarSerde.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.hadoop.hive.serde2.SerDeException;
+import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+
+/**
+ * Simple serde used during test of database jar
+ */
+public class DatabaseJarSerde extends LazySimpleSerDe {
+ // This should load class from test.jar
+ public static final ClassLoaderTestClass testClassInstance = new ClassLoaderTestClass();
+ static {
+ System.out.println("@@@@ SUCCESSFULLY_LOADED CLASS " + DatabaseJarSerde.class);
+ }
+
+ public DatabaseJarSerde() throws SerDeException {
+ super();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java b/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
index fbf524d..75a5c0f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
+++ b/lens-server/src/test/java/org/apache/lens/server/LensTestUtil.java
@@ -249,6 +249,11 @@ public final class LensTestUtil {
}
public static void createTestDatabaseResources(String[] testDatabases, HiveConf conf) throws Exception {
+ File srcJarDir = new File("target/testjars/");
+ if (!srcJarDir.exists()) {
+ // nothing to setup
+ return;
+ }
File resDir = new File("target/resources");
if (!resDir.exists()) {
resDir.mkdir();
@@ -256,8 +261,8 @@ public final class LensTestUtil {
// Create databases and resource dirs
Hive hive = Hive.get(conf);
- File testJarFile = new File("testdata/test.jar");
- File serdeJarFile = new File("testdata/serde.jar");
+ File testJarFile = new File("target/testjars/test.jar");
+ File serdeJarFile = new File("target/testjars/serde.jar");
for (String db : testDatabases) {
Database database = new Database();
database.setName(db);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
index 655549b..17305e2 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
@@ -1342,7 +1342,7 @@ public class TestQueryService extends LensJerseyTest {
sessionService.openSession("foo@localhost", "bar", LensTestUtil.DB_WITH_JARS, new HashMap<String, String>());
// Add a jar in the session
- File testJarFile = new File("testdata/test2.jar");
+ File testJarFile = new File("target/testjars/test2.jar");
sessionService.addResourceToAllServices(sessionHandle, "jar", "file://" + testJarFile.getAbsolutePath());
log.info("@@@ Opened session " + sessionHandle.getPublicId() + " with database " + LensTestUtil.DB_WITH_JARS);
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
index 7dd4486..9a79e65 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionClassLoaders.java
@@ -154,7 +154,7 @@ public class TestSessionClassLoaders {
LensSessionImpl session = sessionService.getSession(sessionHandle);
session.setDbResService(sessionService.getDatabaseResourceService());
- File sessionJar = new File("testdata/test2.jar");
+ File sessionJar = new File("target/testjars/test2.jar");
String sessionJarLocation = "file://" + sessionJar.getAbsolutePath();
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/lens-server/src/test/resources/log4j.properties b/lens-server/src/test/resources/log4j.properties
index e62afe1..e0f9daa 100644
--- a/lens-server/src/test/resources/log4j.properties
+++ b/lens-server/src/test/resources/log4j.properties
@@ -18,9 +18,9 @@
#
# Configuration for loggers
-log4j.rootLogger=ERROR, STDOUT, TEST_LOG_FILE
+log4j.rootLogger=INFO, STDOUT, TEST_LOG_FILE
-log4j.logger.org.apache.lens=ERROR, STDOUT, TEST_LOG_FILE
+log4j.logger.org.apache.lens=INFO, STDOUT, TEST_LOG_FILE
log4j.additivity.org.apache.lens=false
# org.apache.lens.server.stats.TestLogStatisticsStore$MyLoggableLens logger has to run at INFO level for
@@ -32,10 +32,10 @@ log4j.additivity.org.apache.lens.server.stats.TestLogStatisticsStore$MyLoggableL
log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
log4j.appender.STDOUT.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%X{logSegregationId}] [%t] %-5p %c %x - %m%n
-log4j.appender.STDOUT.Threshold=ERROR
+log4j.appender.STDOUT.Threshold=INFO
log4j.appender.TEST_LOG_FILE=org.apache.log4j.RollingFileAppender
log4j.appender.TEST_LOG_FILE.File=target/test.log
log4j.appender.TEST_LOG_FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.TEST_LOG_FILE.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %X{logSegregationId} [%t] %-5p %c %x - %m%n
-log4j.appender.TEST_LOG_FILE.Threshold=ERROR
+log4j.appender.TEST_LOG_FILE.Threshold=INFO
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/testdata/ClassLoaderTestClass.java
----------------------------------------------------------------------
diff --git a/lens-server/testdata/ClassLoaderTestClass.java b/lens-server/testdata/ClassLoaderTestClass.java
deleted file mode 100644
index b295133..0000000
--- a/lens-server/testdata/ClassLoaderTestClass.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/** Test class which is added to test2.jar used in TestDatabaseResourceService */
-public class ClassLoaderTestClass {
- public static final boolean TEST_FIELD = true;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/testdata/ClassLoaderTestClass2.java
----------------------------------------------------------------------
diff --git a/lens-server/testdata/ClassLoaderTestClass2.java b/lens-server/testdata/ClassLoaderTestClass2.java
deleted file mode 100644
index 2c4e5a0..0000000
--- a/lens-server/testdata/ClassLoaderTestClass2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/** Test class which is added to test2.jar used in TestDatabaseResourceService */
-public class ClassLoaderTestClass2 {
- public static final boolean TEST_FIELD = true;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/testdata/DatabaseJarSerde.java
----------------------------------------------------------------------
diff --git a/lens-server/testdata/DatabaseJarSerde.java b/lens-server/testdata/DatabaseJarSerde.java
deleted file mode 100644
index 4fd98c9..0000000
--- a/lens-server/testdata/DatabaseJarSerde.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-
-/**
- * Simple serde used during test of database jar
- */
-public class DatabaseJarSerde extends LazySimpleSerDe {
- // This should load class from test.jar
- public static final ClassLoaderTestClass testClassInstance = new ClassLoaderTestClass();
- static {
- System.out.println("@@@@ SUCCESSFULLY_LOADED CLASS " + DatabaseJarSerde.class);
- }
-
- public DatabaseJarSerde() throws SerDeException {
- super();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/testdata/serde.jar
----------------------------------------------------------------------
diff --git a/lens-server/testdata/serde.jar b/lens-server/testdata/serde.jar
deleted file mode 100644
index 01e6d7c..0000000
Binary files a/lens-server/testdata/serde.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/testdata/test.jar
----------------------------------------------------------------------
diff --git a/lens-server/testdata/test.jar b/lens-server/testdata/test.jar
deleted file mode 100644
index a5baa57..0000000
Binary files a/lens-server/testdata/test.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/lens-server/testdata/test2.jar
----------------------------------------------------------------------
diff --git a/lens-server/testdata/test2.jar b/lens-server/testdata/test2.jar
deleted file mode 100644
index 8f54d8d..0000000
Binary files a/lens-server/testdata/test2.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/50c36175/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 364293d..a937dda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
<license.plugin.version>2.6</license.plugin.version>
<buildnumber.plugin.version>1.0</buildnumber.plugin.version>
<findbugs.plugin.version>3.0.1</findbugs.plugin.version>
- <antrun.plugin.version>1.7</antrun.plugin.version>
+ <antrun.plugin.version>1.8</antrun.plugin.version>
<cobertura.plugin.version>2.7</cobertura.plugin.version>
<!-- debian -->
@@ -436,6 +436,11 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${antrun.plugin.version}</version>
+ </plugin>
+ <plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<version>${jdeb.plugin.version}</version>
@@ -1277,7 +1282,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.plugin.version}</version>
<executions>
<execution>
<phase>process-classes</phase>
[6/6] incubator-lens git commit: Reverse merge current-release-line
Posted by am...@apache.org.
Reverse merge current-release-line
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/9cfb4fef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/9cfb4fef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/9cfb4fef
Branch: refs/heads/master
Commit: 9cfb4fef431830c3fb1ce7496c2543c58b9252ad
Parents: 7f4d793 68166c9
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Thu Jul 16 15:23:39 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Jul 16 15:23:39 2015 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 3 +--
lens-api/pom.xml | 3 +--
lens-cli/pom.xml | 3 +--
lens-client/pom.xml | 3 +--
lens-cube/pom.xml | 3 +--
lens-dist/pom.xml | 3 +--
lens-driver-hive/pom.xml | 3 +--
lens-driver-jdbc/pom.xml | 3 +--
lens-examples/pom.xml | 3 +--
lens-ml-lib/pom.xml | 3 +--
lens-query-lib/pom.xml | 3 +--
lens-regression/pom.xml | 3 +--
lens-server-api/pom.xml | 3 +--
lens-server/pom.xml | 3 +--
lens-storage-db/pom.xml | 3 +--
pom.xml | 3 +--
16 files changed, 16 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/checkstyle/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-api/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-cli/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-client/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-cube/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-dist/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-driver-hive/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-examples/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-ml-lib/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-query-lib/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-regression/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-server-api/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/lens-storage-db/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/9cfb4fef/pom.xml
----------------------------------------------------------------------