Merge branch 'main' into massbank.eu

MassBank · Jun 20, 2024 · c892ab2 · c892ab2
2 parents 77c49d6 + 88f58e0
commit c892ab2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/MassBank-Project/MassBank-lib/pom.xml b/MassBank-Project/MassBank-lib/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>MassBank-Project</artifactId>
 		<groupId>de.ipb-halle.msbi</groupId>
-		<version>2.2.7</version>
+		<version>2.2.7-hotfix1</version>
 	</parent>
 
 	<artifactId>MassBank-lib</artifactId>

diff --git a/MassBank-Project/MassBank-lib/src/main/java/massbank/ResultList.java b/MassBank-Project/MassBank-lib/src/main/java/massbank/ResultList.java
@@ -312,7 +312,7 @@ public int compare(Object o1, Object o2){
 			// ソート処理
 			switch (sortKey) {
 				case SORT_KEY_NAME: {				// Nameソート
-					if (!e1.getSortName().equals(e2.getSortName())) {
+					if (!e1.getSortName().equalsIgnoreCase(e2.getSortName())) {
 						switch (sortAction) {
 							case SORT_ACTION_ASC:
 								ret = (e1.getSortName()).compareToIgnoreCase(e2.getSortName());

diff --git a/MassBank-Project/MassBank-web/pom.xml b/MassBank-Project/MassBank-web/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>MassBank-Project</artifactId>
 		<groupId>de.ipb-halle.msbi</groupId>
-		<version>2.2.7</version>
+		<version>2.2.7-hotfix1</version>
 	</parent>
 
 	<artifactId>MassBank-web</artifactId>

diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.ipb-halle.msbi </groupId>
 	<artifactId>MassBank-Project</artifactId>
-	<version>2.2.7</version>
+	<version>2.2.7-hotfix1</version>
 	<name>MassBank-Project</name>
 	<url>https://github.com/MassBank/MassBank-web</url>
 	<packaging>pom</packaging>
@@ -29,7 +29,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<versionName>${project.version}</versionName>
-		<timestamp>2024-06-04T14:10:11+02:00</timestamp>
+		<timestamp>2024-06-20T10:49:13+02:00</timestamp>
 	</properties>
 
 	<dependencyManagement>