Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #897 List the JVM-only extensions in the docs #898

Merged
merged 2 commits into from
Mar 18, 2020
Merged

Fix #897 List the JVM-only extensions in the docs #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4af0b5
Fix #897 List the JVM-only extensions in the docs
ppalaga Mar 18, 2020
0f9eef7
Upgrade to cq-maven-plugin 0.2.0
ppalaga Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions catalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,15 @@
</goals>
<phase>process-resources</phase>
<configuration>
<extensionDirs>
<extensionDir>${camel.quarkus.project.root}/extensions-core</extensionDir>
<extensionDir>${camel.quarkus.project.root}/extensions</extensionDir>
</extensionDirs>
<extensionDirectories>
<extensionDirectory>${camel.quarkus.project.root}/extensions-core</extensionDirectory>
<extensionDirectory>${camel.quarkus.project.root}/extensions</extensionDirectory>
<extensionDirectory>${camel.quarkus.project.root}/extensions-jvm</extensionDirectory>
</extensionDirectories>
<skipArtifactIdBases>
<skipArtifactIdBase>http-common</skipArtifactIdBase>
</skipArtifactIdBases>
<extensionListFile>${camel.quarkus.project.root}/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc</extensionListFile>
</configuration>
</execution>
</executions>
Expand Down
403 changes: 268 additions & 135 deletions docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
View file
Open in desktop

Large diffs are not rendered by default.

383 changes: 0 additions & 383 deletions extensions/readme.adoc
View file
Open in desktop

This file was deleted.

36 changes: 35 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@

<ahc.version>2.10.4</ahc.version>
<camel.version>3.1.0</camel.version>
<freemarker.version>2.3.30</freemarker.version>
<google-http-client.version>1.22.0</google-http-client.version>
<guava.version>26.0-jre</guava.version>
<gson.version>2.8.5</gson.version>
<hapi.version>4.1.0</hapi.version>
<quarkus.version>1.3.0.Final</quarkus.version>
<httpmime.version>4.1.3</httpmime.version>
Expand Down Expand Up @@ -87,7 +89,8 @@
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<!-- NOTE: We pin to this version due to https://github.com/apache/camel-quarkus/issues/723 -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<cq-plugin.version>0.0.1</cq-plugin.version>
<cq-plugin.version>0.2.0</cq-plugin.version>
<rpkgtests-maven-plugin.version>0.6.0</rpkgtests-maven-plugin.version>

<!-- maven-release-plugin -->
<tagNameFormat>@{project.version}</tagNameFormat>
Expand Down Expand Up @@ -234,6 +237,14 @@
<groupId>org.l2x6.cq</groupId>
<artifactId>cq-maven-plugin</artifactId>
<version>${cq-plugin.version}</version>
<dependencies>
<!-- include camel-catalog on classpath -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-catalog</artifactId>
<version>${camel.version}</version>
</dependency>
</dependencies>
</plugin>

<plugin>
Expand All @@ -255,6 +266,7 @@
<excludes>
<exclude>**/*.adoc</exclude>
<exclude>**/*.csv</exclude>
<exclude>**/*.ftl</exclude>
<exclude>**/*.graphql</exclude>
<exclude>**/*.ics</exclude>
<exclude>**/*.lock</exclude>
Expand Down Expand Up @@ -323,6 +335,28 @@
-->
<configuration>
<templatesUriBase>file:///${project.basedir}/tooling/create-extension-templates</templatesUriBase>
<extensionDirs>
<extensionDir>
<path>extensions</path>
<artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
</extensionDir>
<extensionDir>
<path>extensions-core</path>
<artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
</extensionDir>
<extensionDir>
<path>extensions-jvm</path>
<artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
</extensionDir>
<extensionDir>
<path>extensions-support</path>
<artifactIdPrefix>camel-quarkus-support-</artifactIdPrefix>
</extensionDir>
<extensionDir>
<path>integration-tests/support</path>
<artifactIdPrefix>camel-quarkus-integration-test-support-</artifactIdPrefix>
</extensionDir>
</extensionDirs>
</configuration>
</plugin>

Expand Down
112 changes: 31 additions & 81 deletions tooling/package-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-tooling</artifactId>
<artifactId>camel-quarkus-build-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent/pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-package-maven-plugin</artifactId>
Expand All @@ -32,110 +33,59 @@
<name>Camel Quarkus :: Tooling :: Maven :: Package Maven Plugin</name>
<description>Maven plugin to help package Camel quarkus components and plugins</description>


<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
<version>${camel.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
</exclusion>
<exclusion>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
</exclusion>
</exclusions>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
<version>${camel.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
<artifactId>camel-catalog</artifactId>
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util</artifactId>
<version>${camel.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
<version>${camel.version}</version>
</dependency>
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>${mvel.version}</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
Expand Down