Merge pull request #678 from johnpoth/fhir-context-recorder
camel-fhir record FHIR context instead of creating it at runtime. Onl…
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index fa071d7..6867658 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -21,6 +21,7 @@
pull_request:
branches:
- master
+ - camel-master
env:
LANG: en_US
@@ -29,6 +30,10 @@
build:
runs-on: ubuntu-latest
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -37,7 +42,7 @@
java-version: 1.8
- name: Build Project
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
clean install
- name: Save Cache
@@ -53,20 +58,28 @@
matrix:
java: [ '11' , '12' ]
steps:
- - uses: actions/checkout@v2
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- - name: Build on ${{ matrix.java }}
- run: |
- ./mvnw -V -B \
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
- clean verify
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ - uses: actions/checkout@v2
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v1
+ with:
+ java-version: ${{ matrix.java }}
+ - name: Build on ${{ matrix.java }}
+ run: |
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+ clean verify
core:
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -82,7 +95,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -96,6 +109,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -111,7 +128,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -128,6 +145,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -143,7 +164,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -156,6 +177,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -171,7 +196,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -183,6 +208,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -198,7 +227,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -215,6 +244,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -230,7 +263,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -242,6 +275,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -257,7 +294,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -269,6 +306,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -284,7 +325,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -295,6 +336,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -310,7 +355,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
@@ -328,6 +373,10 @@
runs-on: ubuntu-latest
needs: build
steps:
+ - name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -343,7 +392,7 @@
maven-${{ github.sha }}
- name: Integration Tests
run: |
- ./mvnw -V -B \
+ ./mvnw -V -B ${BRANCH_OPTIONS} \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean verify \
-Dnative \
-Ddocker \
diff --git a/.github/workflows/sync-camel-master-branch.yaml b/.github/workflows/sync-camel-master-branch.yaml
new file mode 100644
index 0000000..75ac9d1
--- /dev/null
+++ b/.github/workflows/sync-camel-master-branch.yaml
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: Sync Camel Master Branch
+
+on:
+ schedule:
+ # Run every Monday at midnight
+ - cron: '0 0 * * 1'
+
+jobs:
+ sync:
+ runs-on: ubuntu-latest
+ steps:
+ # Note: checkout@v2 seems to break the pull-request action hence v1 is used
+ - name: Checkout
+ uses: actions/checkout@v1
+ - name: GitHub Pull Request Action
+ uses: repo-sync/pull-request@v2.0.1
+ with:
+ source_branch: master
+ destination_branch: camel-master
+ pr_title: Automatic sync branch master to camel-master
+ github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/examples/rest-json/pom.xml b/examples/rest-json/pom.xml
index 2ed4aa0..255e1ca 100644
--- a/examples/rest-json/pom.xml
+++ b/examples/rest-json/pom.xml
@@ -37,8 +37,8 @@
<artifactId>camel-quarkus-platform-http</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</artifactId>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-jackson</artifactId>
</dependency>
<!-- test dependencies -->
