iBump version to 1.4.6

rbuj · Apr 2, 2019 · e703138 · e703138
1 parent dc04349
commit e703138
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,8 +1,16 @@
 ToDo
- * Bump version to 1.4.6
+ * Bump version to 1.4.7
  * Migrate all GUI from swing to JavaFX
  * Write all documentation in docbook format
 
+2019-04-02 Robert Antoni Buj Gelonch <[email protected]>
+
+ * Bump version to 1.4.6
+ * Fix Save/Open bin file issue with SnapshotAttributes
+ * Fix some invalid javadocs
+ * Use Integer.compare whenever possible
+ * Other improvements
+
 2017-09-14 Robert Antoni Buj Gelonch <[email protected]>
 
  * Bump version to 1.4.5

diff --git a/README.md b/README.md
@@ -39,17 +39,29 @@ Install maven
 ```bash
 sudo dnf install maven
 ```
-
 Install [Oracle JDK & JRE 11](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
 ```bash
-tar xzvf jdk-11_linux-x64_bin.tar.gz -C /usr/java
-su -c chown -R root:root /usr/java
-su -c chown -R +x /usr/java/bin
-su -c pdate-alternatives --install /usr/bin/java java /usr/java/jdk-11*/bin/java 1065
-su -c update-alternatives --install /usr/bin/javac javac /usr/java/jdk-11*/bin/javac 1065
-su -c update-alternatives --install /usr/bin/jar jar /usr/java/jdk-11*/bin/jar 1065
-su -c update-alternatives --install /usr/bin/javaws javaws /usr/java/jdk-11*/bin/javaws 1065
-su -c update-alternatives --config java
+mkdir -p /usr/java
+tar xzvf jdk-11.0.2_linux-x64_bin.tar.gz -C /usr/java
+chown -R root:root /usr/java
+chown -R +x /usr/java/bin
+update-alternatives --install /usr/bin/java java /usr/java/jdk-11*/bin/java 1065
+update-alternatives --install /usr/bin/javac javac /usr/java/jdk-11*/bin/javac 1065
+update-alternatives --install /usr/bin/jar jar /usr/java/jdk-11*/bin/jar 1065
+update-alternatives --install /usr/bin/javaws javaws /usr/java/jdk-11*/bin/javaws 1065
+update-alternatives --config java
+```
+
+Update /etc/profile:
+````shell
+JAVA_HOME=/usr/java/jdk-11.0.2
+PATH=$PATH:$HOME/bin:$JAVA_HOME/bin
+export JAVA_HOME
+```
+
+Load /etc/profile:
+```shell
+source /etc/profile
 ```
 
 Download freeroute source

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
  <groupId>net.freerouting</groupId>
  <artifactId>freeroute</artifactId>
- <version>1.4.6-alpha</version>
+ <version>1.4.6</version>
  <packaging>jar</packaging>
 
  <name>freeroute</name>
@@ -327,7 +327,7 @@
  <dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>
- <version>27.0-jre</version>
+ <version>27.1-jre</version>
  </dependency>
  <dependency>
  <groupId>org.hamcrest</groupId>

diff --git a/src/main/java/net/freerouting/freeroute/MainApp.java b/src/main/java/net/freerouting/freeroute/MainApp.java
@@ -47,7 +47,7 @@ public final class MainApp extends Application {
  /**
  * Change this string when creating a new version
  */
- private static final String VERSION_NUMBER_STRING = "1.4.6-alpha";
+ private static final String VERSION_NUMBER_STRING = "1.4.6";
  private static final Logger LOGGER = Logger.getLogger(MainAppController.class.getName());
  private static final TestLevel DEBUG_LEVEL = TestLevel.CRITICAL_DEBUGGING_OUTPUT;