You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2015/10/10 22:56:22 UTC
[1/3] camel git commit: fix apt CS
Repository: camel
Updated Branches:
refs/heads/master c41b6e341 -> fcb6e6b87
fix apt CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c9be3a3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c9be3a3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c9be3a3
Branch: refs/heads/master
Commit: 3c9be3a3a244d1a12be1b89d3c48a52e6e3b80eb
Parents: c41b6e3
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Sat Oct 10 17:49:34 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Sat Oct 10 17:49:34 2015 -0230
----------------------------------------------------------------------
.../java/org/apache/camel/tools/apt/EipAnnotationProcessor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3c9be3a3/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index d9aca0a..95f7566 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -78,7 +78,7 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
};
// special for verbs (these classes have sub classes, so we use this to find all classes)
private static final String[] ONE_OF_VERBS = new String[]{
- "org.apache.camel.model.rest.VerbDefinition"
+ "org.apache.camel.model.rest.VerbDefinition"
};
private boolean skipUnwanted = true;
@@ -1118,4 +1118,4 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor {
}
}
-}
\ No newline at end of file
+}
[2/3] camel git commit: Prevent doclint error from javadoc on JDK8
Posted by ja...@apache.org.
Prevent doclint error from javadoc on JDK8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/85bdca5b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/85bdca5b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/85bdca5b
Branch: refs/heads/master
Commit: 85bdca5b1e59890ad46f89eaedcda8560e8e06e2
Parents: 3c9be3a
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Sat Oct 10 18:23:47 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Sat Oct 10 18:23:47 2015 -0230
----------------------------------------------------------------------
pom.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/85bdca5b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 67e15a3..3f58eb7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -552,6 +552,9 @@
<goals>
<goal>jar</goal>
</goals>
+ <configuration>
+ <additionalparam>${javadoc.opts}</additionalparam>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -617,6 +620,9 @@
<goals>
<goal>jar</goal>
</goals>
+ <configuration>
+ <additionalparam>${javadoc.opts}</additionalparam>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -639,5 +645,14 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>doclint-java8-disable</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.opts>-Xdoclint:none</javadoc.opts>
+ </properties>
+ </profile>
</profiles>
</project>
[3/3] camel git commit: fix up camel-core checkstyle
Posted by ja...@apache.org.
fix up camel-core checkstyle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fcb6e6b8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fcb6e6b8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fcb6e6b8
Branch: refs/heads/master
Commit: fcb6e6b87326b78051e2304a0a766cbaee40e70a
Parents: 85bdca5
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Sat Oct 10 18:24:46 2015 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Sat Oct 10 18:24:46 2015 -0230
----------------------------------------------------------------------
buildingtools/src/main/resources/camel-checkstyle.xml | 2 +-
.../apache/camel/api/management/mbean/CamelOpenMBeanTypes.java | 2 +-
.../src/main/java/org/apache/camel/impl/DefaultRestRegistry.java | 3 ++-
.../src/main/java/org/apache/camel/impl/GzipDataFormat.java | 1 -
.../java/org/apache/camel/impl/DataFormatContextAwareTest.java | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fcb6e6b8/buildingtools/src/main/resources/camel-checkstyle.xml
----------------------------------------------------------------------
diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml
index 4c60fc6..02fd21c 100644
--- a/buildingtools/src/main/resources/camel-checkstyle.xml
+++ b/buildingtools/src/main/resources/camel-checkstyle.xml
@@ -53,7 +53,7 @@ lengths, if/try depths, etc...
</module>
<module name="FileLength">
- <property name="max" value="4000"/>
+ <property name="max" value="4500"/>
</module>
<module name="FileTabCharacter">
http://git-wip-us.apache.org/repos/asf/camel/blob/fcb6e6b8/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
index 549a2f6..fc00071 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
@@ -98,7 +98,7 @@ public final class CamelOpenMBeanTypes {
return new CompositeType("dataformats", "DataFormats", new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"},
new String[]{"Option", "Kind", "Label", "Type", "Java Type", "Deprecated", "Value", "Default Value", "Description"},
new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING,
- SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
+ SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fcb6e6b8/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
index 250566d..04a827d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
@@ -91,7 +91,8 @@ public class DefaultRestRegistry extends ServiceSupport implements StaticService
RestConfiguration config = camelContext.getRestConfiguration(componentName, true);
String apiComponent = config.getApiComponent() != null ? config.getApiComponent() : RestApiEndpoint.DEFAULT_API_COMPONENT_NAME;
String path = config.getApiContextPath() != null ? config.getApiContextPath() : "api-doc";
- restApiEndpoint = camelContext.getEndpoint(String.format("rest-api:%s/%s?componentName=%s&apiComponentName=%s&contextIdPattern=#name#", path, camelContext.getName(), componentName, apiComponent));
+ restApiEndpoint = camelContext.getEndpoint(String.format("rest-api:%s/%s?componentName=%s&apiComponentName=%s&contextIdPattern=#name#",
+ path, camelContext.getName(), componentName, apiComponent));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fcb6e6b8/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java b/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
index 7770687..66f7a7f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
@@ -25,7 +25,6 @@ import java.util.zip.GZIPOutputStream;
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatName;
-import org.apache.camel.support.*;
import org.apache.camel.util.IOHelper;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/fcb6e6b8/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java b/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
index db451b3..1f61954 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.support.*;
/**
*