Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

POM enhancements #903

Merged
merged 2 commits into from
Mar 18, 2020
Merged

POM enhancements #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
992fb50
Define our own requireMavenVersion and skip the one in org.apache:apache
ppalaga Mar 18, 2020
149d0da
Sort poms using the CQ plugin instead of a groovy script
ppalaga Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions extensions-support/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<packaging>pom</packaging>

<modules>
<!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat -->
<module>ahc</module>
<module>aws</module>
<module>common</module>
Expand Down
65 changes: 56 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,21 @@
<templatesUriBase>file:///${project.basedir}/tooling/create-extension-templates</templatesUriBase>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven-version</id>
<!-- enforce-maven-version is defined in org.apache:apache -->
<!-- we skip for the whole Camel Quarkus tree because we have -->
<!-- an analogous check in camel-quarkus-enforcer-rules -->
<phase>none</phase>
</execution>
</executions>
</plugin>

</plugins>

</build>
Expand All @@ -350,6 +365,9 @@
<goal>enforce</goal>
</goals>
<configuration>
<requireMavenVersion>
<version>3.6.2</version>
</requireMavenVersion>
<rules>
<dependencyConvergence />
<requireMavenVersion>
Expand Down Expand Up @@ -464,23 +482,52 @@
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<groupId>org.l2x6.cq</groupId>
<artifactId>cq-maven-plugin</artifactId>
<executions>
<execution>
<id>sort-poms</id>
<inherited>false</inherited>
<goals>
<goal>execute</goal>
<goal>format</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<properties>
<sortModulesPaths>extensions/pom.xml,integration-tests/pom.xml</sortModulesPaths>
<sortDependencyManagementPaths>poms/bom/pom.xml,poms/bom-deployment/pom.xml</sortDependencyManagementPaths>
<updateMvndRuleDirs>examples,integration-tests</updateMvndRuleDirs>
</properties>
<source>file:///${project.basedir}/tooling/scripts/sort-poms.groovy</source>
<sortModulesPaths>
<sortModulesPath>extensions/pom.xml</sortModulesPath>
<sortModulesPath>extensions-jvm/pom.xml</sortModulesPath>
<sortModulesPath>integration-tests/pom.xml</sortModulesPath>
</sortModulesPaths>
<sortDependencyManagementPaths>
<sortDependencyManagementPath>poms/bom/pom.xml</sortDependencyManagementPath>
<sortDependencyManagementPath>poms/bom-deployment/pom.xml</sortDependencyManagementPath>
</sortDependencyManagementPaths>
<updateMvndRuleDirs>
<updateMvndRuleDir>examples</updateMvndRuleDir>
<updateMvndRuleDir>integration-tests</updateMvndRuleDir>
</updateMvndRuleDirs>
<extensionDirs>
<extensionDir>
<path>extensions</path>
<artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
</extensionDir>
<extensionDir>
<path>extensions-core</path>
<artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
</extensionDir>
<extensionDir>
<path>extensions-jvm</path>
<artifactIdPrefix>camel-quarkus-</artifactIdPrefix>
</extensionDir>
<extensionDir>
<path>extensions-support</path>
<artifactIdPrefix>camel-quarkus-support-</artifactIdPrefix>
</extensionDir>
<extensionDir>
<path>integration-tests/support</path>
<artifactIdPrefix>camel-quarkus-integration-test-support-</artifactIdPrefix>
</extensionDir>
</extensionDirs>
</configuration>
</execution>
</executions>
Expand Down