Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin/v0.5.2'
  • Loading branch information
myui committed Dec 3, 2018
2 parents d8810de + 0e753f3 commit 3eb23242b33becbaf4611917c3b4f80b35edde1f
Show file tree
Hide file tree
Showing 21 changed files with 25 additions and 28 deletions.
@@ -1 +1 @@
0.5.2-incubating-SNAPSHOT
0.6.0-incubating-SNAPSHOT
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -20,7 +20,7 @@

public final class HivemallConstants {

public static final String VERSION = "0.5.2-incubating-SNAPSHOT";
public static final String VERSION = "0.6.0-incubating-SNAPSHOT";

public static final String BIAS_CLAUSE = "0";
public static final int BIAS_CLAUSE_HASHVAL = 0;
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -16,18 +16,17 @@
specific language governing permissions and 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>

<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>

<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>18</version>
<version>21</version>
</parent>

<name>Apache Hivemall</name>
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall-spark</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall-spark</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -35,7 +35,7 @@ final class HiveUdfWithFeatureSuite extends HivemallFeatureQueryTest {

checkAnswer(
sql(s"SELECT DISTINCT hivemall_version()"),
Row("0.5.2-incubating-SNAPSHOT")
Row("0.6.0-incubating-SNAPSHOT")
)

// sql("DROP TEMPORARY FUNCTION IF EXISTS hivemall_version")
@@ -295,7 +295,7 @@ final class HivemallOpsWithFeatureSuite extends HivemallFeatureQueryTest {
}

test("misc - hivemall_version") {
checkAnswer(DummyInputData.select(hivemall_version()), Row("0.5.2-incubating-SNAPSHOT"))
checkAnswer(DummyInputData.select(hivemall_version()), Row("0.6.0-incubating-SNAPSHOT"))
}

test("misc - rowid") {
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall-spark</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -36,7 +36,7 @@ final class HiveUdfWithFeatureSuite extends HivemallFeatureQueryTest {

checkAnswer(
sql(s"SELECT DISTINCT hivemall_version()"),
Row("0.5.2-incubating-SNAPSHOT")
Row("0.6.0-incubating-SNAPSHOT")
)

// sql("DROP TEMPORARY FUNCTION IF EXISTS hivemall_version")
@@ -562,7 +562,7 @@ class HivemallOpsWithFeatureSuite extends HivemallFeatureQueryTest {
}

test("misc - hivemall_version") {
checkAnswer(DummyInputData.select(hivemall_version()), Row("0.5.2-incubating-SNAPSHOT"))
checkAnswer(DummyInputData.select(hivemall_version()), Row("0.6.0-incubating-SNAPSHOT"))
}

test("misc - rowid") {
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall-spark</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -36,7 +36,7 @@ final class HiveUdfWithFeatureSuite extends HivemallFeatureQueryTest {

checkAnswer(
sql(s"SELECT DISTINCT hivemall_version()"),
Row("0.5.2-incubating-SNAPSHOT")
Row("0.6.0-incubating-SNAPSHOT")
)

// sql("DROP TEMPORARY FUNCTION IF EXISTS hivemall_version")
@@ -563,7 +563,7 @@ class HivemallOpsWithFeatureSuite extends HivemallFeatureQueryTest {
}

test("misc - hivemall_version") {
checkAnswer(DummyInputData.select(hivemall_version()), Row("0.5.2-incubating-SNAPSHOT"))
checkAnswer(DummyInputData.select(hivemall_version()), Row("0.6.0-incubating-SNAPSHOT"))
}

test("misc - rowid") {
@@ -16,15 +16,13 @@
specific language governing permissions and 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>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall-tools</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -136,7 +134,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.hivemall</groupId>
<artifactId>hivemall</artifactId>
<version>0.5.2-incubating-SNAPSHOT</version>
<version>0.6.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

0 comments on commit 3eb2324

Please sign in to comment.