You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/04/26 06:50:34 UTC
[camel] branch main updated (20d31a8d35b -> 5efddd2cf65)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 20d31a8d35b Regen for commit cc24d404a87b3675dec58e01938c8f6c5c9a45c9
new 7b64b859c51 CAMEL-17894: disable checkstyle and import by default to speed-up the build
new 7902e928c5c CAMEL-17894: disable checkstyle and import by default to speed-up the build in core
new fac34a61b77 CAMEL-17894: disable checkstyle and import by default to speed-up the build in components
new aabe600cc20 CAMEL-17894: disable checkstyle and import by default to speed-up the build in test-infra
new 18a9c3a210f CAMEL-17894: disable checkstyle and import by default to speed-up the build in tests
new 028206a8d97 CAMEL-17894: disable checkstyle and import by default to speed-up the build in tooling
new f092718f828 CAMEL-17894: added a separate profile to retain the previous behavior
new 8a1ef7c921b CAMEL-17894: adjust the CI for the updated profiles
new df0d388f598 CAMEL-17894: disable checkstyle and import by default to speed-up the build in selected DSL components
new 5efddd2cf65 CAMEL-17894: updated documentation to include notes about auto-formatting
The 10 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:
.github/workflows/master-pr-build.yml | 2 +-
CONTRIBUTING.md | 4 ++-
components/pom.xml | 4 ---
core/pom.xml | 4 ---
docs/user-manual/modules/ROOT/pages/building.adoc | 4 +--
dsl/camel-componentdsl/pom.xml | 4 +++
dsl/camel-endpointdsl/pom.xml | 4 +++
dsl/pom.xml | 4 ---
parent/pom.xml | 30 ++++++++++++++++-------
test-infra/pom.xml | 9 -------
tests/pom.xml | 4 ---
tooling/pom.xml | 9 -------
12 files changed, 35 insertions(+), 47 deletions(-)
[camel] 09/10: CAMEL-17894: disable checkstyle and import by default to speed-up the build in selected DSL components
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit df0d388f598f14b449e0a99117961d93ede2bbb0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 11:27:58 2022 +0200
CAMEL-17894: disable checkstyle and import by default to speed-up the build in selected DSL components
---
dsl/camel-componentdsl/pom.xml | 4 ++++
dsl/camel-endpointdsl/pom.xml | 4 ++++
dsl/pom.xml | 4 ----
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dsl/camel-componentdsl/pom.xml b/dsl/camel-componentdsl/pom.xml
index c5d7c5cfd0c..1e36952813a 100644
--- a/dsl/camel-componentdsl/pom.xml
+++ b/dsl/camel-componentdsl/pom.xml
@@ -160,6 +160,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index 94eada3e371..222ac3e1f54 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -167,6 +167,10 @@
<maxmem>1024M</maxmem>
</configuration>
</plugin>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
diff --git a/dsl/pom.xml b/dsl/pom.xml
index ba8659b13ce..b04145a23d3 100644
--- a/dsl/pom.xml
+++ b/dsl/pom.xml
@@ -178,10 +178,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
[camel] 10/10: CAMEL-17894: updated documentation to include notes about auto-formatting
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5efddd2cf65ce18b67f9cbe63d70be9817c298d3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 16:29:03 2022 +0200
CAMEL-17894: updated documentation to include notes about auto-formatting
---
CONTRIBUTING.md | 4 +++-
docs/user-manual/modules/ROOT/pages/building.adoc | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0f97a70f06e..a9195123642 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,9 @@ Then follow these simple guidelines for working on the code and committing your
- Build the project using Maven:
- mvn clean install -Pfastinstall
+ mvn clean install -Pfastinstall,format
+
+Note: the `format` profile will ensure that the code is properly formatted according to the project standards:
- Add a unit test with assertions for your changes.
diff --git a/docs/user-manual/modules/ROOT/pages/building.adoc b/docs/user-manual/modules/ROOT/pages/building.adoc
index bc348043676..efb5733002d 100644
--- a/docs/user-manual/modules/ROOT/pages/building.adoc
+++ b/docs/user-manual/modules/ROOT/pages/building.adoc
@@ -55,11 +55,11 @@ the unit tests, which can complete in less than 10 minutes.
mvn clean install -Pfastinstall
-------------------------------
-== A normal build without running tests but checkstyle verification enabled
+== A normal build without running tests but auto formatting and checkstyle verification enabled
[source,bash]
-------------------------------------------
-mvn clean install -Pfastinstall,sourcecheck
+mvn clean install -Pfastinstall,format,sourcecheck
-------------------------------------------
== Building with checkstyle
[camel] 05/10: CAMEL-17894: disable checkstyle and import by default to speed-up the build in tests
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 18a9c3a210f846458c1f5f725d411ed3b4584894
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 09:45:14 2022 +0200
CAMEL-17894: disable checkstyle and import by default to speed-up the build in tests
---
tests/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/tests/pom.xml b/tests/pom.xml
index 2fff65064b3..9af69f726ad 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -65,10 +65,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
[camel] 01/10: CAMEL-17894: disable checkstyle and import by default to speed-up the build
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7b64b859c51af58cb0ed56692667bb5fe04776f3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 09:43:51 2022 +0200
CAMEL-17894: disable checkstyle and import by default to speed-up the build
---
parent/pom.xml | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a7a98281137..5b97b820eaf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4571,14 +4571,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.revelc.code</groupId>
- <artifactId>impsort-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -4684,7 +4677,7 @@
<activeByDefault>true</activeByDefault>
</activation>
</profile>
-
+
<profile>
<id>fastinstall</id>
<activation>
[camel] 04/10: CAMEL-17894: disable checkstyle and import by default to speed-up the build in test-infra
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aabe600cc206b637f2c2e671c45afec07459861c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 09:45:06 2022 +0200
CAMEL-17894: disable checkstyle and import by default to speed-up the build in test-infra
---
test-infra/pom.xml | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/test-infra/pom.xml b/test-infra/pom.xml
index 03b6b36238e..fcaadd19aaf 100644
--- a/test-infra/pom.xml
+++ b/test-infra/pom.xml
@@ -74,13 +74,4 @@
<module>camel-test-infra-openldap</module>
<module>camel-test-infra-ignite</module>
</modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
[camel] 06/10: CAMEL-17894: disable checkstyle and import by default to speed-up the build in tooling
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 028206a8d97b0b02b5d2991cc6858233fd264dcd
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 09:45:20 2022 +0200
CAMEL-17894: disable checkstyle and import by default to speed-up the build in tooling
---
tooling/pom.xml | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/tooling/pom.xml b/tooling/pom.xml
index b1583eefab7..ba448574c55 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -47,13 +47,4 @@
<properties>
<camel.osgi.export.pkg />
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
[camel] 07/10: CAMEL-17894: added a separate profile to retain the previous behavior
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f092718f8289050720a91035777c1c1f24d7e16c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Apr 22 13:28:32 2022 +0200
CAMEL-17894: added a separate profile to retain the previous behavior
---
parent/pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5b97b820eaf..9a35f3e577c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4694,6 +4694,25 @@
</properties>
</profile>
+ <profile>
+ <id>format</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.revelc.code</groupId>
+ <artifactId>impsort-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
<id>sourcecheck</id>
<build>
[camel] 03/10: CAMEL-17894: disable checkstyle and import by default to speed-up the build in components
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fac34a61b77d36ec1dfef64d18c927ccebb462e8
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 09:43:25 2022 +0200
CAMEL-17894: disable checkstyle and import by default to speed-up the build in components
---
components/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/components/pom.xml b/components/pom.xml
index 85ea6cb0b1b..f04de880817 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -502,10 +502,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
[camel] 08/10: CAMEL-17894: adjust the CI for the updated profiles
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8a1ef7c921bec5a60bf1cba31db513c6c86ea938
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Apr 22 13:31:44 2022 +0200
CAMEL-17894: adjust the CI for the updated profiles
---
.github/workflows/master-pr-build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/master-pr-build.yml b/.github/workflows/master-pr-build.yml
index 0c2f69f49cd..e7b3f50fc40 100644
--- a/.github/workflows/master-pr-build.yml
+++ b/.github/workflows/master-pr-build.yml
@@ -72,7 +72,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
- run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -Pfastinstall -Dcheckstyle.skip=true -DskipTests install
+ run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log -Dmvnd.threads=2 -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -Pfastinstall -DskipTests install
- name: archive logs
uses: actions/upload-artifact@v3
if: always()
[camel] 02/10: CAMEL-17894: disable checkstyle and import by default to speed-up the build in core
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7902e928c5cb18173575db6d1f8366ddc9e9b484
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 09:43:15 2022 +0200
CAMEL-17894: disable checkstyle and import by default to speed-up the build in core
---
core/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 49238ce7c2b..82aad1212a3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -189,10 +189,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>