Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1E186200BAC for ; Wed, 26 Oct 2016 13:35:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1CC63160B07; Wed, 26 Oct 2016 11:35:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 46CD7160ACA for ; Wed, 26 Oct 2016 13:35:33 +0200 (CEST) Received: (qmail 58027 invoked by uid 500); 26 Oct 2016 11:35:32 -0000 Mailing-List: contact commits-help@commonsrdf.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commonsrdf.incubator.apache.org Delivered-To: mailing list commits@commonsrdf.incubator.apache.org Received: (qmail 57917 invoked by uid 99); 26 Oct 2016 11:35:32 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2016 11:35:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id CDF58180651 for ; Wed, 26 Oct 2016 11:35:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id VK1Rg22k3X8J for ; Wed, 26 Oct 2016 11:35:31 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 966295FC86 for ; Wed, 26 Oct 2016 11:35:29 +0000 (UTC) Received: (qmail 57082 invoked by uid 99); 26 Oct 2016 11:35:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2016 11:35:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CC88DFA3E; Wed, 26 Oct 2016 11:35:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stain@apache.org To: commits@commonsrdf.incubator.apache.org Date: Wed, 26 Oct 2016 11:35:59 -0000 Message-Id: In-Reply-To: <79f4c1e3004742eb84ed29d28b59c3f4@git.apache.org> References: <79f4c1e3004742eb84ed29d28b59c3f4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration archived-at: Wed, 26 Oct 2016 11:35:34 -0000 Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0c110914 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0c110914 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0c110914 Branch: refs/heads/master Commit: 0c110914fbbb737d6cfc141e2d284d9c6f9281ba Parents: 68438f4 492ea23 Author: Stian Soiland-Reyes Authored: Wed Sep 28 14:49:51 2016 +0100 Committer: Stian Soiland-Reyes Committed: Wed Sep 28 14:49:51 2016 +0100 ---------------------------------------------------------------------- .../commons/rdf/jsonldjava/JsonLdBlankNode.java | 2 +- .../commons/rdf/jsonldjava/JsonLdDataset.java | 15 ++++++----- .../commons/rdf/jsonldjava/JsonLdGraph.java | 12 ++++++--- .../commons/rdf/jsonldjava/JsonLdGraphLike.java | 22 +++++++++++---- .../commons/rdf/jsonldjava/JsonLdIRI.java | 3 +-- .../commons/rdf/jsonldjava/JsonLdLiteral.java | 3 +-- .../commons/rdf/jsonldjava/JsonLdQuad.java | 7 ++--- .../commons/rdf/jsonldjava/JsonLdQuadLike.java | 2 +- .../rdf/jsonldjava/JsonLdRDFTermFactory.java | 28 +++++++++----------- .../commons/rdf/jsonldjava/JsonLdTerm.java | 3 ++- .../commons/rdf/jsonldjava/JsonLdTriple.java | 5 ++-- .../rdf/jsonldjava/JsonLdUnionGraph.java | 12 +++++---- 12 files changed, 65 insertions(+), 49 deletions(-) ----------------------------------------------------------------------