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 2017/02/14 11:39:11 UTC
[1/5] camel git commit: CAMEL-10141 Lets pass all unit tests in
camel-core on java 9
Repository: camel
Updated Branches:
refs/heads/master 6a5325590 -> 1b58a7e34
CAMEL-10141 Lets pass all unit tests in camel-core on java 9
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1b58a7e3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b58a7e3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b58a7e3
Branch: refs/heads/master
Commit: 1b58a7e3445eefd518ddc535b36e2a641a4c31c8
Parents: 2fb88ea
Author: jpoth <po...@gmail.com>
Authored: Mon Feb 13 16:58:47 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 11:54:24 2017 +0100
----------------------------------------------------------------------
camel-core/pom.xml | 8 +++-
.../test/java/org/apache/camel/TestSupport.java | 25 +++++++++--
.../camel/language/simple/SimpleTest.java | 29 ++++++++++--
.../XMLTokenizeLanguageGroupingTest.java | 10 ++---
.../tokenizer/XMLTokenizeLanguageTest.java | 10 ++---
.../support/XMLTokenExpressionIteratorTest.java | 46 ++++++++++----------
.../camel/util/jsse/KeyStoreParametersTest.java | 7 +++
7 files changed, 94 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1b58a7e3/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index f211165..a5cd356 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -660,6 +660,12 @@
<version>${spring-boot-version}</version>
<scope>provided</scope>
</dependency>
+ <!-- xmltokenizer using woodstox -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -695,7 +701,7 @@
<FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
<FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
</environmentVariables>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
+ <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/1b58a7e3/camel-core/src/test/java/org/apache/camel/TestSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/TestSupport.java b/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 19e3410..85a710c 100644
--- a/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -530,11 +530,30 @@ public abstract class TestSupport extends TestCase {
* <p/>
* Uses <tt>java.version</tt> from the system properties to determine the version.
*
- * @param version such as 1.6
+ * @param version such as 1.6 or 6
* @return <tt>true</tt> if its that vendor.
*/
public static boolean isJavaVersion(String version) {
- String javaVersion = System.getProperty("java.version");
- return javaVersion.contains(version.toLowerCase(Locale.ENGLISH));
+ if (version.contains(".")) { //before jdk 9
+ return Integer.parseInt(version.split("\\.")[1]) == getJavaMajorVersion();
+ } else {
+ return Integer.parseInt(version) == getJavaMajorVersion();
+ }
+ }
+
+ /**
+ * Returns the current major Java version e.g 8.
+ * <p/>
+ * Uses <tt>java.specification.version</tt> from the system properties to determine the major version.
+
+ * @return the current major Java version.
+ */
+ public static int getJavaMajorVersion() {
+ String javaSpecVersion = System.getProperty("java.specification.version");
+ if (javaSpecVersion.contains(".")) { //before jdk 9
+ return Integer.parseInt(javaSpecVersion.split("\\.")[1]);
+ } else {
+ return Integer.parseInt(javaSpecVersion);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1b58a7e3/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 6e13555..deb00ef 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -40,11 +40,15 @@ import org.apache.camel.language.bean.RuntimeBeanExpressionException;
import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
import org.apache.camel.spi.Language;
+import static org.apache.camel.TestSupport.getJavaMajorVersion;
/**
* @version
*/
public class SimpleTest extends LanguageTestSupport {
+ private static final String JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG = "Index: 2, Size: 2";
+ private static final String INDEX_OUT_OF_BOUNDS_ERROR_MSG = "Index 2 out-of-bounds for length 2";
+
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry jndi = super.createRegistry();
@@ -354,7 +358,12 @@ public class SimpleTest extends LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause = assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- assertEquals("Index: 2, Size: 2", cause.getMessage());
+ if (getJavaMajorVersion() <= 8) {
+ assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
+ } else {
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
+ }
+
}
assertExpression("${exchangeProperty.unknown[cool]}", null);
}
@@ -372,7 +381,11 @@ public class SimpleTest extends LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause = assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- assertEquals("Index: 2, Size: 2", cause.getMessage());
+ if (getJavaMajorVersion() <= 8) {
+ assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
+ } else {
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
+ }
}
assertExpression("${property.unknown[cool]}", null);
}
@@ -781,7 +794,11 @@ public class SimpleTest extends LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause = assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- assertEquals("Index: 2, Size: 2", cause.getMessage());
+ if (getJavaMajorVersion() <= 8) {
+ assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
+ } else {
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
+ }
}
assertExpression("${header.unknown[cool]}", null);
}
@@ -799,7 +816,11 @@ public class SimpleTest extends LanguageTestSupport {
fail("Should have thrown an exception");
} catch (Exception e) {
IndexOutOfBoundsException cause = assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause());
- assertEquals("Index: 2, Size: 2", cause.getMessage());
+ if (getJavaMajorVersion() <= 8) {
+ assertEquals(JAVA8_INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
+ } else {
+ assertEquals(INDEX_OUT_OF_BOUNDS_ERROR_MSG, cause.getMessage());
+ }
}
assertExpression("${header.unknown[cool]}", null);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1b58a7e3/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java b/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
index 79fd0df..6e54db1 100644
--- a/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
@@ -109,14 +109,14 @@ public class XMLTokenizeLanguageGroupingTest extends ContextTestSupport {
public void testSendMoreParentsMessageToTokenize() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
- if (isJavaVersion("1.8")) {
+ if (getJavaMajorVersion() <= 7) {
result.expectedBodiesReceived(
- "<group><c:child some_attr='a' anotherAttr='a' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"></c:child>"
- + "<c:child some_attr='b' anotherAttr='b' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"/></group>");
+ "<group><c:child some_attr='a' anotherAttr='a' xmlns:g=\"urn:g\" xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"></c:child>"
+ + "<c:child some_attr='b' anotherAttr='b' xmlns:g=\"urn:g\" xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"/></group>");
} else {
result.expectedBodiesReceived(
- "<group><c:child some_attr='a' anotherAttr='a' xmlns:g=\"urn:g\" xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"></c:child>"
- + "<c:child some_attr='b' anotherAttr='b' xmlns:g=\"urn:g\" xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"/></group>");
+ "<group><c:child some_attr='a' anotherAttr='a' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"></c:child>"
+ + "<c:child some_attr='b' anotherAttr='b' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"/></group>");
}
template.sendBody("direct:start",
http://git-wip-us.apache.org/repos/asf/camel/blob/1b58a7e3/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java b/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
index c5a0151..7b824f4 100644
--- a/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
@@ -108,14 +108,14 @@ public class XMLTokenizeLanguageTest extends ContextTestSupport {
public void testSendMoreParentsMessageToTokenize() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
- if (isJavaVersion("1.8")) {
- result.expectedBodiesReceived(
- "<c:child some_attr='a' anotherAttr='a' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"></c:child>",
- "<c:child some_attr='b' anotherAttr='b' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"/>");
- } else {
+ if (getJavaMajorVersion() <= 7) {
result.expectedBodiesReceived(
"<c:child some_attr='a' anotherAttr='a' xmlns:g=\"urn:g\" xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"></c:child>",
"<c:child some_attr='b' anotherAttr='b' xmlns:g=\"urn:g\" xmlns:d=\"urn:d\" xmlns:c=\"urn:c\"/>");
+ } else {
+ result.expectedBodiesReceived(
+ "<c:child some_attr='a' anotherAttr='a' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"></c:child>",
+ "<c:child some_attr='b' anotherAttr='b' xmlns:c=\"urn:c\" xmlns:d=\"urn:d\" xmlns:g=\"urn:g\"/>");
}
template.sendBody("direct:start",
http://git-wip-us.apache.org/repos/asf/camel/blob/1b58a7e3/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java b/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
index 3b991dc..d6e67c1 100644
--- a/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
@@ -28,6 +28,8 @@ import java.util.Map;
import junit.framework.TestCase;
+import static org.apache.camel.TestSupport.getJavaMajorVersion;
+
/**
*
@@ -284,9 +286,9 @@ public class XMLTokenExpressionIteratorTest extends TestCase {
}
public void testExtractChildInjected() throws Exception {
- String[] result = RESULTS_CHILD;
- if (isJavaVersion("1.8")) {
- result = RESULTS_CHILD_JAVA8;
+ String[] result = RESULTS_CHILD_JAVA8;
+ if (isJava7OrLower()) {
+ result = RESULTS_CHILD;
}
invokeAndVerify("//C:child", 'i', new ByteArrayInputStream(TEST_BODY), result);
}
@@ -296,9 +298,9 @@ public class XMLTokenExpressionIteratorTest extends TestCase {
}
public void testExtractChildNSMixedInjected() throws Exception {
- String[] result = RESULTS_CHILD_MIXED;
- if (isJavaVersion("1.8")) {
- result = RESULTS_CHILD_MIXED_JAVA8;
+ String[] result = RESULTS_CHILD_MIXED_JAVA8;
+ if (isJava7OrLower()) {
+ result = RESULTS_CHILD_MIXED;
}
invokeAndVerify("//*:child", 'i', new ByteArrayInputStream(TEST_BODY_NS_MIXED), result);
}
@@ -308,9 +310,9 @@ public class XMLTokenExpressionIteratorTest extends TestCase {
}
public void testExtractCxxxd() throws Exception {
- String[] result = RESULTS_CHILD;
- if (isJavaVersion("1.8")) {
- result = RESULTS_CHILD_JAVA8;
+ String[] result = RESULTS_CHILD_JAVA8;
+ if (isJava7OrLower()) {
+ result = RESULTS_CHILD;
}
invokeAndVerify("//C:c*d", 'i', new ByteArrayInputStream(TEST_BODY), result);
}
@@ -324,9 +326,9 @@ public class XMLTokenExpressionIteratorTest extends TestCase {
}
public void testExtractSomeUnqualifiedChildInjected() throws Exception {
- String[] result = RESULTS_CHILD_NO_NS_MIXED;
- if (isJavaVersion("1.8")) {
- result = RESULTS_CHILD_NO_NS_MIXED_JAVA8;
+ String[] result = RESULTS_CHILD_NO_NS_MIXED_JAVA8;
+ if (isJava7OrLower()) {
+ result = RESULTS_CHILD_NO_NS_MIXED;
}
invokeAndVerify("//child", 'i', new ByteArrayInputStream(TEST_BODY_NO_NS_MIXED), result);
}
@@ -338,18 +340,18 @@ public class XMLTokenExpressionIteratorTest extends TestCase {
public void testExtractSomeQualifiedChildInjected() throws Exception {
nsmap.put("", "urn:c");
- String[] result = RESULTS_CHILD_NS_MIXED;
- if (isJavaVersion("1.8")) {
- result = RESULTS_CHILD_NS_MIXED_JAVA8;
+ String[] result = RESULTS_CHILD_NS_MIXED_JAVA8;
+ if (isJava7OrLower()) {
+ result = RESULTS_CHILD_NS_MIXED;
}
invokeAndVerify("//child", 'i', new ByteArrayInputStream(TEST_BODY_NO_NS_MIXED), result);
}
public void testExtractWithNullNamespaceMap() throws Exception {
nsmap = null;
- String[] result = RESULTS_CHILD_NO_NS_MIXED;
- if (isJavaVersion("1.8")) {
- result = RESULTS_CHILD_NO_NS_MIXED_JAVA8;
+ String[] result = RESULTS_CHILD_NO_NS_MIXED_JAVA8;
+ if (isJava7OrLower()) {
+ result = RESULTS_CHILD_NO_NS_MIXED;
}
invokeAndVerify("//child", 'i', new ByteArrayInputStream(TEST_BODY_NO_NS_MIXED), result);
}
@@ -439,11 +441,9 @@ public class XMLTokenExpressionIteratorTest extends TestCase {
for (int i = 0; i < expected.length; i++) {
assertEquals("mismatch [" + i + "]", expected[i], results.get(i));
}
-
}
-
- public static boolean isJavaVersion(String version) {
- String javaVersion = System.getProperty("java.version");
- return javaVersion.contains(version.toLowerCase(Locale.ENGLISH));
+
+ private boolean isJava7OrLower() {
+ return getJavaMajorVersion() <= 7;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1b58a7e3/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java
index dfa208d..e376431 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java
@@ -26,6 +26,8 @@ import java.security.NoSuchProviderException;
import org.apache.camel.CamelContext;
+import static org.apache.camel.TestSupport.getJavaMajorVersion;
+
public class KeyStoreParametersTest extends AbstractJsseParametersTest {
protected KeyStoreParameters createMinimalKeyStoreParameters() {
@@ -102,6 +104,11 @@ public class KeyStoreParametersTest extends AbstractJsseParametersTest {
}
public void testExplicitInvalidType() throws Exception {
+ if (getJavaMajorVersion() == 9) {
+ //checkout http://openjdk.java.net/jeps/229
+ return;
+ }
+
KeyStoreParameters ksp = this.createMinimalKeyStoreParameters();
ksp.setType("pkcs12");
[4/5] camel git commit: CAMEL-10141 Lets build camel-core and have
some unit tests pass
Posted by da...@apache.org.
CAMEL-10141 Lets build camel-core and have some unit tests pass
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2fb88ea8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2fb88ea8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2fb88ea8
Branch: refs/heads/master
Commit: 2fb88ea8310382dc5aee805ae29850df7daedd16
Parents: 86ae3e7
Author: jpoth <po...@gmail.com>
Authored: Fri Feb 10 18:44:51 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 11:54:24 2017 +0100
----------------------------------------------------------------------
camel-core/pom.xml | 76 ++++++++++++++++++++++++++++++++++++++++++++++++-
pom.xml | 2 +-
2 files changed, 76 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2fb88ea8/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index e8bbbf4..f211165 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -639,6 +639,80 @@
</dependency>
</dependencies>
</profile>
- </profiles>
+ <profile>
+ <id>jdk9-build</id>
+ <activation>
+ <jdk>9</jdk>
+ </activation>
+ <dependencies>
+
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>apt</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- enable Spring Boot configuration APT processor -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <version>${spring-boot-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <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>
+ <maxmem>512M</maxmem>
+ <fork>true</fork>
+ <compilerArgs>
+ <arg>-J--add-modules</arg>
+ <arg>-Jjava.xml.bind</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- skip file stress tests as they are intended to run manually -->
+ <excludes>
+ <exclude>org/apache/camel/component/file/stress/**.java</exclude>
+ <exclude>**/DistributedCompletionIntervalTest.java</exclude>
+ <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
+ <exclude>${platform.skip.tests}</exclude>
+ </excludes>
+ <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+ <!-- needed for testing the properties component -->
+ <environmentVariables>
+ <FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
+ <FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
+ </environmentVariables>
+ <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/2fb88ea8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f9609dc..f800ee5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<jdk.version>1.8</jdk.version>
<compiler.fork>false</compiler.fork>
- <maven-compiler-plugin-version>3.6.0</maven-compiler-plugin-version>
+ <maven-compiler-plugin-version>3.6.1</maven-compiler-plugin-version>
<maven-surefire-plugin-version>2.19.1</maven-surefire-plugin-version>
<!-- eclipse plugin need the jaxb in this pom.xml file -->
[2/5] camel git commit: CAMEL-10141 The inal plugin isn't compatible
with java 9 and isn't unmaintained so lets remove it and rely on the rat
plugin instead
Posted by da...@apache.org.
CAMEL-10141 The inal plugin isn't compatible with java 9 and isn't unmaintained so lets remove it and rely on the rat plugin instead
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86ae3e72
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86ae3e72
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86ae3e72
Branch: refs/heads/master
Commit: 86ae3e72ab1afa9ffe85c3cee51e68bedc3301b0
Parents: 0bbfa4a
Author: jpoth <po...@gmail.com>
Authored: Thu Feb 9 13:20:52 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 11:54:24 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 20 --------------------
tooling/maven/pom.xml | 3 ---
2 files changed, 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/86ae3e72/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7f713cb..b18971b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4589,11 +4589,6 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
</plugin>
@@ -4743,21 +4738,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <strict>true</strict>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin-version}</version>
http://git-wip-us.apache.org/repos/asf/camel/blob/86ae3e72/tooling/maven/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index c49523a..74e5a2e 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -48,9 +48,6 @@
<execution>
<id>bundle-jar</id>
<phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
</execution>
</executions>
<configuration>
[3/5] camel git commit: CAMEL-10141 Tools.jar is no longer present in
java 9
Posted by da...@apache.org.
CAMEL-10141 Tools.jar is no longer present in java 9
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/af2893f6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/af2893f6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/af2893f6
Branch: refs/heads/master
Commit: af2893f6116d6b77484fec53a38fcc0ab351db49
Parents: 6a53255
Author: jpoth <po...@gmail.com>
Authored: Thu Feb 9 12:18:21 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 11:54:24 2017 +0100
----------------------------------------------------------------------
pom.xml | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/af2893f6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 00734f4..f9609dc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -510,13 +510,6 @@
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
</dependencies>
</plugin>
</plugins>
@@ -525,6 +518,30 @@
</profile>
<profile>
+ <id>jdk8-build</id>
+ <activation>
+ <jdk>(,1.9)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>integration</id>
<!--The profile for running the unit and integration test -->
<build>
[5/5] camel git commit: CAMEL-10141 Upgrade maven jar plugin for java
9 support
Posted by da...@apache.org.
CAMEL-10141 Upgrade maven jar plugin for java 9 support
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0bbfa4ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0bbfa4ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0bbfa4ad
Branch: refs/heads/master
Commit: 0bbfa4ada129f017df16779dd905519812188a00
Parents: af2893f
Author: jpoth <po...@gmail.com>
Authored: Thu Feb 9 12:34:11 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 11:54:24 2017 +0100
----------------------------------------------------------------------
components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 3 ---
.../main/java/org/apache/camel/maven/connector/ConnectorMojo.java | 2 +-
connectors/examples/bar-connector/pom.xml | 3 ---
connectors/examples/foo-connector/pom.xml | 3 ---
connectors/examples/salesforce-upsert-contact-connector/pom.xml | 3 ---
connectors/examples/twitter-mention-connector/pom.xml | 3 ---
connectors/examples/wine-connector/pom.xml | 3 ---
parent/pom.xml | 2 +-
8 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 2e4ee21..1108309 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -179,9 +179,6 @@
<execution>
<id>bundle-jar</id>
<phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
----------------------------------------------------------------------
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
index b98e478..c5c6b2e 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.jar.AbstractJarMojo;
+import org.apache.maven.plugins.jar.AbstractJarMojo;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/bar-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/bar-connector/pom.xml b/connectors/examples/bar-connector/pom.xml
index 8c1fa74..7191e5c 100644
--- a/connectors/examples/bar-connector/pom.xml
+++ b/connectors/examples/bar-connector/pom.xml
@@ -149,9 +149,6 @@
<executions>
<execution>
<id>connector</id>
- <goals>
- <goal>jar</goal>
- </goals>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/foo-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/foo-connector/pom.xml b/connectors/examples/foo-connector/pom.xml
index c2a443b..0143208 100644
--- a/connectors/examples/foo-connector/pom.xml
+++ b/connectors/examples/foo-connector/pom.xml
@@ -149,9 +149,6 @@
<executions>
<execution>
<id>connector</id>
- <goals>
- <goal>jar</goal>
- </goals>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/salesforce-upsert-contact-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/salesforce-upsert-contact-connector/pom.xml b/connectors/examples/salesforce-upsert-contact-connector/pom.xml
index 26f2f33..d7f655c 100644
--- a/connectors/examples/salesforce-upsert-contact-connector/pom.xml
+++ b/connectors/examples/salesforce-upsert-contact-connector/pom.xml
@@ -80,9 +80,6 @@
<executions>
<execution>
<id>generate-connector</id>
- <goals>
- <goal>jar</goal>
- </goals>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/twitter-mention-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/twitter-mention-connector/pom.xml b/connectors/examples/twitter-mention-connector/pom.xml
index f867183..dad717b 100644
--- a/connectors/examples/twitter-mention-connector/pom.xml
+++ b/connectors/examples/twitter-mention-connector/pom.xml
@@ -155,9 +155,6 @@
<executions>
<execution>
<id>connector</id>
- <goals>
- <goal>jar</goal>
- </goals>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/wine-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/wine-connector/pom.xml b/connectors/examples/wine-connector/pom.xml
index f23cc88..d4d787c 100644
--- a/connectors/examples/wine-connector/pom.xml
+++ b/connectors/examples/wine-connector/pom.xml
@@ -149,9 +149,6 @@
<executions>
<execution>
<id>connector</id>
- <goals>
- <goal>jar</goal>
- </goals>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ef5b992..7f713cb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -423,7 +423,7 @@
<maven-checkstyle-version>6.17</maven-checkstyle-version>
<maven-owasp-plugin-version>1.4.5</maven-owasp-plugin-version>
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
- <maven-jar-plugin-version>2.6</maven-jar-plugin-version>
+ <maven-jar-plugin-version>3.0.2</maven-jar-plugin-version>
<maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version>
<maven-jboss-as-maven-plugin-version>7.7.Final</maven-jboss-as-maven-plugin-version>
<!-- plugin-plugin 3.5 does not work -->