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

davsclaus 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 3cae732be89 CAMEL-19880:camel-salesforce: component still depends on 
javax.annotation-api (#11446)
3cae732be89 is described below

commit 3cae732be89d20e65d776ad72ef452f91654b1d2
Author: Luigi De Masi <[email protected]>
AuthorDate: Wed Sep 20 06:43:27 2023 +0200

    CAMEL-19880:camel-salesforce: component still depends on 
javax.annotation-api (#11446)
---
 .../src/main/resources/sobject-picklist.vm         |  2 +-
 .../src/main/resources/sobject-pojo-optional.vm    |  2 +-
 .../src/main/resources/sobject-pojo.vm             |  2 +-
 .../resources/sobject-query-records-optional.vm    |  2 +-
 .../src/main/resources/sobject-query-records.vm    |  2 +-
 .../camel-salesforce-component/pom.xml             | 28 ++++++++++++++++------
 .../salesforce/dto/generated/ContentVersion.java   |  2 +-
 .../salesforce/dto/generated/RecordType.java       |  2 +-
 .../src/test/resources/generated/Asset.java        |  2 +-
 .../resources/generated/Asset_LocalDateTime.java   |  2 +-
 .../src/test/resources/generated/Case.java         |  2 +-
 .../generated/Case_PickListAccentMarkEnum.java     |  2 +-
 .../generated/Case_PickListQuotationMarkEnum.java  |  2 +-
 .../generated/Case_PickListSlashEnum.java          |  2 +-
 .../generated/Case_PickListValueOverrideEnum.java  |  2 +-
 .../generated/ComplexCalculatedFormula.java        |  2 +-
 .../test/resources/generated/QueryRecordsCase.java |  2 +-
 .../QueryRecordsComplexCalculatedFormula.java      |  2 +-
 .../generated/With_External_Id__c_Lookup.java      |  2 +-
 .../resources/generated/With_Reference__c.java     |  2 +-
 20 files changed, 40 insertions(+), 26 deletions(-)

diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
index a3304a991bc..9509d38e3fd 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
@@ -20,7 +20,7 @@
  */
 package $packageName;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
index 5d8bdd12ff3..c633ab137be 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
@@ -22,7 +22,7 @@ package $packageName;
 
 import java.util.Optional;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 #set ( $hasPicklists = $utility.hasPicklists($desc) )
 #set ( $hasMultiSelectPicklists = $utility.hasMultiSelectPicklists($desc) )
diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
index 68bffe6cbc8..80cf5761165 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
@@ -23,7 +23,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 #set ( $hasPicklists = $utility.hasPicklists($desc) )
 #set ( $hasMultiSelectPicklists = $utility.hasMultiSelectPicklists($desc) )
diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
index db87240f695..17308421937 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
@@ -23,7 +23,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type $desc.Name
diff --git 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
index 5ae7d9a619b..a67e722011f 100644
--- 
a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
+++ 
b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
@@ -23,7 +23,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type $desc.Name
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml 
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index daa95628f9b..5b0884e9a1a 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -126,13 +126,6 @@
             <artifactId>jaxb-impl</artifactId>
             <version>${jaxb-impl-version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
         <!-- Pub/Sub API dependencies -->
         <dependency>
             <groupId>io.grpc</groupId>
@@ -293,6 +286,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <!-- Remove it once 
https://github.com/grpc/grpc-java/issues/9179 is resolved -->
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <target>
+                                <replace token= "@javax.annotation.Generated"
+                                         value="@jakarta.annotation.Generated"
+                                         
dir="target/generated-sources/protobuf/grpc-java">
+                                    <include name="**/*.java"/>
+                                </replace>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java
 
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java
index 2bf09dfbab7..1ff87ba22ad 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/ContentVersion.java
@@ -22,7 +22,7 @@ package org.apache.camel.component.salesforce.dto.generated;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 import 
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/RecordType.java
 
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/RecordType.java
index 08c7a79ba39..43e79b876f9 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/RecordType.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/RecordType.java
@@ -6,7 +6,7 @@ package org.apache.camel.component.salesforce.dto.generated;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import 
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset.java
index 52fb06caaf2..97bb55593b6 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import 
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset_LocalDateTime.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset_LocalDateTime.java
index 303c9d1414f..150c7aace8f 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset_LocalDateTime.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset_LocalDateTime.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import 
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case.java
index b7c6b481b57..c9b3ecddf5f 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import 
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListAccentMarkEnum.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListAccentMarkEnum.java
index 9274b190e6b..319170276c5 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListAccentMarkEnum.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListAccentMarkEnum.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListQuotationMarkEnum.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListQuotationMarkEnum.java
index 12aa145848e..338c4ee04cd 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListQuotationMarkEnum.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListQuotationMarkEnum.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListSlashEnum.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListSlashEnum.java
index bc4a97394c3..a6d2d7a3ada 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListSlashEnum.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListSlashEnum.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListValueOverrideEnum.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListValueOverrideEnum.java
index 70989bc890e..4f7e829109d 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListValueOverrideEnum.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListValueOverrideEnum.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/ComplexCalculatedFormula.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/ComplexCalculatedFormula.java
index 32c47134217..2ad1eae570a 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/ComplexCalculatedFormula.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/ComplexCalculatedFormula.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import 
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsCase.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsCase.java
index f7169b0f587..f86bce3cd70 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsCase.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsCase.java
@@ -6,7 +6,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type Case
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsComplexCalculatedFormula.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsComplexCalculatedFormula.java
index 9294413c0a6..1eba6862986 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsComplexCalculatedFormula.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsComplexCalculatedFormula.java
@@ -6,7 +6,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type ComplexCalculatedFormula
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
index 614761742da..23f70344f75 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_Reference__c.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_Reference__c.java
index c51163feeea..ba0f050ba10 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_Reference__c.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_Reference__c.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.processing.Generated;
+import jakarta.annotation.Generated;
 
 import 
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;

Reply via email to