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/03/03 08:47:44 UTC
[camel] branch camel-3.x updated (f16bbd11f00 -> 9fda42d292a)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from f16bbd11f00 camel-vertx-websocket: Fix flaky tests
new f7df086211e [Minor] exclude "**/test/resources/**/*.xml" from checkstyle to repair checkstyle
new 9fda42d292a [Minor] add license to top of archetype-catalog for check style pass
The 2 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:
parent/pom.xml | 2 +-
.../packaging/PackageArchetypeCatalogMojo.java | 22 ++++++++++++++++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
[camel] 02/02: [Minor] add license to top of archetype-catalog for check style pass
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9fda42d292a4d447e46f18dc08a949e915273b8f
Author: shmakovaa <ye...@gmail.com>
AuthorDate: Fri Mar 3 02:03:41 2023 +0500
[Minor] add license to top of archetype-catalog for check style pass
---
.../packaging/PackageArchetypeCatalogMojo.java | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java
index 928c18e8404..e0d39297c3c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java
@@ -205,8 +205,26 @@ public class PackageArchetypeCatalogMojo extends AbstractMojo {
}
private static void writeTop(FileOutputStream fos) throws IOException {
- String top = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<archetype-catalog>\n <archetypes>";
- fos.write(top.getBytes());
+ fos.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".getBytes());
+ writeLicense(fos);
+ fos.write("<archetype-catalog>\n <archetypes>".getBytes());
+ }
+
+ private static void writeLicense(FileOutputStream fos) throws IOException {
+ fos.write("<!--\n\n".getBytes());
+ fos.write(" Licensed to the Apache Software Foundation (ASF) under one or more\n".getBytes());
+ fos.write(" contributor license agreements. See the NOTICE file distributed with\n".getBytes());
+ fos.write(" this work for additional information regarding copyright ownership.\n".getBytes());
+ fos.write(" The ASF licenses this file to You under the Apache License, Version 2.0\n".getBytes());
+ fos.write(" (the \"License\"); you may not use this file except in compliance with\n".getBytes());
+ fos.write(" the License. You may obtain a copy of the License at\n".getBytes());
+ fos.write("\n http://www.apache.org/licenses/LICENSE-2.0\n\n".getBytes());
+ fos.write(" Unless required by applicable law or agreed to in writing, software\n".getBytes());
+ fos.write(" distributed under the License is distributed on an \"AS IS\" BASIS,\n".getBytes());
+ fos.write(" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n".getBytes());
+ fos.write(" See the License for the specific language governing permissions and\n".getBytes());
+ fos.write(" limitations under the License.\n".getBytes());
+ fos.write("\n-->\n".getBytes());
}
private static class ArchetypeModel {
[camel] 01/02: [Minor] exclude "**/test/resources/**/*.xml" from checkstyle to repair checkstyle
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f7df086211efc94263deee85bf05b128b72a6ca2
Author: ShmakovAlexey <ye...@gmail.com>
AuthorDate: Wed Mar 1 23:48:53 2023 +0500
[Minor] exclude "**/test/resources/**/*.xml" from checkstyle to repair checkstyle
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9bfd30e71ac..a4fb465b3c9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4260,7 +4260,7 @@
</sourceDirectories>
<headerLocation>header-java.txt</headerLocation>
<includes>**/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd</includes>
- <excludes>${sourcecheckExcludesComma}**/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java</excludes>
+ <excludes>${sourcecheckExcludesComma}**/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java,**/test/resources/**/*.xml</excludes>
</configuration>
<goals>
<goal>check</goal>