You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/06/08 16:50:36 UTC
[1/2] tinkerpop git commit: Added Apache License to archtype dsl pom
CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 2ef70ef53 -> 512ca3a7d
Added Apache License to archtype dsl pom CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/030f5561
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/030f5561
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/030f5561
Branch: refs/heads/master
Commit: 030f556172619999f3fa45674c2024dae1fae724
Parents: e00b5d4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 8 12:47:48 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 8 12:47:48 2017 -0400
----------------------------------------------------------------------
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/030f5561/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index cecdc28..d1f0ea4 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -1,11 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>gremlin-archetype</artifactId>
<groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-archetype</artifactId>
<version>3.2.5-SNAPSHOT</version>
</parent>
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Conflicts:
gremlin-archetype/gremlin-archetype-dsl/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/512ca3a7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/512ca3a7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/512ca3a7
Branch: refs/heads/master
Commit: 512ca3a7d165ac56c31b5215412b4d918de28f62
Parents: 2ef70ef 030f556
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 8 12:49:42 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 8 12:49:42 2017 -0400
----------------------------------------------------------------------
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/512ca3a7/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --cc gremlin-archetype/gremlin-archetype-dsl/pom.xml
index f5c8049,d1f0ea4..c52bc75
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@@ -4,9 -19,9 +19,9 @@@ limitations under the License
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>gremlin-archetype</artifactId>
<groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-archetype</artifactId>
- <version>3.2.5-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-dsl</artifactId>