Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update maven dependencies #92

Merged
merged 1 commit into from
Apr 28, 2023
Merged

Update maven dependencies #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
TODO for 0.5.0
==============
- Update other dependencies, including JUnit
- Android compatibility -> See TODO.txt
- libGWT compatibility?
- CI
Expand Down Expand Up @@ -35,6 +34,7 @@ ODE16.2: Much better. Floating card is actually fine (in theory). But3rd row col

0.5.0 (unreleased)
=====
- Updated maven dependencies [#92](https://github.com/tzaeschke/ode4j/pull/92)
- Test that internal assertions did not throw Exceptions. This was fixed as part of #86.
[#74](https://github.com/tzaeschke/ode4j/issues/74)
- Fixes to LWJGL 3.0 [#91](https://github.com/tzaeschke/ode4j/pull/91)
Expand Down
10 changes: 2 additions & 8 deletions demo-cpp/src/test/java/org/ode4j/tests/bugs/Test_Bug0019_OdeRayToCylinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,10 @@
/**
* Shows an incorrect calculation of the contact normal collision beam and boxing
*/
public class Test_Bug0019_OdeRayToCylinder
{
public class Test_Bug0019_OdeRayToCylinder {

private static boolean found = false;

public static void main(String[] args) {
new Test_Bug0019_OdeRayToCylinder().test();
}



@Test
public void test() {
OdeHelper.initODE2(0);
Expand Down
49 changes: 19 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,23 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<ode4j.bnd-maven-plugin.version>3.5.0</ode4j.bnd-maven-plugin.version>
<ode4j.build-helper-maven-plugin.version>3.0.0</ode4j.build-helper-maven-plugin.version>
<ode4j.maven-clean-plugin.version>3.0.0</ode4j.maven-clean-plugin.version>
<ode4j.maven-compiler-plugin.version>3.7.0</ode4j.maven-compiler-plugin.version>
<ode4j.maven-deploy-plugin.version>2.8.2</ode4j.maven-deploy-plugin.version>
<ode4j.maven-enforcer-plugin.version>3.0.0-M1</ode4j.maven-enforcer-plugin.version>
<ode4j.maven-gpg-plugin.version>1.6</ode4j.maven-gpg-plugin.version>
<ode4j.maven-install-plugin.version>2.5.2</ode4j.maven-install-plugin.version>
<ode4j.maven-jar-plugin.version>3.1.0</ode4j.maven-jar-plugin.version>
<ode4j.maven-javadoc-plugin.version>3.0.0-M1</ode4j.maven-javadoc-plugin.version>
<ode4j.maven-plugin-plugin.version>3.2</ode4j.maven-plugin-plugin.version>
<ode4j.maven-resources-plugin.version>3.0.0</ode4j.maven-resources-plugin.version>
<ode4j.maven-source-plugin.version>3.0.1</ode4j.maven-source-plugin.version>
<ode4j.maven-surefire-plugin.version>2.19.1</ode4j.maven-surefire-plugin.version>
<ode4j.nexus-staging-maven-plugin.version>1.6.8</ode4j.nexus-staging-maven-plugin.version>
<ode4j.bnd-maven-plugin.version>6.4.0</ode4j.bnd-maven-plugin.version>
<ode4j.build-helper-maven-plugin.version>3.3.0</ode4j.build-helper-maven-plugin.version>
<ode4j.maven-clean-plugin.version>3.2.0</ode4j.maven-clean-plugin.version>
<ode4j.maven-compiler-plugin.version>3.11.0</ode4j.maven-compiler-plugin.version>
<ode4j.maven-deploy-plugin.version>3.1.1</ode4j.maven-deploy-plugin.version>
<ode4j.maven-enforcer-plugin.version>3.3.0</ode4j.maven-enforcer-plugin.version>
<ode4j.maven-gpg-plugin.version>3.0.1</ode4j.maven-gpg-plugin.version>
<ode4j.maven-install-plugin.version>3.1.1</ode4j.maven-install-plugin.version>
<ode4j.maven-jar-plugin.version>3.3.0</ode4j.maven-jar-plugin.version>
<ode4j.maven-javadoc-plugin.version>3.5.0</ode4j.maven-javadoc-plugin.version>
<ode4j.maven-plugin-plugin.version>3.8.2</ode4j.maven-plugin-plugin.version>
<ode4j.maven-resources-plugin.version>3.3.1</ode4j.maven-resources-plugin.version>
<ode4j.maven-source-plugin.version>3.2.1</ode4j.maven-source-plugin.version>
<ode4j.maven-surefire-plugin.version>3.0.0</ode4j.maven-surefire-plugin.version>
<ode4j.nexus-staging-maven-plugin.version>1.6.13</ode4j.nexus-staging-maven-plugin.version>
</properties>

<prerequisites>
<maven>3.3.3</maven>
</prerequisites>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<name>ODE for Java</name>
<description>Java 3D Physics Engine and Library.</description>
<url>https://github.com/tzaeschke/ode4j</url>
Expand Down Expand Up @@ -102,13 +92,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.0</version>
<version>2.0.7</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -172,7 +162,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.3.3</version>
<version>3.3.9</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -231,7 +221,6 @@
<excludes>
<!-- exclude tests that currently fail -->
<exclude>**/tests/JavaMultiThreadTest.java</exclude>
<exclude>**/tests/bugs/Test_Bug0019_OdeRayToCylinder.java</exclude>
<exclude>**/tests/CollisionTest.java</exclude>
<exclude>**/tests/TestIssue0018_NpeInQuickstep.java</exclude>
</excludes>
Expand Down Expand Up @@ -360,7 +349,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.8.0-beta1</version>
<version>2.0.7</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down