Repository: camel Updated Branches: refs/heads/master 7cff09902 -> 33a667108
CAMEL-10774: Update readme automatic Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33a66710 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33a66710 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33a66710 Branch: refs/heads/master Commit: 33a667108f85a136594fc6724d2760762db1c1df Parents: 8086210 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Feb 3 20:31:19 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Feb 3 20:31:28 2017 +0100 ---------------------------------------------------------------------- components/camel-bam/pom.xml | 4 + components/camel-blueprint/pom.xml | 4 + components/camel-cdi/pom.xml | 4 + components/camel-cxf-transport/pom.xml | 6 +- components/camel-guice/pom.xml | 6 +- components/camel-hawtdb/pom.xml | 4 + components/camel-hystrix/pom.xml | 4 + components/camel-jasypt/pom.xml | 4 + components/camel-kura/pom.xml | 4 + components/camel-leveldb/pom.xml | 4 + components/camel-ribbon/pom.xml | 4 + components/camel-ruby/pom.xml | 6 +- components/camel-rx/pom.xml | 4 + components/camel-scala/pom.xml | 4 + components/camel-scr/pom.xml | 4 + components/camel-servletlistener/pom.xml | 4 + components/camel-shiro/pom.xml | 4 + components/camel-spring-boot/pom.xml | 4 + components/camel-spring-cloud/pom.xml | 4 + components/camel-spring-dm/pom.xml | 4 + components/camel-spring-javaconfig/pom.xml | 4 + components/camel-spring-security/pom.xml | 4 + components/camel-swagger-java/pom.xml | 4 + components/camel-swagger/pom.xml | 4 + components/camel-test-blueprint/pom.xml | 4 + components/camel-test-cdi/pom.xml | 4 + components/camel-test-karaf/pom.xml | 4 + components/camel-test-spring/pom.xml | 4 + components/camel-test/pom.xml | 4 + components/camel-testng/pom.xml | 4 + components/camel-urlrewrite/pom.xml | 4 + components/camel-zipkin/pom.xml | 4 + components/readme.adoc | 64 ++++++------ .../maven/packaging/ReadmeComponentMojo.java | 101 +------------------ 34 files changed, 164 insertions(+), 135 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-bam/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml index ee38c66..12d31be 100644 --- a/components/camel-bam/pom.xml +++ b/components/camel-bam/pom.xml @@ -29,6 +29,10 @@ <description>Camel Business Activity Monitor support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>1.0.0</firstVersion> + <label>monitoring</label> + <camel.osgi.export.pkg>org.apache.camel.bam.*</camel.osgi.export.pkg> <eclipselink-version>2.3.2</eclipselink-version> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index 616eeb5..599f1f8 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -30,6 +30,10 @@ <packaging>jar</packaging> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.4.0</firstVersion> + <label>java,osgi</label> + <camel.osgi.import> !org.apache.camel.blueprint.*, !org.apache.camel.util.blueprint.*, http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index fbec4cc..94e1df4 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -30,6 +30,10 @@ <description>Camel Contexts and Dependency Injection Support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.10.0</firstVersion> + <label>java</label> + <camel.osgi.import> !org.apache.camel.cdi.*, !org.apache.deltaspike.cdise.api.*, http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 5e40d80..0e397f4 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -29,7 +29,11 @@ <name>Camel :: CXF :: Transport</name> <description>Camel Transport for CXF </description> - <properties> + <properties> + <!-- use by camel-catalog --> + <firstVersion>2.8.0</firstVersion> + <label>soap,webservice</label> + <camel.osgi.import> !org.apache.camel.component.cxf.*, !META-INF.cxf.camel, http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-guice/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml index 6b971dc..cee6aa1 100644 --- a/components/camel-guice/pom.xml +++ b/components/camel-guice/pom.xml @@ -29,7 +29,11 @@ <name>Camel :: Guice</name> <description>Camel Guice</description> - <properties> + <properties> + <!-- use by camel-catalog --> + <firstVersion>1.5.0</firstVersion> + <label>java</label> + <camel.osgi.export.pkg>org.apache.camel.guice.*</camel.osgi.export.pkg> <camel.osgi.import.additional> com.google.inject*;version="[1.2,4)" http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-hawtdb/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hawtdb/pom.xml b/components/camel-hawtdb/pom.xml index 91ae423..d70a628 100644 --- a/components/camel-hawtdb/pom.xml +++ b/components/camel-hawtdb/pom.xml @@ -30,6 +30,10 @@ <description>Camel HawtDB Support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.3.0</firstVersion> + <label>database</label> + <camel.osgi.export.pkg>org.apache.camel.component.hawtdb.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-hystrix/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml index 2750db9..05d1b84 100644 --- a/components/camel-hystrix/pom.xml +++ b/components/camel-hystrix/pom.xml @@ -31,6 +31,10 @@ <description>Camel Hystrix support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.18.0</firstVersion> + <label>eip,microservice</label> + <camel.osgi.export.pkg>org.apache.camel.component.hystrix.*</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=hystrix</camel.osgi.export.service> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-jasypt/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml index d210135..e58385f 100644 --- a/components/camel-jasypt/pom.xml +++ b/components/camel-jasypt/pom.xml @@ -31,6 +31,10 @@ <description>Camel Jasypt support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.5.0</firstVersion> + <label>security</label> + <camel.osgi.export.pkg>org.apache.camel.component.jasypt.*</camel.osgi.export.pkg> <camel.osgi.import.before.defaults>org.jasypt.encryption.*;version="[1.7,2)"</camel.osgi.import.before.defaults> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-kura/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml index 0de51a3..1a566aa 100644 --- a/components/camel-kura/pom.xml +++ b/components/camel-kura/pom.xml @@ -33,6 +33,10 @@ <description>Camel Kura support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.15.0</firstVersion> + <label>iot,osgi</label> + <camel.osgi.export.pkg>org.apache.camel.component.kura</camel.osgi.export.pkg> <kura-slf4j.version>1.6.4</kura-slf4j.version> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-leveldb/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml index 13614cd..3307946 100644 --- a/components/camel-leveldb/pom.xml +++ b/components/camel-leveldb/pom.xml @@ -30,6 +30,10 @@ <description>Camel LevelDB Support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.10.0</firstVersion> + <label>database</label> + <camel.osgi.export.pkg>org.apache.camel.component.leveldb.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-ribbon/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml index e34ae49..c61bd7f 100644 --- a/components/camel-ribbon/pom.xml +++ b/components/camel-ribbon/pom.xml @@ -31,6 +31,10 @@ <name>Camel :: Ribbon</name> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.18.0</firstVersion> + <label>microservice</label> + <camel.osgi.export.pkg>org.apache.camel.component.ribbon.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-ruby/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml index ff08a58..05b3b00 100644 --- a/components/camel-ruby/pom.xml +++ b/components/camel-ruby/pom.xml @@ -26,10 +26,14 @@ <artifactId>camel-ruby</artifactId> <packaging>jar</packaging> - <name>Camel :: Ruby</name> + <name>Camel :: Ruby (deprecated)</name> <description>Camel Ruby support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>1.0.0</firstVersion> + <label>dsl,script</label> + <camel.osgi.export.pkg>org.apache.camel.ruby.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-rx/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-rx/pom.xml b/components/camel-rx/pom.xml index 6ac27f4..89b4093 100644 --- a/components/camel-rx/pom.xml +++ b/components/camel-rx/pom.xml @@ -30,6 +30,10 @@ <description>Camel Reactive Extensions support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.11.0</firstVersion> + <label>reactive</label> + <camel.osgi.export.pkg>org.apache.camel.rx.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-scala/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml index 714d950..8e52e72 100644 --- a/components/camel-scala/pom.xml +++ b/components/camel-scala/pom.xml @@ -30,6 +30,10 @@ <description>Camel Scala DSL</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>1.4.0</firstVersion> + <label>dsl</label> + <camel.osgi.import.before.defaults> scala.xml.*;version="[1.0,2)", scala.*;version="[2.11,2.12)" http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-scr/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml index 219c651..3f5713c 100644 --- a/components/camel-scr/pom.xml +++ b/components/camel-scr/pom.xml @@ -30,6 +30,10 @@ <packaging>jar</packaging> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.15.0</firstVersion> + <label>osgi</label> + <camel.osgi.export.pkg>org.apache.camel.scr</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-servletlistener/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml index 41c5e21..9d82d91 100644 --- a/components/camel-servletlistener/pom.xml +++ b/components/camel-servletlistener/pom.xml @@ -30,6 +30,10 @@ <description>Camel servlet listener for bootstrapping Camel in Web Applications</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.11.0</firstVersion> + <label>java</label> + <camel.osgi.import.before.defaults> javax.servlet.*;version="${servlet-version-range}" </camel.osgi.import.before.defaults> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-shiro/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml index f892b70..cf934d8 100644 --- a/components/camel-shiro/pom.xml +++ b/components/camel-shiro/pom.xml @@ -30,6 +30,10 @@ <description>Camel Shiro Security support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.5.0</firstVersion> + <label>security</label> + <camel.osgi.export.pkg>org.apache.camel.component.shiro.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml index 6055e90..e9f2d97 100644 --- a/components/camel-spring-boot/pom.xml +++ b/components/camel-spring-boot/pom.xml @@ -30,6 +30,10 @@ <description>Camel :: Spring Boot</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.15.0</firstVersion> + <label>spring,microservice</label> + <camel.osgi.export.pkg/> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-spring-cloud/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/pom.xml b/components/camel-spring-cloud/pom.xml index f51f5d1..9854bc7 100644 --- a/components/camel-spring-cloud/pom.xml +++ b/components/camel-spring-cloud/pom.xml @@ -30,6 +30,10 @@ <description>Camel :: Spring Cloud</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.19.0</firstVersion> + <label>spring,microservice</label> + <camel.osgi.export.pkg/> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-spring-dm/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-dm/pom.xml b/components/camel-spring-dm/pom.xml index e0efbbc..4cef4d8 100644 --- a/components/camel-spring-dm/pom.xml +++ b/components/camel-spring-dm/pom.xml @@ -31,6 +31,10 @@ <packaging>jar</packaging> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.18.0</firstVersion> + <label>osgi,spring</label> + <!-- spring-dm only supports spring 3.x so we need to import that range --> <camel.osgi.import> !org.apache.camel.spring.*, http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-spring-javaconfig/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml index e5c9a15..278b9e5 100644 --- a/components/camel-spring-javaconfig/pom.xml +++ b/components/camel-spring-javaconfig/pom.xml @@ -30,6 +30,10 @@ <packaging>jar</packaging> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.0.0</firstVersion> + <label>spring</label> + <camel.osgi.export.pkg>org.apache.camel.spring.javaconfig.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-spring-security/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml index 71cfa11..7b03124 100644 --- a/components/camel-spring-security/pom.xml +++ b/components/camel-spring-security/pom.xml @@ -30,6 +30,10 @@ <description>Camel Spring Security support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.3.0</firstVersion> + <label>security,spring</label> + <camel.osgi.export.pkg>org.apache.camel.component.spring.security.*</camel.osgi.export.pkg> <camel.osgi.import.before.defaults>org.springframework.security.*;version="[4,5)"</camel.osgi.import.before.defaults> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-swagger-java/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml index b642cdb..818c27d 100644 --- a/components/camel-swagger-java/pom.xml +++ b/components/camel-swagger-java/pom.xml @@ -31,6 +31,10 @@ <description>Camel Swagger Java support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.16.0</firstVersion> + <label>rest,api</label> + <camel.osgi.import.before.defaults> com.fasterxml.jackson.*;version="[2.4,3)" </camel.osgi.import.before.defaults> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml index cf1f25e..7fbd35f 100644 --- a/components/camel-swagger/pom.xml +++ b/components/camel-swagger/pom.xml @@ -30,6 +30,10 @@ <description>Camel Swagger support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.14.0</firstVersion> + <label>rest,api</label> + <camel.osgi.import.before.defaults> scala.*;version="[2.10,2.11)" </camel.osgi.import.before.defaults> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-test-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml index 39b98f1..f5feaaf 100644 --- a/components/camel-test-blueprint/pom.xml +++ b/components/camel-test-blueprint/pom.xml @@ -30,6 +30,10 @@ <description>Camel Testing Blueprint Library using JUnit</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.10.0</firstVersion> + <label>testing,java,osgi</label> + <camel.osgi.export.pkg>org.apache.camel.test.blueprint*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-test-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-cdi/pom.xml b/components/camel-test-cdi/pom.xml index 2c6c6ec..ad42eda 100644 --- a/components/camel-test-cdi/pom.xml +++ b/components/camel-test-cdi/pom.xml @@ -31,6 +31,10 @@ <description>Camel Testing Library using JUnit and CDI</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.17.0</firstVersion> + <label>testing,java</label> + <camel.osgi.export.pkg>org.apache.camel.test.cdi.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-test-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-karaf/pom.xml b/components/camel-test-karaf/pom.xml index 3cc3eaa..5b35dc2 100644 --- a/components/camel-test-karaf/pom.xml +++ b/components/camel-test-karaf/pom.xml @@ -32,6 +32,10 @@ <description>Camel Testing Library using Pax Exam, Karaf and JUnit</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.18.0</firstVersion> + <label>testing,java,osgi</label> + <karf-test-version>${karaf4-version}</karf-test-version> <depends-maven-plugin-version>1.3.1</depends-maven-plugin-version> <camel.osgi.export.pkg>org.apache.camel.test.karaf</camel.osgi.export.pkg> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-test-spring/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml index 1cb3373..1bda6c8 100644 --- a/components/camel-test-spring/pom.xml +++ b/components/camel-test-spring/pom.xml @@ -31,6 +31,10 @@ <description>Camel Testing Library using JUnit and Spring 4.1+</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.10.0</firstVersion> + <label>testing,java,spring</label> + <camel.osgi.export.pkg>org.apache.camel.test.spring.*</camel.osgi.export.pkg> <spring-version>${spring4-version}</spring-version> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-test/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml index 17b691d..c1f1012 100644 --- a/components/camel-test/pom.xml +++ b/components/camel-test/pom.xml @@ -30,6 +30,10 @@ <description>Camel Testing Library using JUnit</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.9.0</firstVersion> + <label>testing,java</label> + <camel.osgi.export.pkg>org.apache.camel.test.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-testng/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml index fcf4153..5e4f447 100644 --- a/components/camel-testng/pom.xml +++ b/components/camel-testng/pom.xml @@ -30,6 +30,10 @@ <description>Camel Testing Library using TestNG</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.8.0</firstVersion> + <label>testing,java</label> + <camel.osgi.export.pkg>org.apache.camel.testng.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-urlrewrite/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml index 2d9bd0f..2120754 100644 --- a/components/camel-urlrewrite/pom.xml +++ b/components/camel-urlrewrite/pom.xml @@ -30,6 +30,10 @@ <description>Camel URLRewrite support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.11.0</firstVersion> + <label>http</label> + <camel.osgi.import.before.defaults> javax.servlet.*;version="${servlet-version-range}" </camel.osgi.import.before.defaults> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/camel-zipkin/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml index d030096..415d7e0 100644 --- a/components/camel-zipkin/pom.xml +++ b/components/camel-zipkin/pom.xml @@ -32,6 +32,10 @@ <description>Camel Zipkin Support</description> <properties> + <!-- use by camel-catalog --> + <firstVersion>2.18.0</firstVersion> + <label>monitoring,microservice</label> + <camel.osgi.export.pkg>org.apache.camel.zipkin.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index 1644360..fb70edf 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -594,71 +594,71 @@ Other Components |======================================================================= | Component | Available From | Description -| link:camel-bam/src/main/docs/bam.adoc[Bam] (camel-bam) | | *deprecated* Camel Business Activity Monitor support +| link:camel-bam/src/main/docs/bam.adoc[Bam] (camel-bam) | 1.0.0 | *deprecated* Camel Business Activity Monitor support -| link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | | Camel OSGi Blueprint support +| link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | 2.4.0 | Camel OSGi Blueprint support -| link:camel-cdi/src/main/docs/cdi.adoc[Cdi] (camel-cdi) | | Camel Contexts and Dependency Injection Support +| link:camel-cdi/src/main/docs/cdi.adoc[Cdi] (camel-cdi) | 2.10.0 | Camel Contexts and Dependency Injection Support -| link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[Cxf Transport] (camel-cxf-transport) | | Camel Transport for CXF +| link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[Cxf Transport] (camel-cxf-transport) | 2.8.0 | Camel Transport for CXF | link:camel-eclipse/src/main/docs/eclipse.adoc[Eclipse] (camel-eclipse) | 2.3.0 | *deprecated* Camel Eclipse support -| link:camel-guice/src/main/docs/guice.adoc[Guice] (camel-guice) | | Camel Guice +| link:camel-guice/src/main/docs/guice.adoc[Guice] (camel-guice) | 1.5.0 | Camel Guice -| link:camel-hawtdb/src/main/docs/hawtdb.adoc[Hawtdb] (camel-hawtdb) | | *deprecated* Camel HawtDB Support +| link:camel-hawtdb/src/main/docs/hawtdb.adoc[Hawtdb] (camel-hawtdb) | 2.3.0 | *deprecated* Camel HawtDB Support -| link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) | | Camel Hystrix support +| link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) | 2.18.0 | Camel Hystrix support -| link:camel-jasypt/src/main/docs/jasypt.adoc[Jasypt] (camel-jasypt) | | Camel Jasypt support +| link:camel-jasypt/src/main/docs/jasypt.adoc[Jasypt] (camel-jasypt) | 2.5.0 | Camel Jasypt support -| link:camel-kura/src/main/docs/kura.adoc[Kura] (camel-kura) | | Camel Kura support +| link:camel-kura/src/main/docs/kura.adoc[Kura] (camel-kura) | 2.15.0 | Camel Kura support -| link:camel-leveldb/src/main/docs/leveldb.adoc[Leveldb] (camel-leveldb) | | Camel LevelDB Support +| link:camel-leveldb/src/main/docs/leveldb.adoc[Leveldb] (camel-leveldb) | 2.10.0 | Camel LevelDB Support -| link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | | Camel Components +| link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18.0 | Camel Components -| link:camel-ruby/src/main/docs/ruby.adoc[Ruby] (camel-ruby) | | Camel Ruby support +| link:camel-ruby/src/main/docs/ruby.adoc[Ruby] (camel-ruby) | 1.0.0 | *deprecated* Camel Ruby support -| link:camel-rx/src/main/docs/rx.adoc[Rx] (camel-rx) | | Camel Reactive Extensions support +| link:camel-rx/src/main/docs/rx.adoc[Rx] (camel-rx) | 2.11.0 | Camel Reactive Extensions support -| link:camel-scala/src/main/docs/scala.adoc[Scala] (camel-scala) | | Camel Scala DSL +| link:camel-scala/src/main/docs/scala.adoc[Scala] (camel-scala) | 1.4.0 | Camel Scala DSL -| link:camel-scr/src/main/docs/scr.adoc[Scr] (camel-scr) | | Camel SCR support +| link:camel-scr/src/main/docs/scr.adoc[Scr] (camel-scr) | 2.15.0 | Camel SCR support -| link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servletlistener] (camel-servletlistener) | | Camel servlet listener for bootstrapping Camel in Web Applications +| link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servletlistener] (camel-servletlistener) | 2.11.0 | Camel servlet listener for bootstrapping Camel in Web Applications -| link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | | Camel Shiro Security support +| link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5.0 | Camel Shiro Security support -| link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] (camel-spring-boot) | | Camel :: Spring Boot +| link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] (camel-spring-boot) | 2.15.0 | Camel :: Spring Boot -| link:camel-spring-cloud/src/main/docs/spring-cloud.adoc[Spring Cloud] (camel-spring-cloud) | | Camel :: Spring Cloud +| link:camel-spring-cloud/src/main/docs/spring-cloud.adoc[Spring Cloud] (camel-spring-cloud) | 2.19.0 | Camel :: Spring Cloud -| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring Dm] (camel-spring-dm) | | *deprecated* Camel Spring DM support +| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring Dm] (camel-spring-dm) | 2.18.0 | *deprecated* Camel Spring DM support -| link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Javaconfig] (camel-spring-javaconfig) | | Camel Spring JavaConfig support +| link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Javaconfig] (camel-spring-javaconfig) | 2.0.0 | Camel Spring JavaConfig support -| link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | | Camel Spring Security support +| link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3.0 | Camel Spring Security support -| link:camel-swagger/src/main/docs/swagger.adoc[Swagger] (camel-swagger) | | *deprecated* Camel Swagger support +| link:camel-swagger/src/main/docs/swagger.adoc[Swagger] (camel-swagger) | 2.14.0 | *deprecated* Camel Swagger support -| link:camel-swagger-java/src/main/docs/swagger-java.adoc[Swagger Java] (camel-swagger-java) | | Camel Swagger Java support +| link:camel-swagger-java/src/main/docs/swagger-java.adoc[Swagger Java] (camel-swagger-java) | 2.16.0 | Camel Swagger Java support -| link:camel-test/src/main/docs/test.adoc[Test] (camel-test) | | Camel Testing Library using JUnit +| link:camel-test/src/main/docs/test.adoc[Test] (camel-test) | 2.9.0 | Camel Testing Library using JUnit -| link:camel-test-blueprint/src/main/docs/test-blueprint.adoc[Test Blueprint] (camel-test-blueprint) | | Camel Testing Blueprint Library using JUnit +| link:camel-test-blueprint/src/main/docs/test-blueprint.adoc[Test Blueprint] (camel-test-blueprint) | 2.10.0 | Camel Testing Blueprint Library using JUnit -| link:camel-test-cdi/src/main/docs/test-cdi.adoc[Test Cdi] (camel-test-cdi) | | Camel Testing Library using JUnit and CDI +| link:camel-test-cdi/src/main/docs/test-cdi.adoc[Test Cdi] (camel-test-cdi) | 2.17.0 | Camel Testing Library using JUnit and CDI -| link:camel-test-karaf/src/main/docs/test-karaf.adoc[Test Karaf] (camel-test-karaf) | | Camel Testing Library using Pax Exam, Karaf and JUnit +| link:camel-test-karaf/src/main/docs/test-karaf.adoc[Test Karaf] (camel-test-karaf) | 2.18.0 | Camel Testing Library using Pax Exam, Karaf and JUnit -| link:camel-test-spring/src/main/docs/test-spring.adoc[Test Spring] (camel-test-spring) | | Camel Testing Library using JUnit and Spring 4.1+ +| link:camel-test-spring/src/main/docs/test-spring.adoc[Test Spring] (camel-test-spring) | 2.10.0 | Camel Testing Library using JUnit and Spring 4.1+ -| link:camel-testng/src/main/docs/testng.adoc[Testng] (camel-testng) | | *deprecated* Camel Testing Library using TestNG +| link:camel-testng/src/main/docs/testng.adoc[Testng] (camel-testng) | 2.8.0 | *deprecated* Camel Testing Library using TestNG -| link:camel-urlrewrite/src/main/docs/urlrewrite.adoc[Urlrewrite] (camel-urlrewrite) | | Camel URLRewrite support +| link:camel-urlrewrite/src/main/docs/urlrewrite.adoc[Urlrewrite] (camel-urlrewrite) | 2.11.0 | Camel URLRewrite support -| link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | | Camel Zipkin Support +| link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | 2.18.0 | Camel Zipkin Support |======================================================================= // others: END http://git-wip-us.apache.org/repos/asf/camel/blob/33a66710/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java index 632fdd4..1c3ecca 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; @@ -35,7 +34,6 @@ import org.apache.camel.maven.packaging.model.DataFormatOptionModel; import org.apache.camel.maven.packaging.model.EndpointOptionModel; import org.apache.camel.maven.packaging.model.LanguageModel; import org.apache.camel.maven.packaging.model.LanguageOptionModel; -import org.apache.camel.maven.packaging.model.OtherModel; import org.apache.maven.model.Resource; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -50,7 +48,7 @@ import static org.apache.camel.maven.packaging.PackageHelper.writeText; import static org.apache.camel.maven.packaging.StringHelper.isEmpty; /** - * Generate or updates the component/dataformat/language/other readme.md and .adoc files in the project root directory. + * Generate or updates the component/dataformat/language readme.md and .adoc files in the project root directory. * * @goal update-readme */ @@ -98,7 +96,6 @@ public class ReadmeComponentMojo extends AbstractMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { executeComponent(); - executeOther(); executeDataFormat(); executeLanguage(); } @@ -163,44 +160,6 @@ public class ReadmeComponentMojo extends AbstractMojo { } } - private void executeOther() throws MojoExecutionException, MojoFailureException { - // find the other names - List<String> otherNames = findOtherNames(); - - final Set<File> jsonFiles = new TreeSet<File>(); - PackageHelper.findJsonFiles(buildDir, jsonFiles, new PackageHelper.CamelOthersModelFilter()); - - // only if there is other we should update the documentation files - if (!otherNames.isEmpty()) { - getLog().debug("Found " + otherNames.size() + " others"); - for (String otherName : otherNames) { - String json = loadOtherJson(jsonFiles, otherName); - if (json != null) { - File file = new File(docDir, otherName + ".adoc"); - - OtherModel model = generateOtherModel(otherName, json); - - boolean exists = file.exists(); - boolean updated; - - updated = updateTitles(file, model.getTitle()); - updated |= updateAvailableFrom(file, model.getFirstVersion()); - - if (updated) { - getLog().info("Updated doc file: " + file); - } else if (exists) { - getLog().debug("No changes to doc file: " + file); - } else { - getLog().warn("No other doc file: " + file); - if (isFailFast()) { - throw new MojoExecutionException("Failed build due failFast=true"); - } - } - } - } - } - } - private void executeDataFormat() throws MojoExecutionException, MojoFailureException { // find the dataformat names List<String> dataFormatNames = findDataFormatNames(); @@ -644,23 +603,6 @@ public class ReadmeComponentMojo extends AbstractMojo { return null; } - private String loadOtherJson(Set<File> jsonFiles, String otherName) { - try { - for (File file : jsonFiles) { - if (file.getName().equals(otherName + ".json")) { - String json = loadText(new FileInputStream(file)); - boolean isOther = json.contains("\"kind\": \"other\""); - if (isOther) { - return json; - } - } - } - } catch (IOException e) { - // ignore - } - return null; - } - private ComponentModel generateComponentModel(String componentName, String json) { List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false); @@ -815,23 +757,6 @@ public class ReadmeComponentMojo extends AbstractMojo { return language; } - private OtherModel generateOtherModel(String otherName, String json) { - List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("other", json, false); - - OtherModel other = new OtherModel(); - other.setTitle(JSonSchemaHelper.getSafeValue("title", rows)); - other.setName(JSonSchemaHelper.getSafeValue("name", rows)); - other.setDescription(JSonSchemaHelper.getSafeValue("description", rows)); - other.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows)); - other.setLabel(JSonSchemaHelper.getSafeValue("label", rows)); - other.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows)); - other.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows)); - other.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows)); - other.setVersion(JSonSchemaHelper.getSafeValue("version", rows)); - - return other; - } - private String templateComponentHeader(ComponentModel model) throws MojoExecutionException { try { String template = loadText(ReadmeComponentMojo.class.getClassLoader().getResourceAsStream("component-header.mvel")); @@ -910,30 +835,6 @@ public class ReadmeComponentMojo extends AbstractMojo { return componentNames; } - private List<String> findOtherNames() { - List<String> otherNames = new ArrayList<String>(); - for (Resource r : project.getBuild().getResources()) { - File f = new File(r.getDirectory()); - if (!f.exists()) { - f = new File(project.getBasedir(), r.getDirectory()); - } - f = new File(f, "META-INF/services/org/apache/camel/other.properties"); - - if (f.exists() && f.isFile()) { - try { - Properties prop = new Properties(); - prop.load(new FileInputStream(f)); - - String name = prop.getProperty("name"); - otherNames.add(name); - } catch (Exception e) { - // ignore - } - } - } - return otherNames; - } - private List<String> findDataFormatNames() { List<String> dataFormatNames = new ArrayList<String>(); for (Resource r : project.getBuild().getResources()) {
