Skip to content

Commit

Permalink
Merge branch '10.1.x' into merge/10.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
rbioteau authored Dec 2, 2024
2 parents 6166b9e + 223f43b commit cd44bf3
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 30 deletions.
27 changes: 22 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:

# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
target-branch: dev
schedule:
interval: "daily"
commit-message:
prefix: "chore"
include: "scope"
groups:
production-dependencies:
dependency-type: "production"
development-dependencies:
dependency-type: "development"

# Maintain dependencies for maven
- package-ecosystem: "maven"
directory: "/"
Expand All @@ -15,3 +25,10 @@ updates:
commit-message:
prefix: "chore"
include: "scope"
groups:
production-dependencies:
dependency-type: "production"
development-dependencies:
dependency-type: "development"
ignore:
- dependency-name: "*maven-install-plugin*"
4 changes: 2 additions & 2 deletions assemblies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<parent>
<groupId>org.bonitasoft</groupId>
<artifactId>bonita-project-parent</artifactId>
<version>10.0-SNAPSHOT</version>
<version>10.1-SNAPSHOT</version>
</parent>
<artifactId>bonita-project-assemblies</artifactId>
<name>Bonita Project assemblies</name>
<description>This module contains Bonita project specific assemblies</description>
<properties>
<maven.compiler.release>11</maven.compiler.release>
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
</properties>
<build>
<pluginManagement>
Expand Down
26 changes: 13 additions & 13 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.bonitasoft</groupId>
<artifactId>bonita-project-parent</artifactId>
<version>10.0-SNAPSHOT</version>
<version>10.1-SNAPSHOT</version>
</parent>
<artifactId>bonita-project</artifactId>
<packaging>pom</packaging>
Expand All @@ -16,36 +16,36 @@
<java.version>17</java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-shade-plugin.version>3.5.3</maven-shade-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
<maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
<exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
<gmavenplus-plugin.version>3.0.2</gmavenplus-plugin.version>
<maven-help-plugin.version>3.4.0</maven-help-plugin.version>
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
<!-- Should match version in bonita-runtime-bom -->
<groovy.version>3.0.19</groovy.version>
<groovy.version>3.0.21</groovy.version>
<!-- Bonita specific properties below -->
<bonita.environment>local</bonita.environment>
<!-- DO NOT USE ${project.version} or ${project.parent.version} here -->
<bonita.runtime.version>10.0-SNAPSHOT</bonita.runtime.version>
<branding.version>2024.1-SNAPSHOT</branding.version>
<bonita.runtime.version>10.1-SNAPSHOT</bonita.runtime.version>
<branding.version>2024.2-SNAPSHOT</branding.version>
<bonita-artifacts-model.version>1.0.1</bonita-artifacts-model.version>
<ui-designer-artifact-builder.version>1.0.10</ui-designer-artifact-builder.version>
<bonita-process-model.version>8.0.1</bonita-process-model.version>
<bonita-project-maven-plugin.version>1.0.2</bonita-project-maven-plugin.version>
<bonita-test-toolkit.version>2.0.0</bonita-test-toolkit.version>
<bonita-test-toolkit.version>3.0.0</bonita-test-toolkit.version>
<!-- Default inclusion filters -->
<include.organizations>*.xml</include.organizations>
<include.profiles>*.xml</include.profiles>
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.bonitasoft</groupId>
<artifactId>bonita-project-parent</artifactId>
<version>10.0-SNAPSHOT</version>
<version>10.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Bonita Project Aggregator</name>
<description>This module is the aggregator module</description>
Expand Down Expand Up @@ -36,24 +36,24 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
<maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-gpg-plugin.version>3.2.0</maven-gpg-plugin.version>
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
<spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
<!-- Spotless resources location -->
<eclipse.formatter.file>${maven.multiModuleProjectDirectory}/formatter.xml</eclipse.formatter.file>
<header.file>${maven.multiModuleProjectDirectory}/header.txt</header.file>
<!-- Test -->
<maven-invoker-plugin.version>3.6.0</maven-invoker-plugin.version>
<maven-invoker-plugin.version>3.6.1</maven-invoker-plugin.version>
</properties>
<build>
<pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.bonitasoft</groupId>
<artifactId>bonita-project-parent</artifactId>
<version>10.0-SNAPSHOT</version>
<version>10.1-SNAPSHOT</version>
</parent>
<artifactId>bonita-project-tests</artifactId>
<name>Tests for Bonita Project</name>
Expand Down

0 comments on commit cd44bf3

Please sign in to comment.