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 2020/09/08 07:53:30 UTC
[camel] branch master updated: CAMEL-15478: Fixed itest
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 9fb67f8 CAMEL-15478: Fixed itest
9fb67f8 is described below
commit 9fb67f896da3f1cccbca0ee9f4dfbcd951a098c2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Sep 8 09:48:32 2020 +0200
CAMEL-15478: Fixed itest
---
.../maven/camel-api-component-maven-plugin/pom.xml | 1 -
.../src/it/all-it/pom.xml | 35 +++++++++++-----------
.../src/it/all-it/verify.groovy | 2 +-
.../maven/AbstractApiMethodGeneratorMojo.java | 4 +--
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index cba1288..e9f454d 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -278,7 +278,6 @@
<goals>
<goal>clean</goal>
<goal>verify</goal>
- <goal>site</goal>
</goals>
</configuration>
<executions>
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml b/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml
index 1d790af..65bbcde 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<version>@project.version@</version>
<!-- compile scope to avoid having to move AbstractTestTestSupport to src/test/java -->
<scope>compile</scope>
@@ -66,6 +66,23 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>@maven-compiler-plugin-version@</version>
+ <configuration>
+ <source>@jdk.version@</source>
+ <target>@jdk.version@</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>@maven-surefire-plugin-version@</version>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </plugin>
<!-- execute api-component plugin -->
<plugin>
<groupId>@project.groupId@</groupId>
@@ -210,20 +227,4 @@
</pluginManagement>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <configuration>
- <outPackage>${outPackage}</outPackage>
- <componentPackage>${componentPackage}</componentPackage>
- <scheme>${scheme}</scheme>
- <componentName>${componentName}</componentName>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/verify.groovy b/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/verify.groovy
index 73edefd..5d394db 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/verify.groovy
+++ b/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/verify.groovy
@@ -15,7 +15,7 @@
* limitations under the License.
*/
// assert that the generated files directory exists
-File sourceDir = new File( basedir, "target/generated-sources/camel-component" );
+File sourceDir = new File( basedir, "src/generated/java" );
File testDir = new File( basedir, "target/generated-test-sources/camel-component" );
assert sourceDir.isDirectory()
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
index adff960..1de8b9c 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
@@ -422,9 +422,9 @@ public abstract class AbstractApiMethodGeneratorMojo extends AbstractApiMethodBa
getCanonicalName(getProjectClassLoader().loadClass("java.lang." + argType)));
} catch (ClassNotFoundException e1) {
parameterizedType.append("?");
- // if the length of the artType is 1, we think that it's variable type parameter (like T in List<T>)
+ // if the length of the artType is 1 or 2, we think that it's variable type parameter (like T in List<T>)
// not perfect solution, but should work in most of the cases
- if (argType.trim().length() > 1) {
+ if (argType.trim().length() > 2) {
log.warn("Ignoring type parameters <" + typeArgs + "> for argument " + argument.getName()
+ ", unable to load parametric type argument " + argType,
e1);