You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/10/26 12:58:47 UTC
[camel] branch sandbox/camel-3.x updated: Fix build
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/sandbox/camel-3.x by this push:
new fdbbb8f Fix build
fdbbb8f is described below
commit fdbbb8f2deeca61b70775c2295dcff349ce5fbfa
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Oct 26 14:58:08 2018 +0200
Fix build
---
camel-core/pom.xml | 16 ++++++++++++++++
.../crypto/SpringPGPDataFormatNoPassPhraseTest.java | 3 ++-
.../org/apache/camel/tools/apt/ConverterProcessor.java | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 8864537..4bda334 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -305,6 +305,22 @@
<plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-compile</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <proc>none</proc>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- shade caffeine cache for faster Camel and spi-annotations as needed by everybody -->
<!-- shade json-simple for parsing Camel component JSon schema files -->
<plugin>
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java
index 838cb1b..7c24609 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java
@@ -19,11 +19,12 @@ package org.apache.camel.converter.crypto;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringPGPDataFormatNoPassPhraseTest extends AbstractPGPDataFormatTest {
protected CamelContext createCamelContext() throws Exception {
- return SpringCamelContext.springCamelContext("/org/apache/camel/component/crypto/SpringPGPDataFormatTest.xml");
+ return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("/org/apache/camel/component/crypto/SpringPGPDataFormatTest.xml"), true);
}
@Test
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java
index ac372e1..43232a0 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java
@@ -154,7 +154,7 @@ public class ConverterProcessor extends AbstractProcessor {
}
} catch (Throwable e) {
- processingEnv.getMessager().printMessage(Kind.ERROR, "Unable to process elements annotated with @UriEndpoint: " + e.getMessage());
+ processingEnv.getMessager().printMessage(Kind.ERROR, "Unable to process elements annotated with @Converter: " + e.getMessage());
dumpExceptionToErrorFile("camel-apt-error.log", "Error processing @Converter", e);
}
return false;