Skip to content

Commit

Permalink
Combined dependency updates (2023-12-03) (#109)
Browse files Browse the repository at this point in the history
Includes these updates:
- [Bump actions/deploy-pages from 2.0.4 to 2.0.5](#101)
- [Bump actions/setup-java from 3 to 4](#102)
- [Bump javiertuya/branch-snapshots-action from 1.2.0 to 1.2.1](#107)
- [Bump javiertuya/sharpen-action from 1.1.0 to 1.1.1](#105)
- [Bump javiertuya/sonarqube-action from 1.1.1 to 1.1.2](#106)
- [Bump commons-io:commons-io from 2.15.0 to 2.15.1](#99)
- [Bump org.apache.httpcomponents.client5:httpclient5 from 5.2.1 to 5.2.3](#98)
- [Bump org.xerial:sqlite-jdbc from 3.44.0.0 to 3.44.1.0](#100)
- [Bump NLog from 5.2.6 to 5.2.7 in /net](#103)
  • Loading branch information
giis-qabot authored Dec 3, 2023
1 parent 005ee47 commit 905e005
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Set up Apache Maven Central
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with: # running setup-java again overwrites the settings.xml
distribution: 'temurin'
java-version: '11'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
# As a last step, checks that conversion works to detect potential incompatible changes in the java side.
# Note that updates on the java side are still made in the develop environment and pushed.
- name: Validate Sharpen Conversion - Prepare Java envrionment
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
Expand All @@ -197,7 +197,7 @@ jobs:
mvn -f ../pom.xml generate-sources -am
ant clean sharpen.preprocess
- name: Validate Sharpen Conversion - Sharpen
uses: javiertuya/[email protected].0
uses: javiertuya/[email protected].1
with:
working-dir: net
project-dir: sharpen-temp/java
Expand Down Expand Up @@ -298,7 +298,7 @@ jobs:
- name: Deploy to GitHub Pages
if: always()
id: deployment
uses: actions/[email protected].4
uses: actions/[email protected].5

sonarqube:
needs: [test-java]
Expand All @@ -308,7 +308,7 @@ jobs:
if: github.actor != 'dependabot[bot]'
runs-on: ubuntu-latest
steps:
- uses: javiertuya/[email protected].1
- uses: javiertuya/[email protected].2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
sonar-token: ${{ secrets.SONAR_TOKEN }}
Expand All @@ -326,7 +326,7 @@ jobs:
contents: read
packages: write
steps:
- uses: javiertuya/[email protected].0
- uses: javiertuya/[email protected].1
with:
token: ${{ secrets.GITHUB_TOKEN }}
java-version: '11'
Expand Down
2 changes: 1 addition & 1 deletion net/TdRules/TdRules.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<ItemGroup>
<PackageReference Include="PortableCs" Version="2.2.2" />

<PackageReference Include="NLog" Version="5.2.6" />
<PackageReference Include="NLog" Version="5.2.7" />

<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<portable.version>2.2.1</portable.version>

<httpclient-version>5.2.1</httpclient-version>
<httpclient-version>5.2.3</httpclient-version>

<!-- datagen still using httpclient4, pending migration -->
<httpclient4-version>4.5.14</httpclient4-version>
Expand Down Expand Up @@ -139,7 +139,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.0</version>
<version>2.15.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -171,7 +171,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.44.0.0</version>
<version>3.44.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 905e005

Please sign in to comment.