You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2020/03/31 06:39:16 UTC
[camel-quarkus] branch master updated: New source assembly
descriptor and root pom rename (#1002)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 017f71e New source assembly descriptor and root pom rename (#1002)
017f71e is described below
commit 017f71e3e62f554beb6569a2d4266f44ce2fd94e
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Mar 31 08:39:06 2020 +0200
New source assembly descriptor and root pom rename (#1002)
* Fix #844 Duplicate LICENSE(.txt) and NOTICE(.txt) files in the source distribution
* Fix #1001 Rename the top module from camel-quarkus-parent to camel-quarkus
---
docs/pom.xml | 2 +-
examples/pom.xml | 2 +-
extensions-core/pom.xml | 2 +-
extensions-jvm/pom.xml | 2 +-
extensions-support/pom.xml | 2 +-
extensions/pom.xml | 2 +-
pom.xml | 34 +++++++++++++++++++++-
poms/pom.xml | 2 +-
tooling/descriptors/src.xml | 71 +++++++++++++++++++++++++++++++++++++++++++++
tooling/pom.xml | 2 +-
10 files changed, 112 insertions(+), 9 deletions(-)
diff --git a/docs/pom.xml b/docs/pom.xml
index 656f278..fdba9b3 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
diff --git a/examples/pom.xml b/examples/pom.xml
index cfef43e..9ef12c8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml
index 27e7aa7..e41197b 100644
--- a/extensions-core/pom.xml
+++ b/extensions-core/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index 0dce45b..d6aa7f7 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
diff --git a/extensions-support/pom.xml b/extensions-support/pom.xml
index bb88ef0..b375ce1 100644
--- a/extensions-support/pom.xml
+++ b/extensions-support/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 42bbeb8..924a5d5 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
diff --git a/pom.xml b/pom.xml
index 5dad376..85ae3c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -405,6 +405,38 @@
<profiles>
<profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase /><!-- fix https://github.com/apache/camel-quarkus/issues/844 -->
+ </execution>
+ <execution>
+ <id>camel-quarkus-source-release-assembly</id>
+ <phase>package</phase>
+ <inherited>false</inherited>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>tooling/descriptors/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<!-- To disable sanity checks while building: add '-Denforce=false' to the command line -->
<id>enforce</id>
<activation>
diff --git a/poms/pom.xml b/poms/pom.xml
index e014ba2..52f2a48 100644
--- a/poms/pom.xml
+++ b/poms/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>
diff --git a/tooling/descriptors/src.xml b/tooling/descriptors/src.xml
new file mode 100644
index 0000000..35b4ef7
--- /dev/null
+++ b/tooling/descriptors/src.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- Binary Files -->
+ <fileSet>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+
+ <!-- release-plugin temp files -->
+ <exclude>**/pom.xml.releaseBackup</exclude>
+ <exclude>**/release.properties</exclude>
+
+ <exclude>**/target/**</exclude>
+
+ <exclude>**/build/**</exclude>
+ <!-- exclude>data/**</exclude>
+ <exclude>*/data/**</exclude -->
+ <exclude>activemq-data/**</exclude>
+ <exclude>*/activemq-data/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <!-- IntelliJ -->
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+
+ <!-- Eclipse -->
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath]</exclude>
+ <exclude>**/.settings/**</exclude>
+
+ <exclude>**/cobertura.ser</exclude>
+
+ <exclude>**/node_modules/**</exclude>
+ <exclude>**/.flattened-pom.xml</exclude>
+ </excludes>
+ </fileSet>
+
+ </fileSets>
+</assembly>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index a013662..67fe11b 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-parent</artifactId>
+ <artifactId>camel-quarkus</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>