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

Merge from main to develop #483

Merged
merged 4 commits into from
Oct 9, 2024
Merged

Merge from main to develop #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88b6085
Versioning 5.10.1
joneubank Jun 27, 2024
0cfd42f
Merge pull request #415 from overture-stack/rc/5.10.1
joneubank Jun 27, 2024
4bcd906
Rc/5.11.0 (#418)
leoraba Jul 4, 2024
92d49f7
Merge branch 'master' into develop
leoraba Oct 9, 2024
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S

<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.10.1-SNAPSHOT</version>
<version>5.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>${project.name}</description>
Expand Down
2 changes: 1 addition & 1 deletion score-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.10.1-SNAPSHOT</version>
<version>5.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 0 additions & 4 deletions score-client/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,3 @@ logging:
springframework.web: DEBUG
com.amazonaws.services: DEBUG

---
###############################################################################
# Profile - "debug"
###############################################################################
2 changes: 1 addition & 1 deletion score-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.10.1-SNAPSHOT</version>
<version>5.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-fs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.10.1-SNAPSHOT</version>
<version>5.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.10.1-SNAPSHOT</version>
<version>5.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions score-server/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ s3:
upload.directory: upload
upload.expiration: 6
data.directory: data
# COL-131: Change pre-signed URLs TTL to 1 day max
download.expiration: 1

# custom meta property with md5 hash, unused when upload state files are available (default behaviour)
# customMd5Property: md5chksum
Expand All @@ -59,8 +61,6 @@ bucket:

object:
sentinel: heliograph
# COL-131: Change pre-signed URLs TTL to 1 day max
download.expiration: 1

upload:
retry.limit: 5
Expand Down
2 changes: 1 addition & 1 deletion score-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.10.1-SNAPSHOT</version>
<version>5.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down