Upstream merge

.travis.yml

@@ -0,0 +1,9 @@
+language: java
+jdk:
+    - openjdk9
+    - openjdk10
+    - openjdk14
+#    - oraclejdk9
+    - oraclejdk11
+notifications:
+    email: false

build.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="all">
+
+	<property name="dir.src" value="src" />
+	<property name="dir.src.main" value="src/main" />
+	<property name="dir.src.main.java" value="src/main/java" />
+	<property name="dir.src.main.resources" value="src/main/resources" />
+	<property name="dir.src.test" value="src/test" />
+	<property name="dir.src.test.java" value="src/test/java" />
+	<property name="dir.src.test.resources" value="src/test/resources" />
+	<property name="dir.build" value="bin" />
+	<property name="dir.depfiles" value="DepFiles" />
+	<property name="dir.javadoc" value="javadoc" />
+	<property name="dir.result" value="results" />
+	<property name="dir.root" value="." />
+	<property name="file.jarname" value="esri-geometry-api.jar" />
+	<property name="jackson.version" value="2.9.6" />
+	<property name="jol.version" value="0.9" />
+	<property name="hamcrest.version" value="1.3" />
+
+	<path id="project.classpath">
+		<pathelement location="${dir.depfiles}/public/jackson-core-${jackson.version}.jar" />
+		<pathelement location="${dir.depfiles}/unittest/jol-core-${jol.version}.jar" />
+		<pathelement location="${dir.depfiles}/unittest/hamcrest-core-${hamcrest.version}.jar" />
+		<pathelement location="${dir.depfiles}/unittest/junit-4.12.jar" />
+		<pathelement location="${dir.build}" />
+	</path>
+
+	<target name="all" depends="build, jar, execute, javadoc" />
+
+	<target name="build">
+		<delete dir="${dir.build}" />
+		<mkdir dir="${dir.build}" />
+		<javac srcdir="." includes="${dir.src.main.java}/**"  classpathref="project.classpath" destdir="${dir.build}" debug="false" />
+		<copy todir="${dir.build}">
+			<fileset dir="${dir.src.main.resources}" includes = "**/*.txt" />
+		</copy>
+	</target>
+
+	<target name="jar" depends="build">
+		<delete file="${file.jarname}" />
+		<jar destfile="${file.jarname}" compress="true" keepcompression="true">
+			<fileset dir="${dir.build}" />
+		</jar>
+	</target>
+
+	<target name="build.unittest" depends = "jar">
+		<javac srcdir="." includes="${dir.src.test.java}/**"  classpathref="project.classpath" destdir="${dir.build}" debug="false" />
+		<copy todir="${dir.build}">
+			<fileset dir="${dir.src.test.resources}" includes="**/*.txt" />
+		</copy>
+	</target>
+
+
+	<target name="execute" depends = "build.unittest">
+		<tstamp>
+		</tstamp>
+		<property name="dir.result.today" location="${dir.result}/${DSTAMP}/${TSTAMP}" />
+
+		<mkdir dir="${dir.result}" />
+		<mkdir dir="${dir.result.today}/xml" />
+
+		<junit fork="yes" printsummary="withOutAndErr" haltonfailure="no" haltonerror="no">
+			<jvmarg value="-ea" />
+			<classpath refid="project.classpath" />
+			<sysproperty key="dir.report.test" value="${dir.result.today}" />
+			<sysproperty key="arcgis.version.target" value="10.2" />
+			<sysproperty key="arcgis.product.target" value="desktop" />
+			<formatter type="xml" />
+			<batchtest todir="${dir.result.today}/xml" fork="yes">
+				<fileset dir="${dir.build}">
+					<include name="**/Test*.class" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+
+	<target name="report" depends="execute">
+
+		<junitreport todir="${dir.result.today}/xml">
+			<fileset dir="${dir.result.today}/xml">
+				<include name="**/*.xml" />
+			</fileset>
+			<report format="frames" todir="${dir.result.today}" />
+		</junitreport>
+	</target>
+
+	<target name="javadoc" depends="jar">
+		<javadoc access="public" author="true" classpathref="project.classpath" destdir="${dir.javadoc}" doctitle="Esri-geometry-api" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="com.esri.core.geometry.*" source="1.6" sourcepath="${dir.src.main.java}" splitindex="true" use="true" version="true">
+			<link href="http://help.arcgis.com/EN/sdk/10.0/Java_AO_ADF/api/arcobjects" />
+			<link href="http://docs.oracle.com/javase/6/docs/api/" />
+		</javadoc>
+	</target>
+
+	<target name="javadoc1">
+		<javadoc access="public" author="true" classpathref="project.classpath" destdir="${dir.javadoc}" doctitle="Esri-geometry-api" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="com.esri.core.geometry.*" source="1.6" sourcepath="${dir.src.main.java}" splitindex="true" use="true" version="true">
+			<link href="http://help.arcgis.com/EN/sdk/10.0/Java_AO_ADF/api/arcobjects" />
+			<link href="http://docs.oracle.com/javase/6/docs/api/" />
+		</javadoc>
+	</target>
+
+</project>
+

pom.xml

@@ -0,0 +1,207 @@
+<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>com.esri.geometry</groupId>
+	<artifactId>esri-geometry-api</artifactId>
+	<version>2.2.3</version>
+	<packaging>jar</packaging>
+
+	<name>Esri Geometry API for Java</name>
+	<description>The Esri Geometry API for Java enables developers to write custom applications for analysis of spatial data.</description>
+
+	<url>https://github.com/Esri/geometry-api-java</url>
+
+	<licenses>
+		<license>
+				<name>The Apache Software License, Version 2.0</name>
+				<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+				<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>stolstov</id>
+			<name>Sergey Tolstov</name>
+			<organization>Esri</organization>
+			<organizationUrl>http://www.esri.com</organizationUrl>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>abalog</id>
+			<name>Aaron Balog</name>
+			<organization>Esri</organization>
+			<organizationUrl>http://www.esri.com</organizationUrl>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+	</developers>
+
+	<scm>
+		<connection>scm:git:git@github.com:Esri/geometry-api-java.git</connection>
+		<developerConnection>scm:git:git@github.com:Esri/geometry-api-java.git</developerConnection>
+		<url>git@github.com:Esri/geometry-api-java.git</url>
+	</scm>
+
+	<profiles>
+		<profile>
+			<id>release-sign-artifacts</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>java8-disable-doclint</id>
+			<activation>
+				<jdk>[1.8,)</jdk>
+			</activation>
+			<properties>
+				<javadoc.doclint.param>-Xdoclint:none</javadoc.doclint.param>
+			</properties>
+		</profile>
+	</profiles>
+
+	<distributionManagement>
+		<snapshotRepository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<java.source.version>1.7</java.source.version>
+		<java.target.version>1.7</java.target.version>
+
+		<!-- dependency versions -->
+		<jackson.version>2.9.6</jackson.version>
+		<junit.version>4.12</junit.version>
+		<jol.version>0.9</jol.version>
+
+		<!-- plugin versions -->
+		<compiler.plugin.version>2.3.1</compiler.plugin.version>
+		<source.plugin.version>2.2.1</source.plugin.version>
+		<javadoc.plugin.version>3.0.0-M1</javadoc.plugin.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson.version}</version>
+			<optional>false</optional>
+		</dependency>
+
+		<!-- Test dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.openjdk.jol</groupId>
+			<artifactId>jol-core</artifactId>
+			<version>${jol.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<directory>${project.basedir}/target</directory>
+		<outputDirectory>${project.build.directory}/classes</outputDirectory>
+		<finalName>${project.artifactId}-${project.version}</finalName>
+		<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
+		<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+		<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+		<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+			</resource>
+		</resources>
+		<testResources>
+			<testResource>
+				<directory>${project.basedir}/src/test/resources</directory>
+			</testResource>
+		</testResources>
+		<plugins>
+			<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>${compiler.plugin.version}</version>
+					<configuration>
+						<source>${java.source.version}</source>
+						<target>${java.target.version}</target>
+					</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>${source.plugin.version}</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>${javadoc.plugin.version}</version>
+				<configuration>
+					<link>http://help.arcgis.com/EN/sdk/10.0/Java_AO_ADF/api/arcobjects</link>
+					<link>http://docs.oracle.com/javase/6/docs/api/</link>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>${javadoc.doclint.param}</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.8</version>
+				<extensions>true</extensions>
+				<configuration>
+					<serverId>ossrh</serverId>
+					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+					<autoReleaseAfterClose>true</autoReleaseAfterClose>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>