Skip to content

Commit

Permalink
Merge pull request #8 from xranby/master
Browse files Browse the repository at this point in the history
maven/**/pom.xml: Update dependencies to use JogAmp 2.3.1
  • Loading branch information
sgothel committed Mar 27, 2019
2 parents 2d35b31 + 168a5be commit 2befe0f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions maven/jp4da/jp4da-android/pom.xml
Expand Up @@ -50,26 +50,26 @@
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt-android</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
</dependency>
<!-- Depend on the correct natives for Android -->
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
<classifier>natives-android-armv6</classifier>
</dependency>
<!-- Depend on the jogl Android package -->
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all-android</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
</dependency>
<!-- Depend on the correct natives for Android -->
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
<classifier>natives-android-armv6</classifier>
<scope>runtime</scope>
</dependency>
Expand Down Expand Up @@ -151,7 +151,7 @@
<artifactItem>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
<classifier>natives-android-armv6</classifier>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/libs/armeabi</outputDirectory>
Expand All @@ -175,7 +175,7 @@
<artifactItem>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all-android</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/assets</outputDirectory>
<excludes>**/*.class</excludes>
Expand All @@ -197,7 +197,7 @@
<artifactItem>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
<classifier>natives-android-armv6</classifier>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/libs/armeabi</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion maven/jp4da/jp4da-core/pom.xml
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions maven/jp4da/jp4da-desktop/pom.xml
Expand Up @@ -34,12 +34,12 @@
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt-main</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all-main</artifactId>
<version>2.0-rc11post03</version>
<version>2.3.1</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions maven/trivial-test/pom.xml
Expand Up @@ -24,12 +24,12 @@
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt-main</artifactId>
<version>2.0-rc11</version>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all-main</artifactId>
<version>2.0-rc11</version>
<version>2.3.1</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit 2befe0f

Please sign in to comment.