Bump to v2.6.1

ipb-halle · Oct 25, 2024 · 3f7ee62 · 3f7ee62
1 parent 65e46e5
commit 3f7ee62
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/MetFragCommandLine/pom.xml b/MetFragCommandLine/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.6.0 </version>
+		<version>2.6.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfrag.commandline</groupId>
 	<artifactId>MetFragCommandLine</artifactId>

diff --git a/MetFragLib/pom.xml b/MetFragLib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.6.0 </version>
+		<version>2.6.1</version>
 	</parent>
 	<packaging>jar</packaging>
 	<groupId>de.ipbhalle.metfraglib</groupId>

diff --git a/MetFragR/pom.xml b/MetFragR/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.6.0 </version>
+		<version>2.6.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfrag.r</groupId>
 	<artifactId>MetFragR</artifactId>

diff --git a/MetFragR/rpackage/metfRag/DESCRIPTION b/MetFragR/rpackage/metfRag/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: metfRag
 Type: Package
 Title: Identification of metabolites using mass spectrometry data
-Version: 2.6.0
+Version: 2.6.1
 Date: 2024-23-10
 Author: Christoph Ruttkies <[email protected]>, Steffen Neumann <[email protected]>, Adrian Helmchen
 Maintainer: Christoph Ruttkies <[email protected]>

diff --git a/MetFragRest/README.md b/MetFragRest/README.md
@@ -2,7 +2,7 @@
 
 ```
 mvn package
-java -Dserver.port=8090 -jar target/MetFragRest-2.6.0.jar
+java -Dserver.port=8090 -jar target/MetFragRest-2.6.1.jar
 ```
 
 ## start app
@@ -53,4 +53,4 @@ The REST API base URL can be configured. There is the file `src/main/ressources/
 
 You can override the `server.servlet.context-path` property by providing your own `application.properties` at runtime in the current working directory `./` or a `./config/` subdirectory, see [docs](https://docs.spring.io/spring-boot/docs/2.1.13.RELEASE/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files).
 
-Finally, it is possible to override both defaults and the custom `applications.properties` on the command line at runtime. First using a system property: `java -Dserver.servlet.context-path=/mybaseurl/api/v1 -Dserver.port=8090 -jar target/MetFragRest-2.6.0.jar`, which in turn can be overriden by an application property: `java -Dserver.port=8090 -jar target/MetFragRest-2.6.0.jar --server.servlet.context-path=/commandline/api/v1` which in turn can be overridden by an environment variable: `SERVER_SERVLET_CONTEXT_PATH=/overridemybaseurl mvn spring-boot:run`.
+Finally, it is possible to override both defaults and the custom `applications.properties` on the command line at runtime. First using a system property: `java -Dserver.servlet.context-path=/mybaseurl/api/v1 -Dserver.port=8090 -jar target/MetFragRest-2.6.1.jar`, which in turn can be overriden by an application property: `java -Dserver.port=8090 -jar target/MetFragRest-2.6.1.jar --server.servlet.context-path=/commandline/api/v1` which in turn can be overridden by an environment variable: `SERVER_SERVLET_CONTEXT_PATH=/overridemybaseurl mvn spring-boot:run`.
diff --git a/MetFragRest/pom.xml b/MetFragRest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.ipbhalle.metfrag</groupId>
         <artifactId>MetFrag</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
     <groupId>de.ipbhalle.metfrag.metfragrest</groupId>
     <artifactId>MetFragRest</artifactId>

diff --git a/MetFragTools/pom.xml b/MetFragTools/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.6.0 </version>
+		<version>2.6.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfrag.tools</groupId>
 	<artifactId>MetFragTools</artifactId>

diff --git a/MetFragWeb/pom.xml b/MetFragWeb/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.6.0 </version>
+		<version>2.6.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfragweb</groupId>
 	<artifactId>MetFragWeb</artifactId>

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragWebBean.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragWebBean.java
@@ -78,7 +78,7 @@
 @SessionScoped
 public class MetFragWebBean implements Serializable {
 
-	private final String version = "v2.6.0";
+	private final String version = "v2.6.1";
 	/*
 	 * combines all the settings
 	 */

diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@ MetFrag relaunched
 ==================
 
 ##### Requirements
-- Java = openjdk11
-- Apache Maven = 3.8
+- Java 17
+- Apache Maven 3.8
 
 ##### Sources
 - download sources by cloning git repository<br>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.ipbhalle.metfrag</groupId>
 	<artifactId>MetFrag</artifactId>
-	<version>2.6.0 </version>
+	<version>2.6.1</version>
 	<packaging>pom</packaging>
 	<name>MetFrag</name>
 	<modules>
@@ -24,7 +24,7 @@
 			<dependency>
 				<groupId>de.ipbhalle.metfraglib</groupId>
 				<artifactId>MetFragLib</artifactId>
-				<version>2.6.0 </version>
+				<version>2.6.1</version>
 			</dependency>
 			<dependency>
 				<groupId>junit</groupId>