Merge pull request #528 from eclipse/h2-update

Updated h2 to major release 2.x
eclipse · Jan 19, 2022 · bea7506 · bea7506
2 parents fad061a + 67ba95b
commit bea7506
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/rest-backend/pom.xml b/rest-backend/pom.xml
@@ -265,7 +265,7 @@
 				<dependency>
 					<groupId>com.h2database</groupId>
 					<artifactId>h2</artifactId>
-					<version>1.4.200</version><!-- Fix Spring Boot's dependency on vulnerable
+					<version>2.0.206</version><!-- Fix Spring Boot's dependency on vulnerable
 						h2 1.4.197 (org.springframework.boot:spring-boot-dependencies:1.5.19.RELEASE) -->
 					<scope>test</scope>
 				</dependency>

diff --git a/rest-backend/src/main/java/org/eclipse/steady/backend/repo/AffectedLibraryRepository.java b/rest-backend/src/main/java/org/eclipse/steady/backend/repo/AffectedLibraryRepository.java
@@ -114,7 +114,7 @@ List<AffectedLibrary> findByBugAndSource(
    */
   @Query(
       "SELECT afflib FROM AffectedLibrary AS afflib JOIN afflib.libraryId lid, Library l "
-          + "WHERE l.libraryId=lid AND l.wellknownDigest='true' AND"
+          + "WHERE l.libraryId=lid AND l.wellknownDigest=true AND"
           + " afflib.bugId = :bug AND afflib.source = :source")
   List<AffectedLibrary> findWellKnownByBugAndSource(
       @Param("bug") Bug bug, @Param("source") AffectedVersionSource source);
@@ -181,7 +181,7 @@ List<AffectedLibrary> findByBugAndLibIdAndSource(
    */
   @Query(
       "SELECT afflib FROM AffectedLibrary AS afflib JOIN afflib.libraryId lid, Library l "
-          + "WHERE l.libraryId=lid AND l.wellknownDigest='true' AND"
+          + "WHERE l.libraryId=lid AND l.wellknownDigest=true AND"
           + " afflib.bugId = :bug")
   List<AffectedLibrary> findWellKnownByBug(@Param("bug") Bug bug);
 

diff --git a/rest-backend/src/main/java/org/eclipse/steady/backend/repo/LibraryRepository.java b/rest-backend/src/main/java/org/eclipse/steady/backend/repo/LibraryRepository.java
@@ -326,7 +326,7 @@ List<AffectedConstructChange> findAffCCs(
               + " l1.id=bl.library_id inner join library_id lid2 on"
               + " bl.bundled_library_ids_id=lid2.id    inner join lib l2 on"
               + " bl.bundled_library_ids_id=l2.library_id_id    where d.app=:app and not l1.id ="
-              + " l2.id and l2.wellknown_digest='true' and not lid1.id=lid2.id",
+              + " l2.id and l2.wellknown_digest=true and not lid1.id=lid2.id",
       nativeQuery = true)
   List<Object[]> findBundledLibByApp(@Param("app") Application app);
 }
diff --git a/rest-backend/src/main/resources/application-docker.properties b/rest-backend/src/main/resources/application-docker.properties
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2018-2020 SAP SE or an SAP affiliate company and Eclipse Steady contributors
 #
 
-spring.profiles=docker
+spring.config.activate.on-profile=docker
 
 #server.contextPath=/backend
 

diff --git a/rest-backend/src/main/resources/application-localhost.properties b/rest-backend/src/main/resources/application-localhost.properties
@@ -17,7 +17,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2018-2020 SAP SE or an SAP affiliate company and Eclipse Steady contributors
 #
 
-spring.profiles=localhost
+spring.config.activate.on-profile=localhost
 
 
 spring.datasource.url= jdbc:postgresql://localhost:5432/vulas

diff --git a/rest-backend/src/main/resources/application-test.properties b/rest-backend/src/main/resources/application-test.properties
@@ -17,7 +17,8 @@
 # SPDX-FileCopyrightText: Copyright (c) 2018-2020 SAP SE or an SAP affiliate company and Eclipse Steady contributors
 #
 
-spring.profiles=test
+spring.config.activate.on-profile=test
+spring.datasource.url=jdbc:h2:mem:test;MODE=LEGACY
 
 server.port = 8091