Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 121090_verifica-fir…
Browse files Browse the repository at this point in the history
…ma-eidas-1.18.0

 Conflicts:
	CHANGELOG.md
	CONTAINER-SCAN-REPORT.md
	RELEASE-NOTES.md
	pdfdocs/CHANGELOG.pdf
	pdfdocs/RELEASE-NOTES.pdf
w	src/main/java/it/eng/parer/eidas/web/config/DSSBeanConfig.java
  • Loading branch information
sinattieng committed Jul 4, 2024
2 parents 443a058 + 683fab1 commit 213560b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: GitHub Release
on:
push:
# Pattern matched against refs/tags
tags:
- '*' # every new tag
jobs:
release:
uses: RegioneER/parer-github-template/.github/workflows/github-release.yml@v1
Binary file removed pdfdocs/CHANGELOG.pdf
Binary file not shown.
Binary file removed pdfdocs/RELEASE-NOTES.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>verifica-firma-eidas</artifactId>
<version>1.16.1-SNAPSHOT</version>
<version>1.17.1-SNAPSHOT</version>
<packaging>${packaging.type}</packaging>
<name>Verifica Firma EIDAS</name>
<description>Progetto per effettuare firme e validazioni con librerie DSS (EIDAS)</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,11 @@ public class DSSBeanConfig {
private boolean revokeRemoveExpired;

/* in ms */
@Value("${dataloader.timeoutconnection:120000}")
@Value("${dataloader.timeoutconnection:1200000}")
private int timeoutConnection;

/* in ms */
@Value("${dataloader.timeoutsocket:120000}")
@Value("${dataloader.timeoutsocket:1200000}")
private int timeoutSocket;

@Value("${dataloader.connectionsmaxtotal:40}")
Expand All @@ -175,11 +175,11 @@ public class DSSBeanConfig {
private int connectionsMaxPerRoute;

/* in ms */
@Value("${dataloader.connectiontimetolive:120000}")
@Value("${dataloader.connectiontimetolive:1200000}")
private int connectionTimeToLive;

/* in ms */
@Value("${dataloader.ldaptimeoutconnection:120000}")
@Value("${dataloader.ldaptimeoutconnection:1200000}")
private String ldapTimeoutConnection;

@Value("${cache.enabled:true}")
Expand Down

0 comments on commit 213560b

Please sign in to comment.