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.

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

Env update #42

Merged
merged 31 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8708d1d
Bump actions/upload-artifact from 2 to 3
dependabot[bot] Nov 10, 2022
4a3ef5b
Bump actions/download-artifact from 2 to 3
dependabot[bot] Nov 10, 2022
c3f9c16
Bump jackson.version from 2.9.8 to 2.14.0
dependabot[bot] Nov 10, 2022
9d921ea
Bump postgresql from 42.2.5 to 42.5.0
dependabot[bot] Nov 10, 2022
f5fb0e7
Bump junit from 4.11 to 4.13.2
dependabot[bot] Nov 10, 2022
b248fa4
Merge pull request #24 from HSLdevcom/dependabot/github_actions/devel…
mjaakko Nov 10, 2022
bec82ee
Merge pull request #23 from HSLdevcom/dependabot/github_actions/devel…
mjaakko Nov 10, 2022
474146b
Merge pull request #27 from HSLdevcom/dependabot/maven/develop/junit-…
mjaakko Nov 10, 2022
4938160
Merge pull request #25 from HSLdevcom/dependabot/maven/develop/jackso…
mjaakko Nov 10, 2022
95ea9a7
Merge pull request #26 from HSLdevcom/dependabot/maven/develop/org.po…
mjaakko Nov 10, 2022
52b49d1
Bump jackson.version from 2.14.0 to 2.14.1
dependabot[bot] Dec 1, 2022
706d16f
Bump maven-shade-plugin from 3.2.1 to 3.4.1
dependabot[bot] Dec 1, 2022
2020b0e
Bump actions/checkout from 2 to 3
dependabot[bot] Dec 1, 2022
c1c045d
Bump elgohr/Publish-Docker-Github-Action from 4 to 5
dependabot[bot] Dec 1, 2022
ab18ce7
Merge pull request #32 from HSLdevcom/dependabot/github_actions/devel…
mjaakko Dec 1, 2022
1689c3f
Merge pull request #31 from HSLdevcom/dependabot/maven/develop/org.ap…
mjaakko Dec 1, 2022
8c93b7a
Merge pull request #30 from HSLdevcom/dependabot/maven/develop/jackso…
mjaakko Dec 1, 2022
e8f834d
Bump maven-compiler-plugin from 3.8.0 to 3.10.1
dependabot[bot] Jan 1, 2023
55fbb6e
Bump postgresql from 42.5.0 to 42.5.1
dependabot[bot] Jan 1, 2023
37b9daf
Merge pull request #35 from HSLdevcom/dependabot/maven/develop/org.po…
mjaakko Jan 2, 2023
f1e3322
Merge pull request #34 from HSLdevcom/dependabot/maven/develop/org.ap…
mjaakko Jan 2, 2023
bb7f28e
Merge pull request #33 from HSLdevcom/dependabot/github_actions/devel…
mjaakko Jan 2, 2023
2d8302d
Bump jackson.version from 2.14.1 to 2.14.2
dependabot[bot] Feb 1, 2023
a0f9d1a
Bump maven-surefire-plugin from 2.22.0 to 2.22.2
dependabot[bot] Feb 1, 2023
603a6e1
Merge pull request #37 from HSLdevcom/dependabot/maven/develop/org.ap…
mjaakko Feb 1, 2023
affdae3
Merge pull request #36 from HSLdevcom/dependabot/maven/develop/jackso…
mjaakko Feb 1, 2023
7cc4bb0
env update
ahjyrkia Oct 16, 2023
5815a03
pom.xml update
ahjyrkia Oct 16, 2023
51b298b
Merge branch 'develop' into env-update
ahjyrkia Oct 16, 2023
54f8db8
transitdata-common version bump
ahjyrkia Jan 23, 2025
2780cb5
Merge branch 'env-update' of https://github.com/HSLdevcom/transitlog-…
ahjyrkia Jan 23, 2025
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
16 changes: 8 additions & 8 deletions .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
Expand All @@ -18,7 +18,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload .jar file
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: transitlog-alert-sink.jar
path: target/transitlog-alert-sink.jar
Expand All @@ -28,14 +28,14 @@ jobs:
# Run only on develop branch
if: github.ref == 'refs/heads/develop'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Download .jar file
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: transitlog-alert-sink.jar
path: target
- name: Build and publish develop Docker image
uses: elgohr/Publish-Docker-Github-Action@v4
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: hsldevcom/transitlog-alert-sink
username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }}
Expand All @@ -47,14 +47,14 @@ jobs:
# Run only for tagged commits
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Download .jar file
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: transitlog-alert-sink.jar
path: target
- name: Build and publish release Docker image
uses: elgohr/Publish-Docker-Github-Action@v4
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: hsldevcom/transitlog-alert-sink
username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }}
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<common.version>1.4.4</common.version>
<jackson.version>2.9.8</jackson.version>
<common.version>1.5.4.1</common.version>
<jackson.version>2.14.2</jackson.version>
</properties>

<repositories>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.5</version>
<version>42.5.1</version>
</dependency>

<dependency>
Expand All @@ -53,7 +53,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -70,7 +70,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.4.1</version>
<executions>
<!-- Run shade goal on package phase -->
<execution>
Expand Down Expand Up @@ -112,7 +112,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.10.1</version>
<configuration>
<source>11</source>
<target>11</target>
Expand All @@ -121,7 +121,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>2.22.2</version>
</plugin>
</plugins>

Expand Down
2 changes: 1 addition & 1 deletion start-application.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

java -XX:InitialRAMPercentage=10.0 -XX:MaxRAMPercentage=95.0 -Ddb.username=$(cat /run/secrets/TRANSITLOG_TIMESCALE_USERNAME) -Ddb.password=$(cat /run/secrets/TRANSITLOG_TIMESCALE_PASSWORD) -jar /usr/app/transitlog-alert-sink.jar
java -XX:InitialRAMPercentage=10.0 -XX:MaxRAMPercentage=95.0 -Ddb.username=$TRANSITLOG_TIMESCALE_USERNAME -Ddb.password=$TRANSITLOG_TIMESCALE_PASSWORD -jar /usr/app/transitlog-alert-sink.jar
Loading