CAMEL-3552: Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8ae3fbca Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8ae3fbca Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8ae3fbca Branch: refs/heads/master Commit: 8ae3fbcac0329cf34cf36e4a82d46734aff56ea9 Parents: 3e4ec85 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Apr 19 10:47:45 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Apr 19 10:47:45 2015 +0200 ---------------------------------------------------------------------- components/camel-pdf/pom.xml | 26 +++++++++++++++----- .../src/test/resources/log4j.properties | 6 ++--- 2 files changed, 23 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8ae3fbca/components/camel-pdf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml index 09ed5a4..ffd5bc2 100644 --- a/components/camel-pdf/pom.xml +++ b/components/camel-pdf/pom.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> @@ -33,16 +49,15 @@ <!-- Encryption libraries required for PDFBox --> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15</artifactId> - <version>1.44</version> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle-version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15</artifactId> - <version>1.44</version> + <artifactId>bcmail-jdk15on</artifactId> + <version>${bouncycastle-version}</version> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -75,5 +90,4 @@ </dependency> </dependencies> - </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/8ae3fbca/components/camel-pdf/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-pdf/src/test/resources/log4j.properties b/components/camel-pdf/src/test/resources/log4j.properties index d85e8bd..65ce89d 100644 --- a/components/camel-pdf/src/test/resources/log4j.properties +++ b/components/camel-pdf/src/test/resources/log4j.properties @@ -18,11 +18,11 @@ # # The logging properties used during tests # -log4j.rootLogger=INFO, stdout +log4j.rootLogger=INFO, file # uncomment this to turn on debug of camel log4j.logger.org.apache.camel=INFO -#log4j.logger.org.apache.camel.component.pgevent=TRACE +#log4j.logger.org.apache.camel.component.pdf=TRACE # CONSOLE appender not used by default log4j.appender.stdout=org.apache.log4j.ConsoleAppender @@ -33,6 +33,6 @@ log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-pgevent-test.log +log4j.appender.file.file=target/camel-pdf-test.log log4j.appender.file.append=true
