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 8769156 Replace ${camel.quarkus.project.root} set by
directory-maven-plugin with ${maven.multiModuleProjectDirectory}
8769156 is described below
commit 876915617f1bd6b2cb58b071ee4b63e0fdea4dcc
Author: Peter Palaga <[email protected]>
AuthorDate: Mon Oct 26 09:30:12 2020 +0100
Replace ${camel.quarkus.project.root} set by directory-maven-plugin with
${maven.multiModuleProjectDirectory}
---
catalog/pom.xml | 6 +++---
pom.xml | 1 -
poms/build-parent/pom.xml | 26 ++++++--------------------
tooling/descriptors/src.xml | 3 ++-
tooling/scripts/validate-dependencies.groovy | 2 +-
5 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 879a63e..80b5136 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -4249,9 +4249,9 @@
<phase>process-resources</phase>
<configuration>
<extensionDirectories>
-
<extensionDirectory>${camel.quarkus.project.root}/extensions-core</extensionDirectory>
-
<extensionDirectory>${camel.quarkus.project.root}/extensions</extensionDirectory>
-
<extensionDirectory>${camel.quarkus.project.root}/extensions-jvm</extensionDirectory>
+
<extensionDirectory>${maven.multiModuleProjectDirectory}/extensions-core</extensionDirectory>
+
<extensionDirectory>${maven.multiModuleProjectDirectory}/extensions</extensionDirectory>
+
<extensionDirectory>${maven.multiModuleProjectDirectory}/extensions-jvm</extensionDirectory>
</extensionDirectories>
<skipArtifactIdBases>
<skipArtifactIdBase>http-common</skipArtifactIdBase>
diff --git a/pom.xml b/pom.xml
index fcbae41..efe5e7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,6 @@
<!-- Maven plugin versions (keep sorted alphabetically) -->
<cq-plugin.version>0.20.0</cq-plugin.version>
<build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
- <directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
<google-auth-library-credentials.version>0.19.0</google-auth-library-credentials.version>
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index de9000f..0de3156 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -104,7 +104,7 @@
<artifactId>formatter-maven-plugin</artifactId>
<version>${formatter-maven-plugin.version}</version>
<configuration>
-
<configFile>${camel.quarkus.project.root}/tooling/eclipse-formatter-config.xml</configFile>
+
<configFile>${maven.multiModuleProjectDirectory}/tooling/eclipse-formatter-config.xml</configFile>
<skip>${format.skip}</skip>
</configuration>
</plugin>
@@ -125,23 +125,6 @@
<plugins>
<plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- <version>${directory-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>directories</id>
- <goals>
- <goal>highest-basedir</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <property>camel.quarkus.project.root</property>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
@@ -164,7 +147,7 @@
<configuration>
<resources>
<resource>
-
<directory>${camel.quarkus.project.root}/tooling/legal</directory>
+
<directory>${maven.multiModuleProjectDirectory}/tooling/legal</directory>
</resource>
</resources>
</configuration>
@@ -223,7 +206,10 @@
</goals>
<phase>validate</phase>
<configuration>
-
<source>file://${camel.quarkus.project.root}/tooling/scripts/validate-dependencies.groovy</source>
+
<source>file://${maven.multiModuleProjectDirectory}/tooling/scripts/validate-dependencies.groovy</source>
+ <properties>
+
<maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
+ </properties>
</configuration>
</execution>
</executions>
diff --git a/tooling/descriptors/src.xml b/tooling/descriptors/src.xml
index f9445c7..7c29c6d 100644
--- a/tooling/descriptors/src.xml
+++ b/tooling/descriptors/src.xml
@@ -44,7 +44,8 @@
<exclude>*/activemq-data/**</exclude>
<exclude>**/eclipse-classes/**</exclude>
<exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
+ <exclude>**/.github/**</exclude>
+ <exclude>**/.mvn/wrapper/**</exclude>
<exclude>**/surefire*</exclude>
<exclude>**/svn-commit*</exclude>
diff --git a/tooling/scripts/validate-dependencies.groovy
b/tooling/scripts/validate-dependencies.groovy
index e423b45..4e962e1 100644
--- a/tooling/scripts/validate-dependencies.groovy
+++ b/tooling/scripts/validate-dependencies.groovy
@@ -25,7 +25,7 @@ final Set<String> extensionGroupIds =
["org.apache.camel.quarkus", "io.quarkus",
/* artifactIds from groups contained in extensionGroupIds that are not
extensions */
final Set<String> nonExtensionArtifactIds = ["quarkus-development-mode-spi",
"camel-quarkus-qute-component"] as Set
-final Path treeRootDir =
Paths.get(project.properties['camel.quarkus.project.root'])
+final Path treeRootDir =
Paths.get(properties['maven.multiModuleProjectDirectory'])
final Path relativePomPath =
treeRootDir.relativize(pomXml.toPath().normalize())
if (pomXml.exists()) {
