summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Gouesse <[email protected]>2015-11-27 07:54:01 +0100
committerJulien Gouesse <[email protected]>2015-11-27 07:54:01 +0100
commit10a5aaf338b54d11f90016701d437a4440b7569c (patch)
tree14784a87ec8c11549bd7557e66e1b18a18957cd1
parent9f41bd6a2e753f3df1eb301498467e3e8177a97e (diff)
parent81801a8c904738f52a017b8e022435da9ad558e5 (diff)
Merge pull request #2 from scijava/maven
Build the project using Maven
-rw-r--r--.gitignore4
-rw-r--r--README-FIRST.txt2
-rw-r--r--README-build.html61
-rw-r--r--build.xml59
-rw-r--r--pom.xml123
5 files changed, 127 insertions, 122 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..10d81e8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/.classpath
+/.project
+/.settings/
+/target/
diff --git a/README-FIRST.txt b/README-FIRST.txt
index a687e9b..c78aba2 100644
--- a/README-FIRST.txt
+++ b/README-FIRST.txt
@@ -8,5 +8,3 @@ The source code license information for this project is in LICENSE.txt
Additional information and license restrictions for third party source
code are found in the THIRDPARTY-LICENSE-*.txt files.
-
-Instructions for building this project are in README-build.html
diff --git a/README-build.html b/README-build.html
deleted file mode 100644
index 7d7e663..0000000
--- a/README-build.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--
-/*
- * $RCSfile$
- *
- * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed, licensed or
- * intended for use in the design, construction, operation or
- * maintenance of any nuclear facility.
- *
- * $Revision$
- * $Date$
- * $State$
- */
- -->
- <meta content="text/html; charset=ISO-8859-1"
- http-equiv="content-type">
- <title>README-build: build instructions for the j3d-core-utils project</title>
-</head>
-<body>
-<h3><span style="font-weight: bold; text-decoration: underline;">Building
-j3d-core-utils</span></h3>
-<p>The j3d-core-utils project is built as part of the j3d-core
-project. See the <a href="../j3d-core/README-build.html">README-build.html</a>
-file in the "j3d-core" directory for instructions.<br>
-</p>
-</body>
-</html>
diff --git a/build.xml b/build.xml
deleted file mode 100644
index bd4608f..0000000
--- a/build.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-/*
- * $RCSfile$
- *
- * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed, licensed or
- * intended for use in the design, construction, operation or
- * maintenance of any nuclear facility.
- *
- * $Revision$
- * $Date$
- * $State$
- */
- -->
-
-<project name="j3d-core-utils" default="fail" basedir=".">
-
- <target name="fail">
- <fail message="You must run ant from the j3d-core directory"/>
- </target>
-
- <description>
- NOTE: You must run ant from the j3d-core directory
- </description>
-
-</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..1dc1894
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>org.jogamp.java3d</groupId>
+ <artifactId>j3dutils</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+
+ <name>Java 3D Utils</name>
+ <description>Utility functions for the Java 3D Graphics API</description>
+
+ <licenses>
+ <license>
+ <name>Simplified BSD License</name>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <id>gouessej</id>
+ <name>Julien Gouesse</name>
+ <url>https://github.com/gouessej</url>
+ <organization>JogAmp</organization>
+ <organizationUrl>http://jogamp.org/</organizationUrl>
+ </developer>
+ <developer>
+ <id>hharrison</id>
+ <name>Harvey Harrison</name>
+ <url>https://github.com/hharrison</url>
+ <organization>JogAmp</organization>
+ <organizationUrl>http://jogamp.org/</organizationUrl>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Kevin Rushforth</name>
+ <url>https://www.linkedin.com/in/kevin-rushforth-8ba3b43</url>
+ <organization>Oracle Corporation</organization>
+ <organizationUrl>http://oracle.com/</organizationUrl>
+ </contributor>
+ <contributor>
+ <name>Chien Yang</name>
+ <url>https://www.linkedin.com/in/chien-yang-0884122</url>
+ <organization>Oracle Corporation</organization>
+ <organizationUrl>http://oracle.com/</organizationUrl>
+ </contributor>
+ <contributor>
+ <name>Curtis Rueden</name>
+ <url>http://loci.wisc.edu/people/curtis-rueden</url>
+ <organization>UW-Madison LOCI</organization>
+ <organizationUrl>http://loci.wisc.edu/</organizationUrl>
+ </contributor>
+ <contributor>
+ <name>Ken Mc Neill</name>
+ </contributor>
+ <contributor>
+ <name>Alessandro Borges</name>
+ </contributor>
+ <contributor>
+ <name>Emmanuel Puybaret</name>
+ </contributor>
+ </contributors>
+
+ <properties>
+ <jogl.version>2.3.2</jogl.version>
+
+ <!-- NB: Avoid platform encoding warning when copying resources. -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>j3dcore</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>vecmath</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+
+ <sourceDirectory>${basedir}/src/classes/share</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/classes/share</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/package.html</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>