Skip to content

Commit

Permalink
Update extension support levels (apache#167)
Browse files Browse the repository at this point in the history
* Do not let prod-excludes mojo get fooled by older upstream Camel with different deps

* Upgrade to Camel 3.14.2.redhat-00038

* Update extension support levels
  • Loading branch information
ppalaga committed May 26, 2022
1 parent 0738a86 commit a0183dd
Show file tree
Hide file tree
Showing 10 changed files with 475 additions and 404 deletions.
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
<version>3.14.2.redhat-00029</version>
<version>3.14.2.redhat-00038</version>
</parent>

<groupId>org.apache.camel.quarkus</groupId>
Expand All @@ -41,7 +41,7 @@
<!-- Primary dependencies - maintained manually -->
<camel.major.minor>3.14</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
<camel-community.version>${camel.major.minor}.2</camel-community.version>
<camel.version>3.14.2.redhat-00029</camel.version>
<camel.version>3.14.2.redhat-00038</camel.version>
<camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends -->
Expand Down Expand Up @@ -117,6 +117,7 @@
<jetty.version>${jetty9-version}</jetty.version>
<jgit.version>6.0.0.202111291000-r</jgit.version><!-- @sync io.quarkiverse.jgit:quarkus-jgit-parent:${quarkiverse-jgit.version} prop:jgit.version -->
<jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive deps -->
<jsch.version>${jsch-version}</jsch.version><!-- Prefer the version brought by Camel for jsch and ftp extensions -->
<json-smart.version>2.4.7</json-smart.version>
<kafka.version>3.1.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
Expand Down Expand Up @@ -165,7 +166,7 @@
<maven-utils.version>0.1.0</maven-utils.version>

<!-- Maven plugin versions (keep sorted alphabetically) -->
<cq-plugin.version>2.28.0</cq-plugin.version>
<cq-plugin.version>2.29.1</cq-plugin.version>
<build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
Expand Down
14 changes: 10 additions & 4 deletions poms/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2247,10 +2247,6 @@
<artifactId>camel-ftp</artifactId>
<version>${camel.version}</version>
<exclusions>
<exclusion>
<groupId>com.github.mwiede</groupId>
<artifactId>jsch</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
Expand Down Expand Up @@ -9658,6 +9654,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId>
<version>${hapi-fhir.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-server</artifactId>
Expand Down Expand Up @@ -9743,6 +9744,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.mwiede</groupId>
<artifactId>jsch</artifactId>
<version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
Expand Down
222 changes: 114 additions & 108 deletions poms/bom/src/main/generated/flattened-full-pom.xml

Large diffs are not rendered by default.

0 comments on commit a0183dd

Please sign in to comment.