You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2022/01/30 17:57:32 UTC

[camel] branch release/3.15.0 updated (3880d16 -> 4a8b49c)

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

gzurowski pushed a change to branch release/3.15.0
in repository https://gitbox.apache.org/repos/asf/camel.git.


 discard 3880d16  Disable Javadoc linting for releasing with Java 11
     add 4d947bc  Remove camel-archetype-endpointdsl due to build order and being able to release Camel
     add 2e74964  Attempt to fix releasing Apache Camel in the camel-dependencies sync generator.
     add 4736070  Remove camel-archetype-endpointdsl due to build order and being able to release Camel
     add e685409  Grammar Of Docs Updated
     new 4a8b49c  Disable Javadoc linting for releasing with Java 11

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   (3880d16)
            \
             N -- N -- N   refs/heads/release/3.15.0 (4a8b49c)

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:
 archetypes/camel-archetype-endpointdsl/pom.xml     |  70 ---
 .../META-INF/maven/archetype-metadata.xml          |  67 ---
 .../src/main/resources/META-INF/LICENSE.txt        | 203 --------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../main/resources/archetype-resources/README.txt  |  15 -
 .../src/main/resources/archetype-resources/pom.xml | 121 -----
 .../archetype-resources/src/main/java/MainApp.java |  36 --
 .../src/main/java/MyRouteBuilder.java              |  45 --
 .../src/main/resources/log4j2.properties           |  23 -
 .../projects/build-it/archetype.properties         |  26 -
 .../src/test/resources/projects/build-it/goal.txt  |   1 -
 .../resources/projects/run-it/archetype.properties |  28 -
 .../src/test/resources/projects/run-it/goal.txt    |   1 -
 archetypes/pom.xml                                 |   1 -
 .../camel-dependencies-pom-template.xml            | 578 ---------------------
 camel-dependencies/pom.xml                         |  30 +-
 .../camel/catalog/archetypes/archetype-catalog.xml |   6 -
 .../src/main/docs/modules/eips/pages/message.adoc  |   2 +-
 .../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc    |  28 +-
 .../maven/sync/properties/SyncPropertiesMojo.java  |  16 +-
 .../main/resources/camel-dependencies-template.xml |  27 +-
 21 files changed, 46 insertions(+), 1289 deletions(-)
 delete mode 100644 archetypes/camel-archetype-endpointdsl/pom.xml
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/main/resources/archetype-resources/README.txt
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/main/resources/archetype-resources/pom.xml
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/main/resources/archetype-resources/src/main/java/MainApp.java
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/test/resources/projects/build-it/archetype.properties
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/test/resources/projects/build-it/goal.txt
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/test/resources/projects/run-it/archetype.properties
 delete mode 100644 archetypes/camel-archetype-endpointdsl/src/test/resources/projects/run-it/goal.txt
 delete mode 100644 camel-dependencies/camel-dependencies-pom-template.xml
 copy components/camel-olingo2/pom.xml => tooling/maven/sync-properties-maven-plugin/src/main/resources/camel-dependencies-template.xml (60%)

[camel] 01/01: Disable Javadoc linting for releasing with Java 11

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

gzurowski pushed a commit to branch release/3.15.0
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 4a8b49cf7cb5b56b19ae43bb88becd3f9d9ea434
Author: Gregor Zurowski <gr...@zurowski.org>
AuthorDate: Sat Jan 29 17:23:38 2022 +0000

    Disable Javadoc linting for releasing with Java 11
---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 4f319c3..5cd6ea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -751,6 +751,8 @@
                         <configuration>
                             <source>8</source>
                             <additionalOptions>${javadoc.opts}</additionalOptions>
+                            <!-- disable linting for building release with Java 11 -->
+                            <doclint>none</doclint>
                         </configuration>
                     </plugin>
                     <!-- We want to sign the artifact, the POM, and all attached artifacts -->