Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated h2 to major release 2.x #528

Merged
merged 2 commits into from
Jan 19, 2022
Merged

Updated h2 to major release 2.x #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
518d339
updated h2 to major release 2.x
serenaponta Jan 13, 2022
67ba95b
merged with master
serenaponta Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rest-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions rest-backend/src/main/java/org/eclipse/steady/backend/repo/AffectedLibraryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion rest-backend/src/main/java/org/eclipse/steady/backend/repo/LibraryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion rest-backend/src/main/resources/application-docker.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion rest-backend/src/main/resources/application-localhost.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion rest-backend/src/main/resources/application-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down