You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/07/05 07:31:20 UTC

[camel] branch main updated (3d904e95480 -> 0b5e2d7747f)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 3d904e95480 CAMEL-19571 - camel-parquet-avro: Add other compression codecs than gzip
     new b5731319a32 Sort plugin version properties alphabetically
     new 80ece558b69 Remove maven-eclipse-plugin that is retired since 2015; importing into Eclipse works quite well since many years. There is no need to use this plugin
     new 106fc99ad0d Remove unused java-diff-utils-version property
     new 0b5e2d7747f Manage surefire and failsafe plugins under the same version property because they are always released together

The 4 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:
 archetypes/pom.xml | 17 -----------------
 components/pom.xml |  4 ----
 parent/pom.xml     | 14 --------------
 pom.xml            | 40 ++++++++++------------------------------
 4 files changed, 10 insertions(+), 65 deletions(-)


[camel] 03/04: Remove unused java-diff-utils-version property

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 106fc99ad0d959240582f49a8b7874b8f6033839
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jul 4 15:15:25 2023 +0200

    Remove unused java-diff-utils-version property
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 214d4a48844..96a57c89728 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,6 @@
         <maven-failsafe-plugin-version>3.1.2</maven-failsafe-plugin-version>
         <!-- we need to override the version inherited from Apache POM for modules that use this POM as parent -->
         <surefire.version>${maven-surefire-plugin-version}</surefire.version>
-        <java-diff-utils-version>4.7</java-diff-utils-version>
 
         <jaxb-core-version>4.0.1</jaxb-core-version>
         <jaxb-impl-version>4.0.1</jaxb-impl-version>


[camel] 01/04: Sort plugin version properties alphabetically

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b5731319a32e7ab80abb8a909c0d7cf189133b13
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jul 4 15:00:18 2023 +0200

    Sort plugin version properties alphabetically
---
 parent/pom.xml |  1 -
 pom.xml        | 17 +++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index b8b22902875..a128fd1bf88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -330,7 +330,6 @@
         <maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
         <maven-archetype-plugin-version>3.2.1</maven-archetype-plugin-version>
         <maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
-        <maven-assembly-plugin-version>3.4.2</maven-assembly-plugin-version>
         <maven-owasp-plugin-version>8.3.1</maven-owasp-plugin-version>
         <maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
         <maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version>
diff --git a/pom.xml b/pom.xml
index f82a4b6b397..6e3b2041ecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,18 +118,22 @@
         <!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
         <project.build.outputTimestamp>1980-01-01T00:00:02Z</project.build.outputTimestamp>
 
+        <maven-assembly-plugin-version>3.4.2</maven-assembly-plugin-version>
+        <cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
         <flatten-maven-plugin-version>1.5.0</flatten-maven-plugin-version>
-        <maven-invoker-plugin-version>3.6.0</maven-invoker-plugin-version>
+        <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
+        <license-maven-plugin-version>4.2</license-maven-plugin-version>
         <maven-compiler-plugin-version>3.11.0</maven-compiler-plugin-version>
+        <maven-dependency-plugin-version>3.6.0</maven-dependency-plugin-version>
+        <maven-enforcer-plugin-version>3.3.0</maven-enforcer-plugin-version>
+        <maven-invoker-plugin-version>3.6.0</maven-invoker-plugin-version>
         <maven-javadoc-plugin-version>3.5.0</maven-javadoc-plugin-version>
+        <maven-remote-resources-plugin-version>3.1.0</maven-remote-resources-plugin-version>
         <maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version>
         <maven-failsafe-plugin-version>3.1.2</maven-failsafe-plugin-version>
         <!-- we need to override the version inherited from Apache POM for modules that use this POM as parent -->
         <surefire.version>${maven-surefire-plugin-version}</surefire.version>
         <java-diff-utils-version>4.7</java-diff-utils-version>
-        <maven-enforcer-plugin-version>3.3.0</maven-enforcer-plugin-version>
-        <maven-dependency-plugin-version>3.6.0</maven-dependency-plugin-version>
-        <maven-remote-resources-plugin-version>3.1.0</maven-remote-resources-plugin-version>
 
         <!-- eclipse plugin need the jaxb in this pom.xml file -->
         <!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
@@ -139,10 +143,7 @@
         <jaxb-osgi-version>4.0.1</jaxb-osgi-version>
         <jaxb-xjc-version>4.0.1</jaxb-xjc-version>
         <jaxb-jxc-version>4.0.1</jaxb-jxc-version>
-        <mycila-license-version>4.2</mycila-license-version>
-        <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
         <groovy-version>4.0.12</groovy-version>
-        <cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
 
         <camel.javadoc.offline>false</camel.javadoc.offline>
 
@@ -262,7 +263,7 @@
                 <plugin>
                     <groupId>com.mycila</groupId>
                     <artifactId>license-maven-plugin</artifactId>
-                    <version>${mycila-license-version}</version>
+                    <version>${license-maven-plugin-version}</version>
                     <configuration>
                         <failIfUnknown>true</failIfUnknown>
                         <header>${maven.multiModuleProjectDirectory}/buildingtools/src/main/resources/header.txt</header>


[camel] 02/04: Remove maven-eclipse-plugin that is retired since 2015; importing into Eclipse works quite well since many years. There is no need to use this plugin

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 80ece558b69aa10067a99bf258324dcf1aaa763e
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jul 4 15:05:24 2023 +0200

    Remove maven-eclipse-plugin that is retired since 2015; importing into Eclipse works quite well since many years. There is no need to use this plugin
---
 archetypes/pom.xml | 17 -----------------
 parent/pom.xml     | 12 ------------
 pom.xml            | 19 -------------------
 3 files changed, 48 deletions(-)

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 86be420ddd1..bcf413ed628 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -125,22 +125,5 @@
             </plugin>
 
         </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <configuration>
-                        <buildcommands>
-                            <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
-                        </buildcommands>
-                        <projectnatures>
-                            <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-                        </projectnatures>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index a128fd1bf88..d453597b958 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3021,18 +3021,6 @@
                         </compilerArgs>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <configuration>
-                        <buildcommands>
-                            <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
-                        </buildcommands>
-                        <projectnatures>
-                            <nature>org.eclipse.jdt.core.javanature</nature>
-                        </projectnatures>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 6e3b2041ecb..214d4a48844 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,9 +135,6 @@
         <surefire.version>${maven-surefire-plugin-version}</surefire.version>
         <java-diff-utils-version>4.7</java-diff-utils-version>
 
-        <!-- eclipse plugin need the jaxb in this pom.xml file -->
-        <!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
-        <jakarta-xml-bind-api-version>4.0.0</jakarta-xml-bind-api-version>
         <jaxb-core-version>4.0.1</jaxb-core-version>
         <jaxb-impl-version>4.0.1</jaxb-impl-version>
         <jaxb-osgi-version>4.0.1</jaxb-osgi-version>
@@ -417,22 +414,6 @@
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>${maven-dependency-plugin-version}</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.10</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.camel</groupId>
-                            <artifactId>camel-buildtools</artifactId>
-                            <version>${project.version}</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <downloadSources>true</downloadSources>
-                        <downloadJavadocs>false</downloadJavadocs>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>


[camel] 04/04: Manage surefire and failsafe plugins under the same version property because they are always released together

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 0b5e2d7747f9b30d9cdfdbd6797a7f4f1f008751
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jul 4 21:55:55 2023 +0200

    Manage surefire and failsafe plugins under the same version property
    because they are always released together
---
 components/pom.xml | 4 ----
 parent/pom.xml     | 1 -
 pom.xml            | 3 +--
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/components/pom.xml b/components/pom.xml
index 90818694d6c..85be12185c9 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -468,7 +468,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin-version}</version>
                         <configuration>
                             <skipTests>${skipTests.s390x}</skipTests>
                         </configuration>
@@ -476,7 +475,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${maven-failsafe-plugin-version}</version>
                         <configuration>
                             <skipITs>${skipITs.s390x}</skipITs>
                         </configuration>
@@ -496,7 +494,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin-version}</version>
                         <configuration>
                             <skipTests>${skipTests.ppc64le}</skipTests>
                         </configuration>
@@ -504,7 +501,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${maven-failsafe-plugin-version}</version>
                         <configuration>
                             <skipITs>${skipITs.ppc64le}</skipITs>
                         </configuration>
diff --git a/parent/pom.xml b/parent/pom.xml
index d453597b958..c524e345a35 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3373,7 +3373,6 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin-version}</version>
                         <configuration>
                             <systemPropertyVariables>
                                 <!-- By default Java's secure RNG uses /dev/random to generate seeds. In
diff --git a/pom.xml b/pom.xml
index 96a57c89728..8769455cb0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,6 @@
         <maven-javadoc-plugin-version>3.5.0</maven-javadoc-plugin-version>
         <maven-remote-resources-plugin-version>3.1.0</maven-remote-resources-plugin-version>
         <maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version>
-        <maven-failsafe-plugin-version>3.1.2</maven-failsafe-plugin-version>
         <!-- we need to override the version inherited from Apache POM for modules that use this POM as parent -->
         <surefire.version>${maven-surefire-plugin-version}</surefire.version>
 
@@ -426,7 +425,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>${maven-failsafe-plugin-version}</version>
+                    <version>${maven-surefire-plugin-version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>