Update to 1.0.7

theotherp@gmx.de · theotherp@gmx.de · commit 1664c6afb7ba · 2018-01-07T00:04:20.000+01:00
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+### v1.0.7
+Fix: Fix bug in wrapper that I introduced in last version. Oh well...
+
 ### v1.0.6
 Note: Improve the way the host is determined. External URL should not need to be set when not using a reverse proxy
 Note: Remove PyYAML dependency from wrapper
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>nzbhydra2</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.0.7</version>
     </parent>
 
     <artifactId>core</artifactId>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>mapping</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <version>1.0.7</version>
         </dependency>
 
         <!-- spring (boot) -->
diff --git a/core/src/main/resources/changelog.json b/core/src/main/resources/changelog.json
@@ -1,4 +1,13 @@
 [
+  {
+  "version": "v1.0.7",
+  "changes": [
+    {
+      "type": "fix",
+      "text": "Fix bug in wrapper that I introduced in last version. Oh well..."
+    }
+  ]
+},
   {
     "version": "v1.0.6",
     "changes": [
diff --git a/misc/build-and-release.cmd b/misc/build-and-release.cmd
@@ -73,7 +73,7 @@ call git commit -am "Set snapshot to %2"
 if not "%ERRORLEVEL%" == "0" goto error
 
 echo Pushing to repo ***********************************************************************
-call git commit push
+call git push
 if not "%ERRORLEVEL%" == "0" goto error
 
 
diff --git a/misc/docker/.gitignore b/misc/docker/.gitignore
@@ -2,4 +2,6 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 *.swp
 lib/
-*.py
+*.py
+readme.md
+changelog.md
diff --git a/misc/docker/builddocker.sh b/misc/docker/builddocker.sh
@@ -1,6 +1,8 @@
 rm ./lib/*.jar
 cp ../../other/wrapper/nzbhydra2wrapper.py .
 cp ../../core/target/*-exec*.jar ./lib
+cp ../../readme.md .
+cp ../../changelog.md .
 rm ./lib/*SNAPSHOT*.jar
 echo -n "Enter version"
 read VERSION
diff --git a/other/mockserver/pom.xml b/other/mockserver/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>mapping</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <version>1.0.7</version>
         </dependency>
 
         <dependency>
diff --git a/other/wrapper/nzbhydra2wrapper.py b/other/wrapper/nzbhydra2wrapper.py
@@ -328,10 +328,11 @@ def startup():
     else:
         logger.info("No file nzbhydra.yml found. Using 128M XMX")
         xmx = 128
+    xmx = str(xmx)
     if xmx.lower().endswith("m"):
         logger.info("Removing superfluous M from XMX value " + xmx)
         xmx = xmx[:-1]
-    java_arguments = ["-Xmx" + str(xmx) + "M", "-DfromWrapper", "-XX:TieredStopAtLevel=1", "-noverify"]
+    java_arguments = ["-Xmx" + xmx + "M", "-DfromWrapper", "-XX:TieredStopAtLevel=1", "-noverify"]
     if not args.nocolors and not isWindows:
         java_arguments.append("-Dspring.output.ansi.enabled=ALWAYS")
     if args.debug:
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.nzbhydra</groupId>
     <artifactId>nzbhydra2</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.7</version>
 
     <modules>
         <module>shared</module>
diff --git a/releases/linux-release/include/nzbhydra2 b/releases/linux-release/include/nzbhydra2
diff --git a/releases/linux-release/pom.xml b/releases/linux-release/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>releases</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.0.7</version>
     </parent>
 
     <artifactId>linux-release</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>core</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <version>1.0.7</version>
         </dependency>
     </dependencies>
 
diff --git a/releases/pom.xml b/releases/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>nzbhydra2</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.0.7</version>
     </parent>
 
     <artifactId>releases</artifactId>
diff --git a/releases/windows-release/include/NZBHydra2 Console.exe b/releases/windows-release/include/NZBHydra2 Console.exe
diff --git a/releases/windows-release/include/NZBHydra2.exe b/releases/windows-release/include/NZBHydra2.exe
diff --git a/releases/windows-release/pom.xml b/releases/windows-release/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>releases</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.0.7</version>
     </parent>
 
     <artifactId>windows-release</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>core</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <version>1.0.7</version>
         </dependency>
     </dependencies>
 
diff --git a/shared/mapping/pom.xml b/shared/mapping/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>shared</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.0.7</version>
     </parent>
 
     <artifactId>mapping</artifactId>
diff --git a/shared/pom.xml b/shared/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>nzbhydra2</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.0.7</version>
     </parent>
 	
     <artifactId>shared</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>nzbhydra2</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.0.7</version>
     </parent>
 
     <artifactId>tests</artifactId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>core</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <version>1.0.7</version>
         </dependency>
 
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,13 @@`
`1`	`1`	`[`
	`2`	`+ {`
	`3`	`+ "version": "v1.0.7",`
	`4`	`+ "changes": [`
	`5`	`+ {`
	`6`	`+ "type": "fix",`
	`7`	`+ "text": "Fix bug in wrapper that I introduced in last version. Oh well..."`
	`8`	`+ }`
	`9`	`+ ]`
	`10`	`+},`
`2`	`11`	`{`
`3`	`12`	`"version": "v1.0.6",`
`4`	`13`	`"changes": [`