Skip to content

Commit

Permalink
Merge branch 'main' into test/testbench-e2e-withcaption-support
Browse files Browse the repository at this point in the history
  • Loading branch information
joelpop authored May 6, 2024
2 parents 5d8f3e9 + f046a79 commit e8f1f64
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions flow-plugins/flow-dev-bundle-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
<scope>provided</scope>
</dependency>

Expand All @@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
<goalPrefix>flow</goalPrefix>
Expand Down
4 changes: 2 additions & 2 deletions flow-plugins/flow-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -77,7 +77,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
<goalPrefix>flow</goalPrefix>
Expand Down
4 changes: 2 additions & 2 deletions flow-tests/test-express-build/test-flow-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
<goalPrefix>test-flow</goalPrefix>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/vaadin-spring-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<component.version>24.3.10</component.version>
<component.version>24.3.11</component.version>
<nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true
</skipErrorNoDescriptorsFound>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<hibernate.validator.version>8.0.1.Final</hibernate.validator.version>
<slf4j.version>2.0.13</slf4j.version>
<polymer.version>2.6.1</polymer.version>
<jackson.version>2.17.0</jackson.version>
<jackson.version>2.17.1</jackson.version>
<jackson.databind.version>${jackson.version}</jackson.databind.version>
<jakarta.validation.version>3.0.2</jakarta.validation.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
Expand Down

0 comments on commit e8f1f64

Please sign in to comment.