Skip to content

Commit

Permalink
Merge branch 'master' into java-17
Browse files Browse the repository at this point in the history
  • Loading branch information
bdemers authored Apr 19, 2022
2 parents 7161457 + e2e396b commit 42ea0e6
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/graalvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
RUN_IT: true
OKTA_ITS_TIMEOUT: PT45s
steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3

- name: Set up GraalVM
uses: graalvm/[email protected].2
uses: graalvm/[email protected].3
with:
version: '${{ env.graalvm_version }}'
java-version: '17'
Expand All @@ -53,7 +53,7 @@ jobs:
run: ./src/ci/gh-build.sh

- name: Archive Binary
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@v3
with:
name: okta-cli-${{ matrix.os }}-x86_64
path: cli/target/okta
Expand All @@ -71,12 +71,12 @@ jobs:
RUN_IT: true

steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
- uses: ilammy/[email protected]
- uses: microsoft/[email protected]

- name: Set up GraalVM
uses: graalvm/[email protected].2
uses: graalvm/[email protected].3
with:
version: '${{ env.graalvm_version }}'
java-version: '17'
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
shell: cmd

- name: Archive Binary
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@v3
with:
name: okta-cli-${{ matrix.os }}-x86_64.exe
path: cli/target/okta.exe
6 changes: 3 additions & 3 deletions cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.3.1</version>
<version>4.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -131,7 +131,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.0</version>
<version>3.10.1</version>
<configuration>
<verbose>true</verbose>
<annotationProcessorPaths>
Expand Down Expand Up @@ -257,7 +257,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.4</version>
<version>2.6.6</version>
<configuration>
<mainClass>com.okta.cli.OktaCli</mainClass>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<version>1.18.24</version>
<optional>true</optional>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M6</version>
<executions>
<!-- We should be able to run coverage using something like this, but we need to resolve a user home issue first -->
<execution>
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.13.1</version>
<version>2.13.2.20220328</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -97,7 +97,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<version>31.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -107,7 +107,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.3.1</version>
<version>4.4.0</version>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
Expand Down Expand Up @@ -150,7 +150,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>6.5.3</version>
<version>7.0.4</version>
<configuration>
<cveUrlModified>https://nvd.nist.gov/feeds/json/cve/1.1/nvdcve-1.1-modified.json.gz</cveUrlModified>
<cveUrlBase>https://nvd.nist.gov/feeds/json/cve/1.1/nvdcve-1.1-%d.json.gz</cveUrlBase>
Expand All @@ -174,7 +174,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.5.3.0</version>
<version>4.6.0.0</version>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
Expand All @@ -186,7 +186,7 @@
<plugin>
<groupId>com.h3xstream.findsecbugs</groupId>
<artifactId>findsecbugs-plugin</artifactId>
<version>1.11.0</version>
<version>1.12.0</version>
</plugin>
</plugins>
</configuration>
Expand All @@ -212,7 +212,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.0</version>
<version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down

0 comments on commit 42ea0e6

Please sign in to comment.