You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2019/06/11 22:52:30 UTC
[incubator-datasketches-java] branch master updated (ebae8c3 ->
76e3988)
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git.
from ebae8c3 [maven-release-plugin] prepare for next development iteration
new b3129d0 Update POM
new 76e3988 Merge branch 'master' of git@github.com:apache/incubator-datasketches-java.git
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-java] 01/02: Update POM
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git
commit b3129d03cc25a79499d681c6fdeb0e3e3ea05bf6
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Tue Jun 11 15:49:38 2019 -0700
Update POM
---
pom.xml | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5be3d06..b692605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015, Yahoo! Inc.
- Licensed under the terms of the Apache License 2.0.
- See LICENSE file at the project root for terms. -->
+<!--
+ ~ 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.
+ -->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.yahoo.datasketches</groupId>
- <artifactId>sketches-core</artifactId>
+ <groupId>org.apache.datasketches</groupId>
+ <artifactId>datasketches-java</artifactId>
<packaging>jar</packaging> <!-- jar is the default -->
<version>0.13.4-SNAPSHOT</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-java] 02/02: Merge branch 'master' of
git@github.com:apache/incubator-datasketches-java.git
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git
commit 76e3988c01d522d9d10467793b0ebb6b949a2a92
Merge: b3129d0 ebae8c3
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Tue Jun 11 15:50:54 2019 -0700
Merge branch 'master' of git@github.com:apache/incubator-datasketches-java.git
pom.xml | 2 +-
.../theta/ConcurrentDirectQuickSelectSketch.java | 14 ++--
.../theta/ConcurrentHeapQuickSelectSketch.java | 17 +++--
src/main/java/com/yahoo/sketches/theta/Sketch.java | 3 +-
.../java/com/yahoo/sketches/theta/UnionImpl.java | 79 +++++++++++++---------
.../yahoo/sketches/theta/UpdateSketchBuilder.java | 57 ++++++++++------
.../ConcurrentDirectQuickSelectSketchTest.java | 9 +++
.../com/yahoo/sketches/theta/DirectUnionTest.java | 26 +++++++
8 files changed, 139 insertions(+), 68 deletions(-)
diff --cc pom.xml
index b692605,83d0916..93a007f
--- a/pom.xml
+++ b/pom.xml
@@@ -21,10 -6,10 +21,10 @@@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.yahoo.datasketches</groupId>
- <artifactId>sketches-core</artifactId>
+ <groupId>org.apache.datasketches</groupId>
+ <artifactId>datasketches-java</artifactId>
<packaging>jar</packaging> <!-- jar is the default -->
- <version>0.13.4-SNAPSHOT</version>
+ <version>0.13.5-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>Core sketch algorithms used alone and by other repositories in the DataSketches library.</description>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org