From 1100625594b25b894bbde8ee9b230973f5f0f4a5 Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Mon, 1 Feb 2021 22:20:43 +0100 Subject: [PATCH] Release version 1.2.1 Minor fixes included in this commit: - Fix formatting - Update mockito-core - Use Maven wrapper for CI builds --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 6 ++++++ README.md | 2 +- pom.xml | 4 ++-- .../java/magma/monitor/messageparser/ISimulationState.java | 1 - .../java/magma/monitor/messageparser/impl/RSGConverter.java | 3 +-- .../magma/monitor/messageparser/impl/SimulationState.java | 1 - .../hso/autonomy/util/commandline/EnumArgumentTest.java | 3 +-- .../java/hso/autonomy/util/geometry/VectorUtilsTest.java | 1 + 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34fb367..dfd20d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,4 +20,4 @@ jobs: with: java-version: 1.8 - name: Build with Maven - run: mvn --batch-mode --errors --fail-at-end --show-version package + run: ./mvnw --batch-mode --errors --fail-at-end --show-version package diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aabd05..15e3bd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +1.2.1 (February 1, 2021) +------------------------------ +* Fixed setting playmode during MonitorKick +* Fixed kick direction for the right team +* Updated magmaProxy to version 2.1.4 (fixes #3) + 1.2.0 (January 6, 2021) ------------------------------ * Fixed most of the occurring self collisions diff --git a/README.md b/README.md index 1645333..ebb1fea 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ It should be compatible with older JREs, too, but this is not verified. - Make sure you have Java installed and available on your command line. ### Getting the prebuilt version -We provide a prebuilt version of the Fat Proxy. You can download the latest version from the [Releases page](https://github.com/magmaOffenburg/magmaFatProxy/releases) (e.g. `magmaFatProxy-1.2.1.zip`). The Zip file contains the JAR file as well as the start script. +We provide a prebuilt version of the Fat Proxy. You can download the latest version from the [Releases page](https://github.com/magmaOffenburg/magmaFatProxy/releases) (e.g. `magmafatproxy-1.2.1.zip`). The Zip file contains the JAR file as well as the start script. ### Building from source - Clone the repository: `git clone https://github.com/magmaOffenburg/magmaFatProxy`. diff --git a/pom.xml b/pom.xml index 1388759..edb1a8d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ magmaoffenburg magmafatproxy jar - 1.2.0 + 1.2.1 magmaFatProxy https://github.com/magmaOffenburg/magmaFatProxy @@ -54,7 +54,7 @@ org.mockito mockito-core - 3.6.28 + 3.7.7 test diff --git a/src/main/java/magma/monitor/messageparser/ISimulationState.java b/src/main/java/magma/monitor/messageparser/ISimulationState.java index 1b5235c..b1e06bb 100644 --- a/src/main/java/magma/monitor/messageparser/ISimulationState.java +++ b/src/main/java/magma/monitor/messageparser/ISimulationState.java @@ -18,7 +18,6 @@ package magma.monitor.messageparser; import java.util.List; - import magma.common.spark.Foul; public interface ISimulationState { diff --git a/src/main/java/magma/monitor/messageparser/impl/RSGConverter.java b/src/main/java/magma/monitor/messageparser/impl/RSGConverter.java index 54664fd..b60c916 100644 --- a/src/main/java/magma/monitor/messageparser/impl/RSGConverter.java +++ b/src/main/java/magma/monitor/messageparser/impl/RSGConverter.java @@ -17,8 +17,6 @@ *******************************************************************************/ package magma.monitor.messageparser.impl; -import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; - import hso.autonomy.util.symboltreeparser.SymbolNode; import magma.common.spark.Foul; import magma.common.spark.Foul.FoulType; @@ -28,6 +26,7 @@ import magma.util.scenegraph.impl.MeshNode; import magma.util.scenegraph.impl.SceneGraphHeader; import magma.util.scenegraph.impl.TransformNode; +import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; public class RSGConverter { diff --git a/src/main/java/magma/monitor/messageparser/impl/SimulationState.java b/src/main/java/magma/monitor/messageparser/impl/SimulationState.java index edc6f2b..d64641c 100644 --- a/src/main/java/magma/monitor/messageparser/impl/SimulationState.java +++ b/src/main/java/magma/monitor/messageparser/impl/SimulationState.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; - import magma.common.spark.Foul; import magma.monitor.messageparser.ISimulationState; diff --git a/src/test/java/hso/autonomy/util/commandline/EnumArgumentTest.java b/src/test/java/hso/autonomy/util/commandline/EnumArgumentTest.java index 1c39160..4518052 100644 --- a/src/test/java/hso/autonomy/util/commandline/EnumArgumentTest.java +++ b/src/test/java/hso/autonomy/util/commandline/EnumArgumentTest.java @@ -36,7 +36,6 @@ public void testNullDefault() public void testInvalidValue() { EnumArgument arg = new EnumArgument<>("test", null, "", TestEnum.class); - assertThrows(ArgumentParsingException.class, () -> { - assertNull(arg.parse("--test=invalid")); }); + assertThrows(ArgumentParsingException.class, () -> { assertNull(arg.parse("--test=invalid")); }); } } diff --git a/src/test/java/hso/autonomy/util/geometry/VectorUtilsTest.java b/src/test/java/hso/autonomy/util/geometry/VectorUtilsTest.java index 4a3e417..2f92dbb 100644 --- a/src/test/java/hso/autonomy/util/geometry/VectorUtilsTest.java +++ b/src/test/java/hso/autonomy/util/geometry/VectorUtilsTest.java @@ -6,6 +6,7 @@ package hso.autonomy.util.geometry; import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;