Skip to content

Commit

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

 Conflicts:
	CHANGELOG.md
	CONTAINER-SCAN-REPORT.md
	RELEASE-NOTES.md
	pdfdocs/CHANGELOG.pdf
	pdfdocs/RELEASE-NOTES.pdf
	pom.xml
	src/main/java/it/eng/parer/eidas/core/helper/EidasHelper.java
	src/main/java/it/eng/parer/eidas/web/rest/VerificaFirmaWs.java
  • Loading branch information
sinattieng committed Jul 4, 2024
2 parents 9970c49 + 174b7ce commit ab86820
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 702 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:
branches:
- master
- main
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.
22 changes: 14 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
<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.20.0</version>
<version>1.16.1-SNAPSHOT</version>
<packaging>${packaging.type}</packaging>
<name>Verifica Firma EIDAS</name>
<description>Progetto per effettuare firme e validazioni con librerie DSS (EIDAS)</description>
<url>https://nexus.ente.regione.emr.it/repository/parer-site/verifica-firma-eidas/${project.version}/</url>

<parent>
<groupId>it.eng.parer</groupId>
Expand Down Expand Up @@ -44,17 +43,24 @@
</properties>

<scm>
<developerConnection>scm:git:[email protected]:parer/okd/verifica-firma-eidas.git</developerConnection>
<tag>verifica-firma-eidas-1.20.0</tag>
<developerConnection>scm:git:https://github.com/RegioneER/parer-verifica-firma-eidas.git</developerConnection>
<tag>HEAD</tag>
</scm>

<distributionManagement>
<site>
<id>site</id>
<url>dav:https://nexus.ente.regione.emr.it/repository/parer-site/verifica-firma-eidas/${project.version}</url>
</site>
<repository>
<id>github</id>
<url>https://maven.pkg.github.com/RegioneER/parer-verifica-firma-eidas</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>github</id>
<url>https://maven.pkg.github.com/RegioneER/parer-framework-parerpom</url>
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<!-- DSS bom -->
Expand Down
Loading

0 comments on commit ab86820

Please sign in to comment.