Skip to content

Commit

Permalink
Release version 1.2.1
Browse files Browse the repository at this point in the history
Minor fixes included in this commit:
- Fix formatting
- Update mockito-core
- Use Maven wrapper for CI builds
  • Loading branch information
hannesbraun committed Feb 1, 2021
1 parent d18aa1e commit 1100625
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>magmaoffenburg</groupId>
<artifactId>magmafatproxy</artifactId>
<packaging>jar</packaging>
<version>1.2.0</version>
<version>1.2.1</version>
<name>magmaFatProxy</name>
<url>https://github.com/magmaOffenburg/magmaFatProxy</url>

Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.6.28</version>
<version>3.7.7</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package magma.monitor.messageparser;

import java.util.List;

import magma.common.spark.Foul;

public interface ISimulationState {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import java.util.ArrayList;
import java.util.List;

import magma.common.spark.Foul;
import magma.monitor.messageparser.ISimulationState;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public void testNullDefault()
public void testInvalidValue()
{
EnumArgument<TestEnum> arg = new EnumArgument<>("test", null, "", TestEnum.class);
assertThrows(ArgumentParsingException.class, () -> {
assertNull(arg.parse("--test=invalid")); });
assertThrows(ArgumentParsingException.class, () -> { assertNull(arg.parse("--test=invalid")); });
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1100625

Please sign in to comment.