Repository: camel Updated Branches: refs/heads/master 219278373 -> 363e556cf
Enable the 'apt' profile for the component documentation inside POMs even when running on Java 6. Also enable the relevant unit-tests on Java 6 as well. Thanks Willem for fixing the root cause of the problem. Yeah component documentation just ROCKS! Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/363e556c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/363e556c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/363e556c Branch: refs/heads/master Commit: 363e556cfd832b0af9dfa6e40e4df456ee6bf34e Parents: 2192783 Author: Babak Vahdat <bvah...@apache.org> Authored: Fri Feb 21 10:59:24 2014 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Fri Feb 21 10:59:24 2014 +0100 ---------------------------------------------------------------------- camel-core/pom.xml | 3 +-- .../org/apache/camel/component/ComponentDiscoveryTest.java | 6 ------ .../bean/BeanComponentConfigurationAndDocumentation.java | 6 ------ .../browse/BrowseComponentConfigurationAndDocumentation.java | 6 ------ .../ControlBusComponentConfigurationAndDocumentation.java | 6 ------ .../DataFormatComponentConfigurationAndDocumentation.java | 6 ------ .../dataset/DataSetComponentConfigurationAndDocumentation.java | 6 ------ .../direct/DirectComponentConfigurationAndDocumentation.java | 6 ------ .../DirectVmComponentConfigurationAndDocumentation.java | 6 ------ .../file/FileComponentConfigurationAndDocumentation.java | 5 ----- .../LanguageComponentConfigurationAndDocumentation.java | 5 ----- .../log/LogComponentConfigurationAndDocumentation.java | 6 ------ .../mock/MockComponentConfigurationAndDocumentation.java | 6 ------ .../seda/SedaComponentConfigurationAndDocumentation.java | 6 ------ .../test/TestComponentConfigurationAndDocumentation.java | 6 ------ .../timer/TimerComponentConfigurationAndDocumentation.java | 6 ------ .../xslt/XsltComponentConfigurationAndDocumentation.java | 6 ------ .../file/remote/FtpComponentConfigurationAndDocumentation.java | 5 ----- .../remote/FtpsComponentConfigurationAndDocumentation.java | 5 ----- .../remote/SftpComponentConfigurationAndDocumentation.java | 5 ----- .../jms/JmsComponentConfigurationAndDocumentation.java | 5 ----- .../apache/camel/component/twitter/UriConfigurationTest.java | 6 ------ components/pom.xml | 3 +-- 23 files changed, 2 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/pom.xml ---------------------------------------------------------------------- diff --git a/camel-core/pom.xml b/camel-core/pom.xml index 9fe2102..2f5d018 100755 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -418,8 +418,7 @@ <profile> <id>apt</id> <activation> - <!-- don't enable on jdk 1.6 as it would not work and also it causes build problems by the CI-Server --> - <jdk>[1.7,)</jdk> + <activeByDefault>true</activeByDefault> </activation> <dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java b/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java index 944ed1f..23d84c4 100644 --- a/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java @@ -28,7 +28,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.TestSupport.isJavaVersion; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -60,11 +59,6 @@ public class ComponentDiscoveryTest { @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("bean"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentation.java index bdabd43..06e8bf0 100644 --- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.file.FileComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class BeanComponentConfigurationAndDocumentation extends ContextTestSuppo @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("bean"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentation.java index f4c8be3..e6ce688 100644 --- a/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/browse/BrowseComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -47,11 +46,6 @@ public class BrowseComponentConfigurationAndDocumentation extends ContextTestSup @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("browse"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentation.java index 9b931f3..f08f66f 100644 --- a/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -49,11 +48,6 @@ public class ControlBusComponentConfigurationAndDocumentation extends ContextTes @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("controlbus"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentation.java index 439492c..619524a 100644 --- a/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class DataFormatComponentConfigurationAndDocumentation extends ContextTes @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("dataformat"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentation.java index 1a04dbe..5bd53f1 100644 --- a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class DataSetComponentConfigurationAndDocumentation extends ContextTestSu @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("dataset"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentation.java index 1f0a890..bd7d08e 100644 --- a/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class DirectComponentConfigurationAndDocumentation extends ContextTestSup @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("direct"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentation.java index 0cca263..fb7e117 100644 --- a/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.direct.DirectComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class DirectVmComponentConfigurationAndDocumentation extends ContextTestS @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("direct-vm"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentation.java index f74edbb..6afc373 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentation.java @@ -47,11 +47,6 @@ public class FileComponentConfigurationAndDocumentation extends ContextTestSuppo @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("file"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentation.java index 67c83b6..f90f420 100644 --- a/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentation.java @@ -47,11 +47,6 @@ public class LanguageComponentConfigurationAndDocumentation extends ContextTestS @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("language"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentation.java index 2110eb0..3bbbd67 100644 --- a/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class LogComponentConfigurationAndDocumentation extends ContextTestSuppor @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("log"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentation.java index 37b93aa..5602943 100644 --- a/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class MockComponentConfigurationAndDocumentation extends ContextTestSuppo @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("mock"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentation.java index f0dfc18..e7f89a2 100644 --- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class SedaComponentConfigurationAndDocumentation extends ContextTestSuppo @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("seda"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentation.java index 47b9b1e..431dfc4 100644 --- a/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class TestComponentConfigurationAndDocumentation extends ContextTestSuppo @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("test"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentation.java index 9392852..b78567f 100644 --- a/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class TimerComponentConfigurationAndDocumentation extends ContextTestSupp @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("timer"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentation.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentation.java index 83b2495..98e4ce4 100644 --- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentation.java +++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentation.java @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.ComponentConfiguration; import org.apache.camel.ContextTestSupport; import org.apache.camel.EndpointConfiguration; -import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.impl.DefaultCamelContext; import org.junit.Test; @@ -48,11 +47,6 @@ public class XsltComponentConfigurationAndDocumentation extends ContextTestSuppo @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (isJavaVersion("1.6")) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("xslt"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentation.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentation.java index 4dca6df..2d7c354 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentation.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentation.java @@ -48,11 +48,6 @@ public class FtpComponentConfigurationAndDocumentation extends CamelTestSupport @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (CamelTestSupport.isJava16()) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("ftp"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentation.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentation.java index 63d96af..517fd5b 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentation.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentation.java @@ -48,11 +48,6 @@ public class FtpsComponentConfigurationAndDocumentation extends CamelTestSupport @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (CamelTestSupport.isJava16()) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("ftps"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentation.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentation.java index 82a2000..7ead6ce 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentation.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentation.java @@ -48,11 +48,6 @@ public class SftpComponentConfigurationAndDocumentation extends CamelTestSupport @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (CamelTestSupport.isJava16()) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("sftp"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentation.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentation.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentation.java index 839034a..839992c 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentation.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentation.java @@ -47,11 +47,6 @@ public class JmsComponentConfigurationAndDocumentation extends CamelTestSupport @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (CamelTestSupport.isJava16()) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("jms"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java index 32edd06..d989b39 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java @@ -21,7 +21,6 @@ import org.apache.camel.ComponentConfiguration; import org.apache.camel.Endpoint; import org.apache.camel.EndpointConfiguration; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Assert; import org.junit.Test; @@ -91,11 +90,6 @@ public class UriConfigurationTest extends Assert { @Test public void testComponentDocumentation() throws Exception { - // cannot be tested on java 1.6 - if (CamelTestSupport.isJava16()) { - return; - } - CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("twitter"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html); http://git-wip-us.apache.org/repos/asf/camel/blob/363e556c/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index f921954..4bcf05b 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -230,8 +230,7 @@ <profile> <id>apt</id> <activation> - <!-- don't enable on jdk 1.6 as it would not work and also it causes build problems by the CI-Server --> - <jdk>[1.7,)</jdk> + <activeByDefault>true</activeByDefault> </activation> <dependencies>
