[camel-karavan] branch main updated: First prototype for #804

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new 809741b2 First prototype for #804
809741b2 is described below

commit 809741b23a5fbfec0548369ddb12f2a8f456c11a
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Wed Jun 21 15:20:17 2023 -0400

    First prototype for #804
---
 .../karavan/cli/resources/KaravanConfigMap.java     |  3 +--
 .../resources/quarkus-builder-script-kubernetes.sh  |  6 ------
 karavan-cli/src/main/resources/settings.xml         | 21 ++++++++++++++++++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git 
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java
 
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java
index f729f3ca..2fbc1316 100644
--- 
a/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java
+++ 
b/karavan-cli/src/main/java/org/apache/camel/karavan/cli/resources/KaravanConfigMap.java
@@ -53,8 +53,7 @@ public class KaravanConfigMap {
                     .lines()
                     .map(s -> {
                         if (config.isNexusProxy() && s.contains(MAVEN_URL)) {
-                            String newMavenUrl = "<url>http://nexus."; + 
config.getNamespace() + "/</url>";
-                            return s.replace(MAVEN_URL, newMavenUrl);
+                            return s.replace("namespace", 
config.getNamespace());
                         } else {
                             return s;
                         }
diff --git 
a/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh 
b/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
index 73b5165d..02620cb3 100644
--- a/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-cli/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -2,12 +2,6 @@
 CHECKOUT_DIR="/scripts"
 KAMELETS_DIR="/scripts/kamelets"
 
-env
-
-ls -la /karavan/maven-settings.xml
-
-cat /karavan/maven-settings.xml/maven-settings
-
 if  [[ $GIT_REPOSITORY == https* ]] ;
 then
     replacer=https://$GIT_PASSWORD@
diff --git a/karavan-cli/src/main/resources/settings.xml 
b/karavan-cli/src/main/resources/settings.xml
index 9acf76d3..bdbe00ef 100644
--- a/karavan-cli/src/main/resources/settings.xml
+++ b/karavan-cli/src/main/resources/settings.xml
@@ -1,10 +1,25 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 
https://maven.apache.org/xsd/settings-1.0.0.xsd";>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 
https://maven.apache.org/xsd/settings-1.0.0.xsd";>
+    <localRepository/>
+    <interactiveMode/>
+    <offline/>
+    <pluginGroups/>
+    <servers/>
     <mirrors>
         <mirror>
-            <id>karavan-maven-repository-manager</id>
+            <id>central</id>
             <name>Maven Repository Manager</name>
             <url>https://repo.maven.apache.org/maven2/</url>
             <mirrorOf>*</mirrorOf>
         </mirror>
+        <mirror>
+            <id>karavan</id>
+            <name>Maven Repository Manager</name>
+            <url>https://nexus.namespace/</url>
+            <mirrorOf>*</mirrorOf>
+        </mirror>
     </mirrors>
-</settings>
\ No newline at end of file
+    <proxies/>
+    <profiles/>
+    <activeProfiles/>
+</settings>