You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/06/01 08:13:37 UTC

[camel] branch main updated (939af3e63a9 -> 35cad2e8ab0)

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

acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 939af3e63a9 Sync deps
     new 25ae65f3aaa Remove Velocity deprecation in Camel API Component Maven Plugin
     new 43bb78f4093 Remove Velocity deprecation in Camel API Component Maven Plugin
     new 35cad2e8ab0 Remove Velocity deprecation in Camel API Component Maven Plugin

The 3 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.


Summary of changes:
 .../src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


[camel] 03/03: Remove Velocity deprecation in Camel API Component Maven Plugin

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 35cad2e8ab0ff3f0d0c1ce7e791322f9a18eb23c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 1 10:11:49 2023 +0200

    Remove Velocity deprecation in Camel API Component Maven Plugin
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
index c410ed6d2af..13d2efc0266 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
@@ -79,7 +79,7 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo {
         static {
             // initialize velocity to load resources from class loader and use Log4J
             Properties velocityProperties = new Properties();
-            velocityProperties.setProperty("resource.loaders", "cloader");
+            velocityProperties.setProperty(RuntimeConstants.RESOURCE_LOADERS, "cloader");
             velocityProperties.setProperty("resource.loader.cloader.class", ClasspathResourceLoader.class.getName());
             Logger velocityLogger = LoggerFactory.getLogger("org.apache.camel.maven.Velocity");
             velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_NAME, velocityLogger.getName());


[camel] 01/03: Remove Velocity deprecation in Camel API Component Maven Plugin

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 25ae65f3aaa3e8b828fc4c2ed5ef977644c21f64
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 1 09:56:35 2023 +0200

    Remove Velocity deprecation in Camel API Component Maven Plugin
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
index 24f4b893148..5dd8d375652 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
@@ -80,7 +80,7 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo {
             // initialize velocity to load resources from class loader and use Log4J
             Properties velocityProperties = new Properties();
             velocityProperties.setProperty(RuntimeConstants.RESOURCE_LOADER, "cloader");
-            velocityProperties.setProperty("cloader.resource.loader.class", ClasspathResourceLoader.class.getName());
+            velocityProperties.setProperty("resource.loader.cloader.class", ClasspathResourceLoader.class.getName());
             Logger velocityLogger = LoggerFactory.getLogger("org.apache.camel.maven.Velocity");
             velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_NAME, velocityLogger.getName());
             ENGINE = new VelocityEngine(velocityProperties);


[camel] 02/03: Remove Velocity deprecation in Camel API Component Maven Plugin

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 43bb78f4093959a3e7d0bcf979f3debaab9dd279
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 1 10:03:32 2023 +0200

    Remove Velocity deprecation in Camel API Component Maven Plugin
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
index 5dd8d375652..c410ed6d2af 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java
@@ -79,7 +79,7 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo {
         static {
             // initialize velocity to load resources from class loader and use Log4J
             Properties velocityProperties = new Properties();
-            velocityProperties.setProperty(RuntimeConstants.RESOURCE_LOADER, "cloader");
+            velocityProperties.setProperty("resource.loaders", "cloader");
             velocityProperties.setProperty("resource.loader.cloader.class", ClasspathResourceLoader.class.getName());
             Logger velocityLogger = LoggerFactory.getLogger("org.apache.camel.maven.Velocity");
             velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_NAME, velocityLogger.getName());