You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2020/09/29 05:00:00 UTC
[camel-quarkus] branch quarkus-master updated (d98f329 -> b7bb87e)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard d98f329 Upgrade to Quarkus 1.9.0 - WIP
add 3b654ba Updated CHANGELOG.md
add 0069803 Remove redundant camel-quarkus-xml-jaxb dependency from file-split-log-xml example
add daab714 Work around camel main inability to load REST DSL configs from XML for #1852
add 4be271f Document camel main xml configuration properties
add de103b1 Upgrade to cq-maven-plugin 0.20.0, set nativeSince property when promoting an extension to native
new b7bb87e Upgrade to Quarkus 1.9.0 - WIP
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d98f329)
\
N -- N -- N refs/heads/quarkus-master (b7bb87e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 4 +-
docs/modules/ROOT/pages/user-guide/bootstrap.adoc | 88 ++++++++++++++++++++++
examples/file-split-log-xml/pom.xml | 17 -----
.../quarkus/main/CamelMainRoutesCollector.java | 53 +++++++++++++
integration-tests/main-xml-io/pom.xml | 17 +++++
.../camel/quarkus/main/CoreMainXmlIoResource.java | 7 ++
.../src/main/resources/application.properties | 3 +
.../src/main/resources/rests/my-rests.xml} | 19 +++--
.../src/main/resources/templates/my-templates.xml} | 12 ++-
.../camel/quarkus/main/CoreMainXmlIoTest.java | 10 ++-
integration-tests/main-xml-jaxb/pom.xml | 17 +++++
.../quarkus/main/CoreMainXmlJaxbResource.java | 7 ++
.../src/main/resources/application.properties | 3 +
.../src/main/resources/rests/my-rests.xml} | 19 +++--
.../src/main/resources/templates/my-templates.xml} | 12 ++-
.../camel/quarkus/main/CoreMainXmlJaxbTest.java | 10 ++-
pom.xml | 2 +-
17 files changed, 258 insertions(+), 42 deletions(-)
copy integration-tests/{jing/src/main/resources/schema.rng => main-xml-io/src/main/resources/rests/my-rests.xml} (72%)
copy integration-tests/{tika/src/main/resources/quarkus.xml => main-xml-io/src/main/resources/templates/my-templates.xml} (69%)
copy integration-tests/{jing/src/main/resources/schema.rng => main-xml-jaxb/src/main/resources/rests/my-rests.xml} (72%)
copy integration-tests/{tika/src/main/resources/quarkus.xml => main-xml-jaxb/src/main/resources/templates/my-templates.xml} (69%)
[camel-quarkus] 01/01: Upgrade to Quarkus 1.9.0 - WIP
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b7bb87e7ddf2d35a304c05717548fc0e721ff296
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Sep 2 19:49:36 2020 +0100
Upgrade to Quarkus 1.9.0 - WIP
---
integration-tests/jdbc/src/main/resources/application.properties | 7 +++----
integration-tests/jpa/src/main/resources/application.properties | 7 +++----
integration-tests/sql/src/main/resources/application.properties | 7 +++----
pom.xml | 2 +-
4 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/integration-tests/jdbc/src/main/resources/application.properties b/integration-tests/jdbc/src/main/resources/application.properties
index a9ba189..778b149 100644
--- a/integration-tests/jdbc/src/main/resources/application.properties
+++ b/integration-tests/jdbc/src/main/resources/application.properties
@@ -18,7 +18,6 @@
#
# Quarkus :: DS
#
-quarkus.datasource.camel-ds.url=jdbc:h2:tcp://localhost/mem:test
-quarkus.datasource.camel-ds.driver=org.h2.Driver
-quarkus.datasource.camel-ds.max-size=8
-quarkus.datasource.camel-ds.min-size=2
+quarkus.datasource.camel-ds.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.camel-ds.db-kind=h2
+quarkus.datasource.camel-ds.jdbc.max-size=8
diff --git a/integration-tests/jpa/src/main/resources/application.properties b/integration-tests/jpa/src/main/resources/application.properties
index d979e98..d0c3199 100644
--- a/integration-tests/jpa/src/main/resources/application.properties
+++ b/integration-tests/jpa/src/main/resources/application.properties
@@ -14,9 +14,8 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:test
-quarkus.datasource.driver=org.h2.Driver
-quarkus.datasource.max-size=8
-quarkus.datasource.min-size=2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.max-size=8
quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/integration-tests/sql/src/main/resources/application.properties b/integration-tests/sql/src/main/resources/application.properties
index 99fc364..723b365 100644
--- a/integration-tests/sql/src/main/resources/application.properties
+++ b/integration-tests/sql/src/main/resources/application.properties
@@ -18,10 +18,9 @@
#
# Quarkus Datasource
#
-quarkus.datasource.camel-sql.url=jdbc:h2:tcp://localhost/mem:test
-quarkus.datasource.camel-sql.driver=org.h2.Driver
-quarkus.datasource.camel-sql.max-size=8
-quarkus.datasource.camel-sql.min-size=2
+quarkus.datasource.camel-sql.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.camel-sql.db-kind=h2
+quarkus.datasource.camel-sql.jdbc.max-size=8
#
# Camel Quarkus SQL
diff --git a/pom.xml b/pom.xml
index ffe22a9..813ad23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<nimbus-jose-jwt.version>4.41.1</nimbus-jose-jwt.version><!-- Mess in hdfs transitive deps -->
<okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
- <quarkus.version>1.8.1.Final</quarkus.version>
+ <quarkus.version>999-SNAPSHOT</quarkus.version>
<quarkus-qpid-jms.version>0.18.0</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>