Skip to content

Commit

Permalink
1.2.1 (#255)
Browse files Browse the repository at this point in the history
  • Loading branch information
martin-lindstrom authored Jun 25, 2024
1 parent 337fce5 commit 8f6f8c7
Show file tree
Hide file tree
Showing 441 changed files with 11,472 additions and 7,606 deletions.
6 changes: 3 additions & 3 deletions bankid-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>se.swedenconnect.bankid</groupId>
<artifactId>saml-bankid-idp-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>

<name>Sweden Connect :: BankID :: Relying Party API</name>
Expand Down Expand Up @@ -100,12 +100,12 @@
<groupId>se.swedenconnect.security</groupId>
<artifactId>credentials-support</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
Expand Down
22 changes: 11 additions & 11 deletions bankid-frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>se.swedenconnect.bankid</groupId>
<artifactId>saml-bankid-idp-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>

<name>Sweden Connect :: BankID :: SAML Identity Provider :: Frontend Distribution</name>
Expand Down Expand Up @@ -53,13 +53,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<node.version>v18.12.1</node.version>
<node.version>v18.18.0</node.version>
</properties>

<build>

<plugins>

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
Expand All @@ -70,15 +70,15 @@
</fileset>
</filesets>
</configuration>
</plugin>
</plugin>

<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.12.1</version>
<configuration>
<workingDirectory>${project.basedir}</workingDirectory>
</configuration>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
Expand Down Expand Up @@ -118,7 +118,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand All @@ -129,20 +129,20 @@
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</configuration>
<executions>
<execution>
<id>build-zip</id>
<id>build-zip</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>

</build>

</project>
59 changes: 29 additions & 30 deletions bankid-idp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>se.swedenconnect.bankid</groupId>
<artifactId>saml-bankid-idp-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>

<name>Sweden Connect :: BankID :: SAML Identity Provider</name>
Expand Down Expand Up @@ -58,17 +58,17 @@

<dependencyManagement>
<dependencies>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.19.7</version>
<version>1.19.8</version>
<type>pom</type>
<scope>import</scope>
</dependency>

</dependencies>

</dependencyManagement>

<dependencies>
Expand All @@ -95,7 +95,7 @@
<dependency>
<groupId>se.swedenconnect.spring.saml.idp</groupId>
<artifactId>saml-idp-spring-boot-starter</artifactId>
<version>2.1.1</version>
<version>2.1.3</version>
</dependency>

<dependency>
Expand All @@ -118,11 +118,10 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.1</version>
</dependency>

<!--
Expand All @@ -135,7 +134,7 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>3.27.2</version>
<version>3.32.0</version>
</dependency>

<!--
Expand All @@ -144,7 +143,7 @@
<artifactId>redisson</artifactId>
<version>3.25.2</version>
</dependency>
-->
-->

<dependency>
<groupId>org.springframework.session</groupId>
Expand Down Expand Up @@ -202,14 +201,14 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.16.1</version>
<version>1.17.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>3.2.0</version>
<version>3.7.0</version>
<scope>test</scope>
</dependency>

Expand All @@ -225,13 +224,13 @@
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>

<plugins>

<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand Down Expand Up @@ -266,7 +265,7 @@
<image>${DOCKER_REPO}/swedenconnect/bankid-saml-idp</image>
<tags>
<tag>${project.version}</tag>
</tags>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
Expand All @@ -278,7 +277,7 @@
<org.opencontainers.image.source>https://github.com/swedenconnect/bankid-saml-idp</org.opencontainers.image.source>
<org.opencontainers.image.description>BankID SAML IdP</org.opencontainers.image.description>
<org.opencontainers.image.licenses>Apache-2.0</org.opencontainers.image.licenses>
</labels>
</labels>
</container>
</configuration>
<executions>
Expand All @@ -292,7 +291,7 @@
<to>
<image>bankid-saml-idp</image>
</to>
</configuration>
</configuration>
</execution>
<execution>
<id>default-cli</id>
Expand Down Expand Up @@ -335,9 +334,9 @@
</testResources>

</build>

<profiles>

<profile>
<id>with-frontend</id>
<activation>
Expand All @@ -346,10 +345,10 @@
<name>!backend-only</name>
</property>
</activation>

<build>
<plugins>

<!-- Unpack the frontend zip -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -375,7 +374,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down Expand Up @@ -418,31 +417,31 @@
</configuration>
</execution>
</executions>
</plugin>
</plugin>

</plugins>
</build>

</profile>

<!--
Build backend only: mvn clean install -Dbackend-only
-->
<profile>

<id>backend-only-profile</id>
<activation>
<property>
<name>backend-only</name>
</property>
</activation>

<build>
<finalName>bankid-idp-backend-${project.version}</finalName>
</build>

</profile>

</profiles>

</project>
Loading

0 comments on commit 8f6f8c7

Please sign in to comment.