This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
The following commit(s) were added to refs/heads/camel-quarkus-main by this
push:
new e306748 Enable example project build & testing on Windows
e306748 is described below
commit e306748fc70d0fdb8b96d1187bfbd21dcbd9f142
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Tue Feb 15 15:52:12 2022 +0000
Enable example project build & testing on Windows
---
.gitattributes | 3 +++
.github/workflows/ci-build.yaml | 38 ++++++++++++++++++++++++++++++++++++--
aws-lambda/pom.xml | 3 ++-
eclipse-formatter-config.xml | 1 +
file-bindy-ftp/pom.xml | 22 ++++++++++++++++++++--
file-split-log-xml/pom.xml | 3 ++-
health/pom.xml | 3 ++-
http-log/pom.xml | 3 ++-
jdbc-datasource/pom.xml | 3 ++-
kafka/pom.xml | 14 +++++++++++++-
kamelet-chucknorris/pom.xml | 3 ++-
observability/pom.xml | 3 ++-
rest-json/pom.xml | 3 ++-
timer-log-cdi/pom.xml | 3 ++-
timer-log-kotlin/pom.xml | 3 ++-
timer-log-main/pom.xml | 3 ++-
timer-log-spring/pom.xml | 3 ++-
timer-log-xml/pom.xml | 3 ++-
timer-log/pom.xml | 3 ++-
19 files changed, 101 insertions(+), 19 deletions(-)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..f7163f6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.cmd text eol=crlf
+
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index cb73f1f..b040299 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -93,7 +93,7 @@ jobs:
fi
- name: Build Camel Quarkus Examples
run: |
- ./mvnw-for-each.sh ${MAVEN_ARGS} clean install -DskipTests
-Dquarkus.build.skip -Dimpsort.skip -Dformatter.skip
+ ./mvnw-for-each.sh ${MAVEN_ARGS} clean install -DskipTests
-Dquarkus.build.skip
- name: Fail if there are uncommitted changes
shell: bash
run: |
@@ -147,7 +147,7 @@ jobs:
fi
./mvnw ${MAVEN_ARGS} clean verify \
- -Dformatter.skip -Dimpsort.skip -Denforcer.skip \
+ -Dformatter.skip -Dimpsort.skip \
-Pnative,docker \
-f "${EXAMPLE}/pom.xml"
done
@@ -155,3 +155,37 @@ jobs:
shell: bash
run: |
[[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted
changes'; git status; exit 1; }
+
+ integration-tests-alternative-platform:
+ name: Integration Tests Alternative Platform - ${{matrix.os}}
+ needs: initial-mvn-install
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ os: ['windows-latest']
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Set up JDK 11
+ uses: actions/setup-java@v2
+ with:
+ distribution: 'temurin'
+ java-version: '11'
+ - name: Download Maven Repo
+ uses: actions/download-artifact@v2
+ with:
+ name: maven-repo
+ path: ..
+ - name: Extract Maven Repo
+ shell: bash
+ run: |
+ tar -xzf ../maven-repo.tgz -C ~
+ - name: Integration Tests
+ shell: bash
+ run: |
+ ./mvnw-for-each.sh ${MAVEN_ARGS} -Dskip-testcontainers-tests clean
verify
+ - name: Fail if there are uncommitted changes
+ shell: bash
+ run: |
+ [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted
changes'; git status; exit 1; }
diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml
index c641707..69f0456 100644
--- a/aws-lambda/pom.xml
+++ b/aws-lambda/pom.xml
@@ -42,7 +42,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -115,6 +115,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/eclipse-formatter-config.xml b/eclipse-formatter-config.xml
index 0ecf473..2248b2b 100644
--- a/eclipse-formatter-config.xml
+++ b/eclipse-formatter-config.xml
@@ -90,6 +90,7 @@
<setting
id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch"
value="false"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size"
value="8"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation"
value="insert"/>
+ <setting
id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
value="do not insert"/>
diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml
index e663c2f..5302477 100644
--- a/file-bindy-ftp/pom.xml
+++ b/file-bindy-ftp/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -132,6 +132,11 @@
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>${groovy-maven-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
@@ -139,6 +144,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
@@ -288,7 +294,8 @@
Pattern pattern =
Pattern.compile("app.kubernetes.io/version: .*")
["kubernetes", "openshift"].each { k8sResource
->
- File file = new
File("${project.basedir}/src/main/kubernetes/${k8sResource}.yml")
+ String sanitizedBasedir =
project.basedir.path.replace('\\', '/')
+ File file = new
File("${sanitizedBasedir}/src/main/kubernetes/${k8sResource}.yml")
String content = file.text
Matcher matcher = pattern.matcher(content)
@@ -369,6 +376,17 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>skip-testcontainers-tests</id>
+ <activation>
+ <property>
+ <name>skip-testcontainers-tests</name>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/file-split-log-xml/pom.xml b/file-split-log-xml/pom.xml
index 76d4ea1..95a21c0 100644
--- a/file-split-log-xml/pom.xml
+++ b/file-split-log-xml/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -117,6 +117,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/health/pom.xml b/health/pom.xml
index 7de6afc..b62cf2c 100644
--- a/health/pom.xml
+++ b/health/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -116,6 +116,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/http-log/pom.xml b/http-log/pom.xml
index 1fd52c2..bda7185 100644
--- a/http-log/pom.xml
+++ b/http-log/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -121,6 +121,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/jdbc-datasource/pom.xml b/jdbc-datasource/pom.xml
index 1f538a14..789bdf1 100644
--- a/jdbc-datasource/pom.xml
+++ b/jdbc-datasource/pom.xml
@@ -33,7 +33,7 @@
<camel-quarkus.platform.group-id>org.apache.camel.quarkus</camel-quarkus.platform.group-id>
<camel-quarkus.platform.artifact-id>camel-quarkus-bom</camel-quarkus.platform.artifact-id>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -119,6 +119,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
<plugin>
diff --git a/kafka/pom.xml b/kafka/pom.xml
index dcd16b8..6961a66 100644
--- a/kafka/pom.xml
+++ b/kafka/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -141,6 +141,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
@@ -338,6 +339,17 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>skip-testcontainers-tests</id>
+ <activation>
+ <property>
+ <name>skip-testcontainers-tests</name>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/kamelet-chucknorris/pom.xml b/kamelet-chucknorris/pom.xml
index 93ce679..9034f2f 100644
--- a/kamelet-chucknorris/pom.xml
+++ b/kamelet-chucknorris/pom.xml
@@ -46,7 +46,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -137,6 +137,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/observability/pom.xml b/observability/pom.xml
index 5052792..64e8aee 100644
--- a/observability/pom.xml
+++ b/observability/pom.xml
@@ -45,7 +45,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -127,6 +127,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/rest-json/pom.xml b/rest-json/pom.xml
index 5aed06e..f0d8a42 100644
--- a/rest-json/pom.xml
+++ b/rest-json/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -105,6 +105,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/timer-log-cdi/pom.xml b/timer-log-cdi/pom.xml
index 9f42d57..457084a 100644
--- a/timer-log-cdi/pom.xml
+++ b/timer-log-cdi/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -109,6 +109,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/timer-log-kotlin/pom.xml b/timer-log-kotlin/pom.xml
index 2c71e02..091d5a7 100644
--- a/timer-log-kotlin/pom.xml
+++ b/timer-log-kotlin/pom.xml
@@ -44,7 +44,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -117,6 +117,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/timer-log-main/pom.xml b/timer-log-main/pom.xml
index 5ef4961..f11daa2 100644
--- a/timer-log-main/pom.xml
+++ b/timer-log-main/pom.xml
@@ -46,7 +46,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -132,6 +132,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/timer-log-spring/pom.xml b/timer-log-spring/pom.xml
index f195837..a1a299d 100644
--- a/timer-log-spring/pom.xml
+++ b/timer-log-spring/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -113,6 +113,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/timer-log-xml/pom.xml b/timer-log-xml/pom.xml
index 59b403a..7b05e9b 100644
--- a/timer-log-xml/pom.xml
+++ b/timer-log-xml/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -113,6 +113,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
diff --git a/timer-log/pom.xml b/timer-log/pom.xml
index 5485ebe..4db1bed 100644
--- a/timer-log/pom.xml
+++ b/timer-log/pom.xml
@@ -43,7 +43,7 @@
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
- <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
+ <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -109,6 +109,7 @@
<version>${formatter-maven-plugin.version}</version>
<configuration>
<configFile>${maven.multiModuleProjectDirectory}/eclipse-formatter-config.xml</configFile>
+ <lineEnding>LF</lineEnding>
</configuration>
</plugin>
