Pom.xml file tidied up

4 files changed, 48 insertions, 523 deletions

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index bbcbc93..91ca62e 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,14 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.compliance=1.7

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

-org.eclipse.jdt.core.compiler.source=1.7

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 1e5dd4f..0000000
--- a/build.xml
+++ /dev/null
@@ -1,494 +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-examples-1.5.3" default="jar">
-
-  <target name="init">
-    <!-- Set global properties for this build -->
-    <property name="src"          location="src"/>
-    <property name="build"        location="build"/>
-    <property name="dist"         location="dist"/>
-    <property name="output.jar"   location="dist/j3d-examples.jar"/>
-    <property name="output.zip"   location="dist/j3d-examples-1_5_3-src.zip"/>
-    <property name="j3ddir"       location="../j3d-core/build/default/debug"/>
-    <property name="vecmathdir"   location="../vecmath/build/debug"/>
-    <property name="j3dcore.jar"  location="${j3ddir}/lib/ext/j3dcore.jar"/>
-    <property name="j3dutils.jar" location="${j3ddir}/lib/ext/j3dutils.jar"/>
-    <property name="vecmath.jar"  location="${vecmathdir}/lib/ext/vecmath.jar"/>
-    <property name="native.dir"   location="${j3ddir}/native"/>
-  </target>
-
-  <target name="compile" depends="init-compile">
-    <!-- Create the build directory -->
-    <mkdir dir="${build}/classes"/>
-
-    <!-- Compile the java code from ${src}/classes into ${build}/classes -->
-    <javac srcdir="${src}/classes"
-           destdir="${build}/classes"
-	   source="1.5"
-	   target="1.5"
-	   debug="true"
-           deprecation="off">
-      <classpath refid="comp.classpath"/>
-    </javac>
-
-    <!-- Copy resources to build in preparation for jarring -->
-    <copy todir="${build}/classes/org/jdesktop/j3d/examples/resources">
-        <fileset dir="${src}/resources"/>
-    </copy>
-    
-    <!-- Copy all non class files from src to build -->   
-    <copy todir="${build}/classes/org/jdesktop/j3d/examples">
-        <fileset dir="${src}/classes/org/jdesktop/j3d/examples"
-                 includes ="**/*.vert **/*.frag **/*.cg **/*.cfg **/*.html **/*.txt"/>
-    </copy>
-    
-  </target>
-
-  <target name="jar" depends="init,compile">
-    <!-- Create the dist directory -->
-    <mkdir dir="${dist}"/>
-    
-    <!-- Create the jar file -->
-    <jar jarfile="${output.jar}"
-         manifest="manifest.mf"
-         update="no"
-         compress="false">
-	<fileset dir="${build}/classes" includes="org/**/*"/>
-    </jar>
-  </target>
-
-  <target name="src" depends="init">
-    <mkdir dir="${dist}"/>
-    <zip destfile="${output.zip}">
-      <fileset dir=".." includes="j3d-examples/src/**"/>
-      <fileset dir=".." includes="j3d-examples/COPYRIGHT.txt"/>
-      <fileset dir=".." includes="j3d-examples/README*.*"/>
-      <fileset dir=".." includes="j3d-examples/*LICENSE*.*"/>
-      <fileset dir=".." includes="j3d-examples/build.xml"/>
-      <fileset dir=".." includes="j3d-examples/manifest.mf"/>
-      <fileset dir=".." includes="j3d-examples/nbproject/**" excludes="j3d-examples/nbproject/private/**"/>
-    </zip>
-  </target>
-
-  <target name="all" depends="init,jar,src">
-  </target>
-
-  <target name="clean" depends="init">
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-  </target>
-
-  <target name="init-compile" depends="init">
-    <path id="comp.classpath">
-      <pathelement location="${j3dcore.jar}"/>
-      <pathelement location="${j3dutils.jar}"/>
-      <pathelement location="${vecmath.jar}"/>
-    </path>
-  </target>
-
-  <target name="init-run" depends="init,jar">
-    <path id="run.classpath">
-      <pathelement location="${output.jar}"/>
-      <pathelement location="${j3dcore.jar}"/>
-      <pathelement location="${j3dutils.jar}"/>
-      <pathelement location="${vecmath.jar}"/>
-    </path>
-  </target>
-
-  <target name="run" depends="run.HelloUniverse">
-  </target>
-
-  <!--
-   **************************************************
-   * Individual run targets for each example program
-   **************************************************
-   -->
-
-  <target name="run.AppearanceMixed" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.appearance.AppearanceMixed">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.AppearanceTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.appearance.AppearanceTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.Applet3D" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.applet3d.Applet3D">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.BackgroundGeometry" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.background.BackgroundGeometry">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.ConfigObjLoad" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.configured_universe.ConfigObjLoad">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.DepthFuncTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.depth_func.DepthFuncTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.DistortGlyphTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.distort_glyph.DistortGlyphTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.Dot3Demo" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.dot3.Dot3Demo">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.EnvironmentMappingGLSL" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.glsl_shader.EnvironmentMappingGLSL">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
- <target name="run.FourByFour" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.four_by_four.FourByFour">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
- 
-  <target name="run.FPSCounterDemo" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.fps_counter.FPSCounterDemo">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-   
-  <target name="run.GearBox" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.gears.GearBox">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.GearTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.gears.GearTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.HelloUniverse" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.hello_universe.HelloUniverse">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.ImageComponentByReferenceTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.geometry_by_ref.ImageComponentByReferenceTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
- 
-  <target name="run.InterleavedNIOBuffer" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.geometry_by_ref.InterleavedNIOBuffer">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target> 
-  
-  <target name="run.InterleavedTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.geometry_by_ref.InterleavedTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target> 
-  
-  <target name="run.LOD" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.lod.LOD">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.Morphing" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.morphing.Morphing">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-    
-  <target name="run.MultiTextureTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.texture.MultiTextureTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.ObjLoad" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.objload.ObjLoad">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-   <target name="run.ObjLoadCg" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.cg_shader.ObjLoadCg">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-      <sysproperty key="j3d.shadingLanguage" value="Cg"/>
-    </java>
-  </target> 
-
-  <target name="run.ObjLoadGLSL" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.glsl_shader.ObjLoadGLSL">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.OrientedPtTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.oriented_shape3d.OrientedPtTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target> 
-
-  <target name="run.OrientedTest" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.oriented_shape3d.OrientedTest">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target> 
-  
-  <target name="run.PrintCanvas3D" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.print_canvas3d.PrintCanvas3D">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target> 
-  
- <target name="run.PhongShadingGLSL" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.glsl_shader.PhongShadingGLSL">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-   <target name="run.PureImmediate" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.pure_immediate.PureImmediate">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.PureImmediateStereo" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.pure_immediate.PureImmediateStereo">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-<target name="run.Pyramid2Cube" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.morphing.Pyramid2Cube">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-    
-  <target name="run.QueryProperties" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.package_info.QueryProperties">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
- 
-  <target name="run.QueryPropertiesJOGL" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.package_info.QueryProperties">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-      <sysproperty key="j3d.rend" value="jogl"/>
-    </java>
-  </target>
-
-
-  <target name="run.SamplerTestGLSL" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.glsl_shader.SamplerTestGLSL">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.ShaderTestGLSL" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.glsl_shader.ShaderTestGLSL">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-<target name="run.SphereMotion" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.sphere_motion.SphereMotion">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.SphereGLSL" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.glsl_shader.SphereGLSL">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
- 
-   <target name="run.SphereCg" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.cg_shader.SphereCg">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-      <sysproperty key="j3d.shadingLanguage" value="Cg"/>
-    </java>
-  </target> 
-  
-  <target name="run.TextureByReference" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.texture_by_ref.TextureByReference">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-  
-  <target name="run.TextureImage" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.texture.TextureImage">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.TickTockCollision" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.collision.TickTockCollision">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.VertexAttrTestGLSL" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.glsl_shader.VertexAttrTestGLSL">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-    </java>
-  </target>
-
-  <target name="run.VertexAttrTestCg" depends="init-run">
-    <java fork="true"
-          classname="org.jdesktop.j3d.examples.cg_shader.VertexAttrTestCg">
-      <classpath refid="run.classpath"/>
-      <sysproperty key="java.library.path" value="${native.dir}"/>
-      <sysproperty key="j3d.shadingLanguage" value="Cg"/>
-    </java>
-  </target>
-
-</project>
diff --git a/manifest.mf b/manifest.mf
deleted file mode 100644
index 04b5cf2..0000000
--- a/manifest.mf
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Title: Java 3D Example Programs
-Implementation-Version: 1.5.3
-Implementation-Vendor: Sun Microsystems, Inc.
-Main-Class: org.jdesktop.j3d.examples.hello_universe.HelloUniverse
diff --git a/pom.xml b/pom.xml
index 262db43..f743024 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.jogamp.java3d</groupId>
-	<artifactId>j3dexamples</artifactId>
+	<artifactId>java3d-examples</artifactId>
 	<version>1.7.0</version>
 
 	<name>Java 3D Examples</name>
@@ -20,7 +20,7 @@
 		<developer>
 			<id>philjord</id>
 			<name>Philip Jordan</name>
-			<email>[email protected]</email>
+			<email>[email protected]</email>
 			<url>https://github.com/philjord</url>
 			<organization>JogAmp</organization>
 			<organizationUrl>http://jogamp.org/</organizationUrl>
@@ -34,10 +34,17 @@
 		<contributor>
 			<name>Various from previous project at Java.net</name>
 			<url>https://java.net/projects/j3d-examples</url>
-			<organization></organization>
-			<organizationUrl></organizationUrl>
+			<organization>Java.net</organization>
+			<organizationUrl>https://java.net</organizationUrl>
 		</contributor>		
 	</contributors>
+	
+	<scm>
+		<connection>scm:git:http://github.com/philjord/java3d-examples</connection>
+		<developerConnection></developerConnection>
+		<tag>HEAD</tag>
+		<url>https://github.com/philjord/java3d-examples</url>
+	</scm>
 
 	<properties>
 		<jogamp.version>2.3.2</jogamp.version>
@@ -50,17 +57,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>j3dcore</artifactId>
+			<artifactId>java3d-core</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency>		
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>vecmath</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>j3dutils</artifactId>
+			<artifactId>java3d-utils</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -71,13 +73,27 @@
 	</dependencies>
 
 	<build>
+	
+		<defaultGoal>install</defaultGoal>
+
+		<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+					<exclude>**/package.html</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.8.0</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -93,14 +109,13 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>3.1.1</version>
 				<configuration>
-					<javadocDirectory>${project.basedir}/src/classes</javadocDirectory>
-					<additionalparam>-Xdoclint:none</additionalparam>
+					<additionalJOption>-Xdoclint:none</additionalJOption>
 					<links>
 						<link>http://docs.oracle.com/javase/8/docs/api/</link>
 					</links>
-				</configuration>
+				</configuration>				
 			</plugin>
 		</plugins>
 	</build>