This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fc7e2c7a30e4 Replace no more maintained com.squareup:javapoet by
com.palantir.javapoet:javapoet
fc7e2c7a30e4 is described below
commit fc7e2c7a30e417709a7210e87a54a36873786ab0
Author: Aurélien Pupier <[email protected]>
AuthorDate: Fri May 22 10:23:39 2026 +0200
Replace no more maintained com.squareup:javapoet by
com.palantir.javapoet:javapoet
the squareup one was deprecated in 2020 and the repo has been archived
in 2024
Palantir one is a fork of the squareup javapoet project.
* maven coordinate adjusted
* package name adjusted
* few api change to use methods instead of attributes as they became
private
* fixed one method in our code thanks to stricter check introduced
https://github.com/palantir/javapoet/commit/04b6134bb013bad77719035f78d577ff45737b36
Signed-off-by: Aurélien Pupier <[email protected]>
---
.../camel-servicenow-maven-plugin/pom.xml | 2 +-
.../camel/maven/CamelServiceNowGenerateMojo.java | 10 ++++----
.../camel-yaml-dsl-maven-plugin/pom.xml | 2 +-
.../dsl/yaml/GenerateYamlDeserializersMojo.java | 27 +++++++++++-----------
.../maven/dsl/yaml/GenerateYamlSupportMojo.java | 4 ++--
.../maven/dsl/yaml/support/TypeSpecHolder.java | 2 +-
.../maven/dsl/yaml/support/YamlProperties.java | 2 +-
parent/pom.xml | 2 +-
tooling/openapi-rest-dsl-generator/pom.xml | 2 +-
.../generator/openapi/AppendableGenerator.java | 2 +-
.../camel/generator/openapi/FilerGenerator.java | 2 +-
.../openapi/MethodBodySourceCodeEmitter.java | 2 +-
.../camel/generator/openapi/PathGenerator.java | 2 +-
.../openapi/RestDslSourceCodeGenerator.java | 10 ++++----
.../openapi/MethodBodySourceCodeEmitterTest.java | 4 ++--
.../generator/openapi/OperationVisitorTest.java | 4 ++--
16 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
index c1bff0f2225e..0d77e3c9c941 100644
--- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
@@ -102,7 +102,7 @@
</dependency>
<dependency>
- <groupId>com.squareup</groupId>
+ <groupId>com.palantir.javapoet</groupId>
<artifactId>javapoet</artifactId>
<version>${javapoet-version}</version>
</dependency>
diff --git
a/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java
b/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java
index 279a05a644a3..ebeb06289374 100644
---
a/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java
+++
b/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java
@@ -37,11 +37,11 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.AnnotationSpec;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.JavaFile;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.TypeSpec;
import org.apache.camel.component.extension.MetaDataExtension;
import org.apache.camel.component.servicenow.ServiceNowComponent;
import org.apache.camel.component.servicenow.annotations.ServiceNowSysParm;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 90b02944c66f..cce9ab6f4e72 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -103,7 +103,7 @@
<version>${jandex-version}</version>
</dependency>
<dependency>
- <groupId>com.squareup</groupId>
+ <groupId>com.palantir.javapoet</groupId>
<artifactId>javapoet</artifactId>
<version>${javapoet-version}</version>
</dependency>
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index ff553ff4a0ae..e83a2766ec34 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -37,13 +37,13 @@ import javax.lang.model.element.Modifier;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.AnnotationSpec;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.CodeBlock;
+import com.palantir.javapoet.JavaFile;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.ParameterizedTypeName;
+import com.palantir.javapoet.TypeSpec;
import org.apache.camel.CamelContext;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
@@ -141,7 +141,7 @@ public class GenerateYamlDeserializersMojo extends
GenerateYamlSupportMojo {
}
Files.createDirectories(outputDirectory);
}
- FileUtil.updateFile(outputDirectory.resolve(typeSpec.name +
".java"), sw.toString());
+ FileUtil.updateFile(outputDirectory.resolve(typeSpec.name() +
".java"), sw.toString());
}
}
@@ -339,18 +339,18 @@ public class GenerateYamlDeserializersMojo extends
GenerateYamlSupportMojo {
&& !implementType(ci, ERROR_HANDLER_BUILDER_CLASS);
})
.map(this::generateParser)
- .sorted(Comparator.comparing(o -> o.type.name))
+ .sorted(Comparator.comparing(o -> o.type.name()))
.forEach(holder -> {
// add inner classes
deserializers.addType(holder.type);
if (holder.attributes.containsKey("node")) {
holder.attributes.get("node").forEach(node ->
constructors.addStatement(
- "case $S: return new ModelDeserializers.$L()",
node, holder.type.name));
+ "case $S: return new ModelDeserializers.$L()",
node, holder.type.name()));
}
if (holder.attributes.containsKey("type")) {
holder.attributes.get("type").forEach(type ->
constructors.addStatement(
- "case $S: return new ModelDeserializers.$L()",
type, holder.type.name));
+ "case $S: return new ModelDeserializers.$L()",
type, holder.type.name()));
}
});
@@ -661,8 +661,7 @@ public class GenerateYamlDeserializersMojo extends
GenerateYamlSupportMojo {
info.name().toString());
yamlTypeAnnotation.addMember(
"order",
-
"org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1",
- info.name().toString());
+
"org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1");
JsonNode yamlTypeDisplayName = descriptor.meta.at("/title");
if (!yamlTypeDisplayName.isMissingNode() &&
yamlTypeDisplayName.isTextual()) {
@@ -689,7 +688,7 @@ public class GenerateYamlDeserializersMojo extends
GenerateYamlSupportMojo {
yamlTypeDeprecated.booleanValue());
}
- properties.stream().sorted(Comparator.comparing(a ->
a.members.get("name").toString())).forEach(spec -> {
+ properties.stream().sorted(Comparator.comparing(a ->
a.members().get("name").toString())).forEach(spec -> {
yamlTypeAnnotation.addMember("properties", "$L", spec);
});
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
index f4e97dba1f30..d79d6ecbfc6c 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
@@ -31,8 +31,8 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Stream;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.ClassName;
+import com.palantir.javapoet.AnnotationSpec;
+import com.palantir.javapoet.ClassName;
import org.apache.camel.maven.dsl.yaml.support.IndexerSupport;
import org.apache.camel.tooling.util.Strings;
import org.apache.camel.util.AntPathMatcher;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java
index 6f5ff765d1ef..422329b14d79 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/TypeSpecHolder.java
@@ -22,7 +22,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.TypeSpec;
public class TypeSpecHolder {
public final TypeSpec type;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java
index 69282c04c7a5..5bbd442855cc 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/support/YamlProperties.java
@@ -17,7 +17,7 @@
package org.apache.camel.maven.dsl.yaml.support;
import com.fasterxml.jackson.databind.JsonNode;
-import com.squareup.javapoet.AnnotationSpec;
+import com.palantir.javapoet.AnnotationSpec;
import org.apache.camel.tooling.util.Strings;
import static
org.apache.camel.maven.dsl.yaml.GenerateYamlSupportMojo.CN_YAML_PROPERTY;
diff --git a/parent/pom.xml b/parent/pom.xml
index 73ce89c2e70c..2075011f5211 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -264,7 +264,7 @@
<jnats-version>2.25.3</jnats-version>
<javacc-maven-plugin-version>3.2.0</javacc-maven-plugin-version>
<javacrumbs-version>0.22</javacrumbs-version>
- <javapoet-version>1.13.0</javapoet-version>
+ <javapoet-version>0.15.0</javapoet-version>
<javassist-version>3.31.0-GA</javassist-version>
<jakarta-el-api-version>6.0.1</jakarta-el-api-version>
<jakarta-el-expressly-version>6.0.0</jakarta-el-expressly-version>
diff --git a/tooling/openapi-rest-dsl-generator/pom.xml
b/tooling/openapi-rest-dsl-generator/pom.xml
index 86f767d0a533..2e5d75584c86 100644
--- a/tooling/openapi-rest-dsl-generator/pom.xml
+++ b/tooling/openapi-rest-dsl-generator/pom.xml
@@ -44,7 +44,7 @@
<artifactId>camel-xml-io</artifactId>
</dependency>
<dependency>
- <groupId>com.squareup</groupId>
+ <groupId>com.palantir.javapoet</groupId>
<artifactId>javapoet</artifactId>
<version>${javapoet-version}</version>
</dependency>
diff --git
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java
index be7fd5d75b0f..519d41b9deec 100644
---
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java
+++
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java
@@ -18,7 +18,7 @@ package org.apache.camel.generator.openapi;
import java.io.IOException;
-import com.squareup.javapoet.JavaFile;
+import com.palantir.javapoet.JavaFile;
import io.swagger.v3.oas.models.OpenAPI;
final class AppendableGenerator extends RestDslSourceCodeGenerator<Appendable>
{
diff --git
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java
index a274b35b7736..e79cbd7aebe7 100644
---
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java
+++
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import javax.annotation.processing.Filer;
-import com.squareup.javapoet.JavaFile;
+import com.palantir.javapoet.JavaFile;
import io.swagger.v3.oas.models.OpenAPI;
final class FilerGenerator extends RestDslSourceCodeGenerator<Filer> {
diff --git
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java
index 315f099f3891..6ba2c1633c09 100644
---
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java
+++
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitter.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.StringJoiner;
import java.util.stream.Collectors;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.MethodSpec;
import static org.apache.commons.lang3.ClassUtils.isPrimitiveOrWrapper;
diff --git
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java
index 610ec0c836d2..883e3b2a1900 100644
---
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java
+++
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java
@@ -19,7 +19,7 @@ package org.apache.camel.generator.openapi;
import java.io.IOException;
import java.nio.file.Path;
-import com.squareup.javapoet.JavaFile;
+import com.palantir.javapoet.JavaFile;
import io.swagger.v3.oas.models.OpenAPI;
final class PathGenerator extends RestDslSourceCodeGenerator<Path> {
diff --git
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java
index 03278d7db3fe..bb151deabca2 100644
---
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java
+++
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslSourceCodeGenerator.java
@@ -27,11 +27,11 @@ import jakarta.annotation.Generated;
import javax.lang.model.element.Modifier;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.AnnotationSpec;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.JavaFile;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.TypeSpec;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.info.Info;
diff --git
a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java
b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java
index f6a6025ffd35..be00fbc10cc8 100644
---
a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java
+++
b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.generator.openapi;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.MethodSpec.Builder;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.MethodSpec.Builder;
import org.apache.camel.model.rest.RestParamType;
import org.junit.jupiter.api.Test;
diff --git
a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java
b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java
index 210a9ecfbd30..7def883c58e8 100644
---
a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java
+++
b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.generator.openapi;
import java.util.Arrays;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.MethodSpec.Builder;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.MethodSpec.Builder;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem;
