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.

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

Upgrade to Quarkus 2.0.0.CR3 #2722

Merged
merged 16 commits into from
Jun 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ jobs:
eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
-Pnative,docker,ci \
--fail-at-end \
-pl "${NATIVE_MODULES[*]}"
fi
- name: Fail if there are uncommitted changes
Expand Down Expand Up @@ -289,6 +290,7 @@ jobs:
cd extensions-jvm
../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean test

integration-tests-alternative-jvm:
Expand Down Expand Up @@ -339,6 +341,7 @@ jobs:
cd integration-tests
../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
--fail-at-end \
clean verify

examples-tests:
Expand Down
39 changes: 0 additions & 39 deletions catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -884,19 +884,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-componentdsl</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-consul</artifactId>
Expand Down Expand Up @@ -1248,19 +1235,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-endpointdsl</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-etcd</artifactId>
Expand Down Expand Up @@ -4264,19 +4238,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-xml-io</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-xml-io-dsl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ asciidoc:
attributes:
cq-camel-components: 3.10.x@components # replace ${camel.docs.components.xref}
min-maven-version: 3.6.2 # replace ${min-maven-version}
quarkus-version: 2.0.0.CR2 # replace ${quarkus.version}
quarkus-version: 2.0.0.CR3 # replace ${quarkus.version}
3 changes: 0 additions & 3 deletions docs/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
*** xref:reference/extensions/core-cloud.adoc[Cloud]
*** xref:reference/extensions/coap.adoc[CoAP]
*** xref:reference/extensions/cometd.adoc[CometD]
*** xref:reference/extensions/componentdsl.adoc[Component DSL]
*** xref:reference/extensions/consul.adoc[Consul]
*** xref:reference/extensions/controlbus.adoc[Control Bus]
*** xref:reference/extensions/corda.adoc[Corda]
Expand All @@ -112,7 +111,6 @@
*** xref:reference/extensions/ehcache.adoc[Ehcache]
*** xref:reference/extensions/elsql.adoc[ElSQL]
*** xref:reference/extensions/elasticsearch-rest.adoc[Elasticsearch Rest]
*** xref:reference/extensions/endpointdsl.adoc[Endpoint DSL]
*** xref:reference/extensions/etcd.adoc[Etcd Keys]
*** xref:reference/extensions/etcd3.adoc[Etcd3]
*** xref:reference/extensions/exec.adoc[Exec]
Expand Down Expand Up @@ -316,7 +314,6 @@
*** xref:reference/extensions/workday.adoc[Workday]
*** xref:reference/extensions/xchange.adoc[XChange]
*** xref:reference/extensions/xj.adoc[XJ]
*** xref:reference/extensions/xml-io.adoc[XML IO]
*** xref:reference/extensions/xml-io-dsl.adoc[XML IO DSL]
*** xref:reference/extensions/xml-jaxb.adoc[XML JAXB]
*** xref:reference/extensions/xml-jaxp.adoc[XML JAXP]
Expand Down
34 changes: 0 additions & 34 deletions docs/modules/ROOT/pages/reference/extensions/componentdsl.adoc

This file was deleted.

34 changes: 0 additions & 34 deletions docs/modules/ROOT/pages/reference/extensions/endpointdsl.adoc

This file was deleted.

30 changes: 0 additions & 30 deletions docs/modules/ROOT/pages/reference/extensions/xml-io.adoc

This file was deleted.

4 changes: 2 additions & 2 deletions docs/modules/ROOT/pages/reference/extensions/xml-jaxb.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
:cq-description: An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io
:cq-description: An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io-dsl
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0

[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##

An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io
An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io-dsl

== Maven coordinates

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public String dumpModelAsXml(CamelContext context, NamedNode definition) throws
@Override
public String dumpModelAsXml(CamelContext context, NamedNode definition, boolean resolvePlaceholders,
boolean resolveDelegateEndpoints) throws Exception {
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
throw new UnsupportedOperationException(
"Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ public DisabledPredicateValidatorReifier(CamelContext camelContext, ValidatorDef

@Override
protected Validator doCreateValidator() {
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
throw new UnsupportedOperationException(
"Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public DisabledValidateReifier(Route route, ProcessorDefinition<?> definition) {

@Override
public Processor createProcessor() throws Exception {
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io");
throw new UnsupportedOperationException(
"Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
public class DisabledXMLRoutesDefinitionLoader implements XMLRoutesDefinitionLoader {
@Override
public Object loadRoutesDefinition(CamelContext context, InputStream inputStream) throws Exception {
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io");
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io-dsl");
}

@Override
public Object loadRouteTemplatesDefinition(CamelContext context, InputStream inputStream) throws Exception {
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io");
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io-dsl");
}

@Override
public Object loadRestsDefinition(CamelContext context, InputStream inputStream) throws Exception {
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io");
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io-dsl");
}
}
1 change: 0 additions & 1 deletion extensions-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<module>http-common</module>
<module>reactive-executor</module>
<module>threadpoolfactory-vertx</module>
<module>xml-io</module>
<module>xml-io-dsl</module>
<module>xml-jaxb</module>
<module>xml-jaxp</module>
Expand Down
61 changes: 0 additions & 61 deletions extensions-core/xml-io/deployment/pom.xml

This file was deleted.

This file was deleted.

Loading