You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/02/18 12:06:37 UTC
(camel) branch jbang-mvn created (now b530d1815c6)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch jbang-mvn
in repository https://gitbox.apache.org/repos/asf/camel.git
at b530d1815c6 CAMEL-21756: camel-jbang - upgrade maven wrapper to 3.9.9 for export
This branch includes the following new commits:
new b530d1815c6 CAMEL-21756: camel-jbang - upgrade maven wrapper to 3.9.9 for export
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(camel) 01/01: CAMEL-21756: camel-jbang - upgrade maven wrapper to 3.9.9 for export
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch jbang-mvn
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b530d1815c62bd280d53276c74bab800d4a07f57
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Feb 18 13:06:22 2025 +0100
CAMEL-21756: camel-jbang - upgrade maven wrapper to 3.9.9 for export
---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++--
.../maven-wrapper/.mvn/wrapper/maven-wrapper.jar | Bin 63028 -> 0 bytes
.../.mvn/wrapper/maven-wrapper.properties | 20 --------------------
.../main/resources/maven-wrapper/maven-wrapper.jar | Bin 62547 -> 63028 bytes
.../maven-wrapper/maven-wrapper.properties | 6 ++++--
5 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 82eed0c1d5f..26a504fb8c2 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -804,10 +804,10 @@ public abstract class ExportBaseCommand extends CamelCommand {
IOHelper.copyAndCloseInput(is, new FileOutputStream(new File(BUILD_DIR, "mvnw")));
is = ExportBaseCommand.class.getClassLoader().getResourceAsStream("maven-wrapper/mvnw.cmd");
IOHelper.copyAndCloseInput(is, new FileOutputStream(new File(BUILD_DIR, "mvnw.cmd")));
- is = ExportBaseCommand.class.getClassLoader().getResourceAsStream("maven-wrapper/.mvn/wrapper/maven-wrapper.jar");
+ is = ExportBaseCommand.class.getClassLoader().getResourceAsStream("maven-wrapper/maven-wrapper.jar");
IOHelper.copyAndCloseInput(is, new FileOutputStream(new File(wrapper, "maven-wrapper.jar")));
is = ExportBaseCommand.class.getClassLoader()
- .getResourceAsStream("maven-wrapper/.mvn/wrapper/maven-wrapper.properties");
+ .getResourceAsStream("maven-wrapper/maven-wrapper.properties");
IOHelper.copyAndCloseInput(is, new FileOutputStream(new File(wrapper, "maven-wrapper.properties")));
// set execute file permission on mvnw/mvnw.cmd files
File file = new File(BUILD_DIR, "mvnw");
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/.mvn/wrapper/maven-wrapper.jar b/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 7967f30dd1d..00000000000
Binary files a/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/.mvn/wrapper/maven-wrapper.properties b/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index 9548abd8e8c..00000000000
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-wrapperVersion=3.3.2
-distributionType=bin
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/maven-wrapper.jar b/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/maven-wrapper.jar
index cb28b0e37c7..7967f30dd1d 100644
Binary files a/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/maven-wrapper.jar and b/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/maven-wrapper.jar differ
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/maven-wrapper.properties b/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/maven-wrapper.properties
index eacdc9ed17a..9548abd8e8c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/maven-wrapper.properties
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/maven-wrapper/maven-wrapper.properties
@@ -14,5 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+wrapperVersion=3.3.2
+distributionType=bin
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar