Skip to content

Commit

Permalink
Fix Maven build
Browse files Browse the repository at this point in the history
I am planning to deploy JOML later on a possibly coming LWJGL Maven
Repo.
  • Loading branch information
httpdigest committed May 29, 2015
1 parent 308474d commit afd90f7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 139 deletions.
73 changes: 0 additions & 73 deletions build.xml

This file was deleted.

80 changes: 18 additions & 62 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,17 @@
<email>[email protected]</email>
</developer>
</developers>
<distributionManagement>
<repository>
<id>oss.sonatype.org</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>oss.sonatype.org</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.3</version>
<configuration>
<source>1.3</source>
<target>1.3</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.1</version>
<configuration>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
Expand All @@ -75,9 +57,10 @@
</execution>
</executions>
</plugin>
<!--
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<version>2.10.3</version>
<executions>
<execution>
<id>package-javadoc</id>
Expand All @@ -88,48 +71,21 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6</version>
<extensions>true</extensions>
<configuration>
<serverId>oss.sonatype.org</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<description>${project.version}</description>
</configuration>
<executions>
<execution>
<id>deploy-to-sonatype</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
<goal>release</goal>
</goals>
</execution>
</executions>
</plugin>
-->
</plugins>
</build>
<dependencies>
<dependency>
<groupId>java3d</groupId>
<artifactId>vecmath</artifactId>
<version>1.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.lwjgl.lwjgl</groupId>
<artifactId>lwjgl_util</artifactId>
<version>2.8.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
8 changes: 4 additions & 4 deletions src/com/joml/Matrix3f.java
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ public Matrix3f set(Matrix3f m1) {
m22 = m1.m22;
return this;
}

/**
* Set the values of this matrix to the ones of the given javax.vecmath.Matrix3f matrix.
*
* @param javaxVecmathMatrix
* @return this
*/
public Matrix3f set(javax.vecmath.Matrix3f javaxVecmathMatrix) {
public Matrix3f fromJavaxMatrix(javax.vecmath.Matrix3f javaxVecmathMatrix) {
this.m00 = javaxVecmathMatrix.m00;
this.m01 = javaxVecmathMatrix.m10;
this.m02 = javaxVecmathMatrix.m20;
Expand All @@ -152,14 +152,14 @@ public Matrix3f set(javax.vecmath.Matrix3f javaxVecmathMatrix) {
this.m22 = javaxVecmathMatrix.m22;
return this;
}

/**
* Set the values of this matrix to the ones of the given org.lwjgl.util.vector.Matrix3f matrix.
*
* @param lwjglMatrix
* @return this
*/
public Matrix3f set(org.lwjgl.util.vector.Matrix3f lwjglMatrix) {
public Matrix3f fromLwjglMatrix(org.lwjgl.util.vector.Matrix3f lwjglMatrix) {
m00 = lwjglMatrix.m00;
m01 = lwjglMatrix.m01;
m02 = lwjglMatrix.m02;
Expand Down

0 comments on commit afd90f7

Please sign in to comment.