aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ardor3d-jogl/build.gradle4
-rw-r--r--pom.xml49
2 files changed, 30 insertions, 23 deletions
diff --git a/ardor3d-jogl/build.gradle b/ardor3d-jogl/build.gradle
index f4e39f1..58ab31b 100644
--- a/ardor3d-jogl/build.gradle
+++ b/ardor3d-jogl/build.gradle
@@ -2,6 +2,6 @@
description = 'Ardor 3D JOGL'
dependencies {
compile project(':ardor3d-core')
- compile group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.3.2-rc-20150812'
- compile group: 'org.jogamp.jogl', name: 'jogl-all-main', version:'2.3.2-rc-20150812'
+ compile group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.3.2-rc-20150926'
+ compile group: 'org.jogamp.jogl', name: 'jogl-all-main', version:'2.3.2-rc-20150926'
}
diff --git a/pom.xml b/pom.xml
index 7c90cff..1af6b39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
- <version>7</version>
+ <version>9</version>
</parent>
<modules>
@@ -66,21 +66,21 @@
<reporting>
<plugins>
- <!--<plugin>-->
+ <plugin>
<!-- NOTE: At least 'compile' has to be done before
running findbugs! (see http://stackoverflow.com/a/8939723/60982)
-->
- <!--<groupId>org.codehaus.mojo</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <version>3.0.2</version>
<configuration>
<threshold>Normal</threshold>
</configuration>
- </plugin>-->
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <version>2.7</version>
</plugin>
<plugin>
<!-- NOTE: Due to http://jira.codehaus.org/browse/MJAVADOC-116
@@ -89,13 +89,14 @@
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
<configuration>
<bottom><![CDATA[<i>Copyright &copy; {inceptionYear}-{currentYear} Ardor Labs. All Rights Reserved.</i>]]>
</bottom>
<links>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
</links>
+ <destDir>javadoc</destDir>
<linksource>true</linksource>
<quiet>true</quiet>
<show>private</show>
@@ -120,7 +121,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>2.2</version>
+ <version>2.10</version>
</extension>
</extensions>
<pluginManagement>
@@ -128,7 +129,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -138,12 +139,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -151,12 +152,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
<!-- duplicated because of http://jira.codehaus.org/browse/MSITE-523 -->
<configuration>
<bottom><![CDATA[<i>Copyright &copy; {inceptionYear}-{currentYear} Ardor Labs. All Rights Reserved.</i>]]>
@@ -164,6 +165,7 @@
<links>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
</links>
+ <destDir>javadoc</destDir>
<linksource>true</linksource>
<quiet>true</quiet>
<show>private</show>
@@ -174,22 +176,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.5.2</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>v@{project.version}</tagNameFormat>
@@ -204,6 +206,11 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
@@ -272,7 +279,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>19.0-rc2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -283,7 +290,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -319,12 +326,12 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.4</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1.4</version>
+ <version>1.1.6</version>
</dependency>
<dependency>
<groupId>org.eclipse.swt</groupId>