You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2019/03/05 15:19:08 UTC
[tinkerpop] branch tp4 updated: removed the pom.xml from the root
tinkerpop directory. the parent pom is now in java/. Added a stub of
documentation.
This is an automated email from the ASF dual-hosted git repository.
okram pushed a commit to branch tp4
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tp4 by this push:
new 6955151 removed the pom.xml from the root tinkerpop directory. the parent pom is now in java/. Added a stub of documentation.
6955151 is described below
commit 69551513260705860cebe05101ce0357a33d15b2
Author: Marko A. Rodriguez <ok...@gmail.com>
AuthorDate: Tue Mar 5 08:18:58 2019 -0700
removed the pom.xml from the root tinkerpop directory. the parent pom is now in java/. Added a stub of documentation.
---
docs/README.asciidoc | 1 +
java/pom.xml | 203 +++++++++++++++++++++++++++++++++++++++++++++--
pom.xml | 217 ---------------------------------------------------
3 files changed, 196 insertions(+), 225 deletions(-)
diff --git a/docs/README.asciidoc b/docs/README.asciidoc
new file mode 100644
index 0000000..c0f7435
--- /dev/null
+++ b/docs/README.asciidoc
@@ -0,0 +1 @@
+This is a stub of documentation.
\ No newline at end of file
diff --git a/java/pom.xml b/java/pom.xml
index f8f31ab..6ee5dd1 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -14,18 +14,205 @@ 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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ </parent>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkerpop</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>Apache TinkerPop</name>
+ <description>A Virtual Machine and Language</description>
+ <url>http://tinkerpop.apache.org/</url>
+ <mailingLists>
+ <mailingList>
+ <name>Users</name>
+ <subscribe>http://groups.google.com/group/gremlin-users</subscribe>
+ <unsubscribe>http://groups.google.com/group/gremlin-users</unsubscribe>
+ <archive>http://groups.google.com/group/gremlin-users/topics</archive>
+ </mailingList>
+ <mailingList>
+ <name>Developers</name>
+ <subscribe>dev-subscribe@tinkerpop.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@tinkerpop.apache.org</unsubscribe>
+ <archive>dev-digest-subscribe@tinkerpop.apache.org</archive>
+ </mailingList>
+ </mailingLists>
+ <inceptionYear>2019</inceptionYear>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.opensource.org/licenses/Apache-2.0</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <developers>
+ <developer>
+ <name>Marko A. Rodriguez</name>
+ <email>okram@apache.org</email>
+ <url>http://markorodriguez.com</url>
+ </developer>
+ </developers>
+ <prerequisites>
+ <maven>3.2.5</maven>
+ </prerequisites>
<modules>
<module>core</module>
<module>machine</module>
</modules>
- <parent>
- <artifactId>tinkerpop</artifactId>
- <groupId>org.apache.tinkerpop</groupId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
- <name>Apache TinkerPop :: Java</name>
- <artifactId>java</artifactId>
+ <scm>
+ <connection>scm:git:git@github.com:apache/tinkerpop.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/tinkerpop.git</developerConnection>
+ <url>https://github.com/apache/tinkerpop</url>
+ </scm>
+ <properties>
+ <junit.version>5.4.0</junit.version>
+ </properties>
+ <dependencies>
+ <!-- TESTING -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${basedir}/target</directory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce-all</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <DependencyConvergence/>
+ <requireJavaVersion>
+ <version>[11.0,)</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.2.5,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version>
+ <executions>
+ <execution>
+ <id>rat-checks</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>fileTemplates/</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
+ </licenses>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <source>11</source>
+ <target>11</target>
+ <compilerArgs>
+ <arg>-parameters</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <configuration>
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true
+ </argLine>
+ <excludes>
+ <exclude>**/*IntegrateTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.22.1</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/*IntegrateTest.java</include>
+ </includes>
+ <skipTests>${skipIntegrationTests}</skipTests>
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182
+ -Dbuild.dir=${project.build.directory} -Dis.testing=true
+ </argLine>
+ <summaryFile>target/failsafe-reports/failsafe-integration.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>verify-integration-test</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <skipTests>${skipIntegrationTests}</skipTests>
+ <summaryFiles>
+ <summaryFile>target/failsafe-reports/failsafe-integration.xml</summaryFile>
+ </summaryFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 59a3231..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,217 +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.
--->
-<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>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
- </parent>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>tinkerpop</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache TinkerPop</name>
- <description>A Virtual Machine and Language</description>
- <url>http://tinkerpop.apache.org/</url>
- <mailingLists>
- <mailingList>
- <name>Users</name>
- <subscribe>http://groups.google.com/group/gremlin-users</subscribe>
- <unsubscribe>http://groups.google.com/group/gremlin-users</unsubscribe>
- <archive>http://groups.google.com/group/gremlin-users/topics</archive>
- </mailingList>
- <mailingList>
- <name>Developers</name>
- <subscribe>dev-subscribe@tinkerpop.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@tinkerpop.apache.org</unsubscribe>
- <archive>dev-digest-subscribe@tinkerpop.apache.org</archive>
- </mailingList>
- </mailingLists>
- <inceptionYear>2019</inceptionYear>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.opensource.org/licenses/Apache-2.0</url>
- </license>
- </licenses>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <developers>
- <developer>
- <name>Marko A. Rodriguez</name>
- <email>okram@apache.org</email>
- <url>http://markorodriguez.com</url>
- </developer>
- </developers>
- <prerequisites>
- <maven>3.2.5</maven>
- </prerequisites>
- <modules>
- <module>java</module>
- </modules>
- <scm>
- <connection>scm:git:git@github.com:apache/tinkerpop.git</connection>
- <developerConnection>scm:git:git@github.com:apache/tinkerpop.git</developerConnection>
- <url>https://github.com/apache/tinkerpop</url>
- </scm>
- <properties>
- <junit.version>5.4.0</junit.version>
- </properties>
- <dependencies>
- <!-- TESTING -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <directory>${basedir}/target</directory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- <executions>
- <execution>
- <id>enforce-all</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <DependencyConvergence/>
- <requireJavaVersion>
- <version>[11.0,)</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.2.5,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
- <executions>
- <execution>
- <id>rat-checks</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <exclude>fileTemplates/</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/target/**</exclude>
- </excludes>
- <licenses>
- <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
- </licenses>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.1</version>
- <configuration>
- <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true
- </argLine>
- <excludes>
- <exclude>**/*IntegrateTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.1</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/*IntegrateTest.java</include>
- </includes>
- <skipTests>${skipIntegrationTests}</skipTests>
- <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182
- -Dbuild.dir=${project.build.directory} -Dis.testing=true
- </argLine>
- <summaryFile>target/failsafe-reports/failsafe-integration.xml</summaryFile>
- </configuration>
- </execution>
- <execution>
- <id>verify-integration-test</id>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <skipTests>${skipIntegrationTests}</skipTests>
- <summaryFiles>
- <summaryFile>target/failsafe-reports/failsafe-integration.xml</summaryFile>
- </summaryFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
\ No newline at end of file