Skip to content

Commit 3701151

Browse files
Michal Vavriksquakez
authored andcommitted
chore(deps): bump Maven from 3.8.6 to 3.9.14
* Closes: #6529 Signed-off-by: Michal Vavřík <michal.vavrik@aol.com>
1 parent 2554df9 commit 3701151

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FROM $CK_BASE_IMAGE AS base
1919

2020
ARG IMAGE_ARCH
2121

22-
ARG MAVEN_DEFAULT_VERSION="3.8.6"
22+
ARG MAVEN_DEFAULT_VERSION="3.9.14"
2323
ARG MAVEN_HOME="/usr/share/maven"
2424
ARG MAVEN_DIST_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_DEFAULT_VERSION}/binaries/apache-maven-${MAVEN_DEFAULT_VERSION}-bin.zip"
2525
ARG MVNW_DIR="/usr/share/maven/mvnw/"

docs/modules/ROOT/pages/contributing/developers.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ In order to build the project, you need to comply with the following requirement
2525
* **Go version 1.22+**: needed to compile and test the project. Refer to the https://golang.org/[Go website] for the installation.
2626
* **GNU Make**: used to define composite build actions. This should be already installed or available as a package if you have a good OS (https://www.gnu.org/software/make/).
2727
* **JDK version 17+**: the build requires JDK version 17 or above. This corresponds to the JDK version of the integration base image.
28-
* **Maven version 3.8+**: the build requires Maven 3.8 or above. This corresponds to the version defined in the `build/Dockerfile`.
28+
* **Maven version 3.9+**: the build requires Maven 3.9 or above. This corresponds to the version defined in the `build/Dockerfile`.
2929
* **MinGW**: needed to compile the project on Windows. Refer to the https://www.mingw-w64.org/[MinGW website] for the installation.
3030
* **Windows Subsystem for Linux (WSL)**: for running Linux binary executables natively on Windows. Refer to https://docs.microsoft.com/en-us/windows/wsl/install[WSL Website] for installation. Alternatively, you can use https://www.cygwin.com/[Cygwin] or https://www.educative.io/edpresso/how-to-install-git-bash-in-windows[Git Bash].
3131
* **Docker**: the image build requires https://www.docker.com/[Docker] and the https://github.com/docker/buildx[buildx plugin].

docs/modules/ROOT/pages/installation/advanced/offline.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ WARNING: This guide is a best effort development done to help the final user to
3434

3535
The procedure contains a script that will package the entire set of Camel K Runtime dependencies required by Maven build in order to run offline builds.
3636

37-
It requires that the Maven version from where you're running the scripts (likely your machine) is the same used in the Camel K operator target version (ie, 3.8.6 for Camel K version 2.3.0) - required to enforce reproducible builds. The script will download the correct version if needed.
37+
It requires that the Maven version from where you're running the scripts (likely your machine) is the same used in the Camel K operator target version (ie, 3.9.14 for Camel K version {last-released-version}) - required to enforce reproducible builds. The script will download the correct version if needed.
3838

3939
It's quite important to know that the operator will expect the dependencies to be owned by 1001 user. So, make sure that the script is executed by such a USER to avoid the maven build to fail due to privileges faults.
4040

docs/modules/ROOT/partials/apis/camel-k-crds.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4653,7 +4653,7 @@ See https://maven.apache.org/guides/mini/guide-using-extensions.html.
46534653
46544654
The CLI options that are appended to the list of arguments for Maven commands,
46554655
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
4656-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
4656+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
46574657
46584658
46594659
|===

docs/modules/ROOT/partials/apis/crds-html.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3775,7 +3775,7 @@ See <a href="https://maven.apache.org/guides/mini/guide-using-extensions.html">h
37753775
<td>
37763776
<p>The CLI options that are appended to the list of arguments for Maven commands,
37773777
e.g., <code>-V,--no-transfer-progress,-Dstyle.color=never</code>.
3778-
See <a href="https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html">https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html</a>.</p>
3778+
See <a href="https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html">https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html</a>.</p>
37793779
</td>
37803780
</tr>
37813781
</tbody>

helm/camel-k/crds/camel-k-crds.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ spec:
416416
description: |-
417417
The CLI options that are appended to the list of arguments for Maven commands,
418418
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
419-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
419+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
420420
items:
421421
type: string
422422
type: array
@@ -1346,7 +1346,7 @@ spec:
13461346
description: |-
13471347
The CLI options that are appended to the list of arguments for Maven commands,
13481348
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
1349-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
1349+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
13501350
items:
13511351
type: string
13521352
type: array
@@ -3493,7 +3493,7 @@ spec:
34933493
description: |-
34943494
The CLI options that are appended to the list of arguments for Maven commands,
34953495
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
3496-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
3496+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
34973497
items:
34983498
type: string
34993499
type: array
@@ -5970,7 +5970,7 @@ spec:
59705970
description: |-
59715971
The CLI options that are appended to the list of arguments for Maven commands,
59725972
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
5973-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
5973+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
59745974
items:
59755975
type: string
59765976
type: array
@@ -8481,7 +8481,7 @@ spec:
84818481
description: |-
84828482
The CLI options that are appended to the list of arguments for Maven commands,
84838483
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
8484-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
8484+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
84858485
items:
84868486
type: string
84878487
type: array
@@ -10843,7 +10843,7 @@ spec:
1084310843
description: |-
1084410844
The CLI options that are appended to the list of arguments for Maven commands,
1084510845
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
10846-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
10846+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
1084710847
items:
1084810848
type: string
1084910849
type: array

pkg/apis/camel/v1/maven_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type MavenSpec struct {
5050
Extension []MavenArtifact `json:"extension,omitempty"`
5151
// The CLI options that are appended to the list of arguments for Maven commands,
5252
// e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
53-
// See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
53+
// See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
5454
CLIOptions []string `json:"cliOptions,omitempty"`
5555
}
5656

pkg/client/camel/applyconfiguration/camel/v1/mavenspec.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resources/config/crd/bases/camel.apache.org_builds.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ spec:
416416
description: |-
417417
The CLI options that are appended to the list of arguments for Maven commands,
418418
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
419-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
419+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
420420
items:
421421
type: string
422422
type: array
@@ -1346,7 +1346,7 @@ spec:
13461346
description: |-
13471347
The CLI options that are appended to the list of arguments for Maven commands,
13481348
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
1349-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
1349+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
13501350
items:
13511351
type: string
13521352
type: array

pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ spec:
209209
description: |-
210210
The CLI options that are appended to the list of arguments for Maven commands,
211211
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
212-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
212+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
213213
items:
214214
type: string
215215
type: array
@@ -2686,7 +2686,7 @@ spec:
26862686
description: |-
26872687
The CLI options that are appended to the list of arguments for Maven commands,
26882688
e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
2689-
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
2689+
See https://maven.apache.org/ref/3.9.14/maven-embedder/cli.html.
26902690
items:
26912691
type: string
26922692
type: array

0 commit comments

Comments
 (0)