Skip to content

Commit

Permalink
Merge pull request #457 from wultra/develop
Browse files Browse the repository at this point in the history
Merge develop to master
  • Loading branch information
banterCZ authored Jul 26, 2024
2 parents a38b034 + fe0e5a0 commit cb5d81e
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 33 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
# Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
directory: "/"
schedule:
interval: "weekly"
3 changes: 0 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
workflow_dispatch:
push:
branches: [ 'develop', 'master', 'releases/**' ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ 'develop', 'master', 'releases/**' ]
schedule:
- cron: '0 2 * * 4'

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PowerAuth Reference Client is a command-line utility used to test integration of

## Documentation

For the most recent documentation and tutorials, please visit [PowerAuth Command Line Tool Documentation on GitHub](./docs/Readme.md) or visit [developers.wultra.com](https://developers.wultra.com/docs/develop/powerauth-cmd-tool/).
For the most recent documentation and tutorials, please visit [PowerAuth Command Line Tool Documentation on GitHub](./docs/Readme.md) or visit [developers.wultra.com](https://developers.wultra.com/components/powerauth-cmd-tool/develop/documentation/).

# License

Expand Down
Binary file modified docs/images/pa_admin_application_detail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 10 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<groupId>io.getlime.security</groupId>
<artifactId>powerauth-cmd-parent</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
<packaging>pom</packaging>

<inceptionYear>2016</inceptionYear>
Expand Down Expand Up @@ -78,20 +78,19 @@

<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<spring-boot.version>3.2.4</spring-boot.version>
<bc.version>1.77</bc.version>
<commons-cli.version>1.6.0</commons-cli.version>
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
<spring-boot.version>3.3.2</spring-boot.version>
<commons-cli.version>1.8.0</commons-cli.version>
<commons-io.version>2.16.1</commons-io.version>
<json-simple.version>1.1.1</json-simple.version>

<!-- Wultra Dependencies -->
<powerauth-restful-integration>1.7.0</powerauth-restful-integration>
<powerauth-crypto.version>1.7.0</powerauth-crypto.version>
<wultra-core.version>1.9.0</wultra-core.version>
<powerauth-restful-integration>1.8.0</powerauth-restful-integration>
<powerauth-crypto.version>1.8.0</powerauth-crypto.version>
<wultra-core.version>1.10.0</wultra-core.version>
</properties>

<dependencyManagement>
Expand All @@ -109,12 +108,6 @@
<artifactId>powerauth-java-cmd-lib</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>${bc.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
8 changes: 1 addition & 7 deletions powerauth-java-cmd-lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<artifactId>powerauth-cmd-parent</artifactId>
<groupId>io.getlime.security</groupId>
<version>1.7.0</version>
<version>1.8.0</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -55,12 +55,6 @@
<version>${powerauth-crypto.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
Expand Down
6 changes: 1 addition & 5 deletions powerauth-java-cmd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>io.getlime.security</groupId>
<artifactId>powerauth-cmd-parent</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
</parent>

<dependencies>
Expand All @@ -49,10 +49,6 @@
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down

0 comments on commit cb5d81e

Please sign in to comment.