You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/08/22 12:29:51 UTC
[camel-quarkus] branch master updated (65e57be -> 6726300)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 65e57be Merge pull request #156 from ppalaga/i58
new 9f35cba Fixup #124 Deployments POM
new 6726300 Fixup #58 Enforce dependency rules
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:
extensions/pom.xml | 10 ++---
pom.xml | 4 +-
poms/bom-deployment/pom.xml | 97 ---------------------------------------------
poms/build-parent/pom.xml | 17 ++++----
4 files changed, 14 insertions(+), 114 deletions(-)
[camel-quarkus] 02/02: Fixup #58 Enforce dependency rules
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6726300c4e69be01c2c44412d9a54ad04edce6fc
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Aug 22 11:45:31 2019 +0200
Fixup #58 Enforce dependency rules
---
extensions/pom.xml | 10 ++++------
pom.xml | 4 ++--
poms/build-parent/pom.xml | 17 ++++++++---------
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index a69a6d0..b78bf5a 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -78,9 +78,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin.version}</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>${groovy-maven-plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -90,9 +90,7 @@
</goals>
<phase>validate</phase>
<configuration>
- <scripts>
- <script>file:///${project.basedir}/../build/scripts/list-camel-quarkus-extensions.groovy</script>
- </scripts>
+ <source>file:///${project.basedir}/../build/scripts/list-camel-quarkus-extensions.groovy</source>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 5ff875b..47621aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
<supported-maven-versions>[3.5.3,)</supported-maven-versions>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
- <gmavenplus-plugin.version>1.7.1</gmavenplus-plugin.version>
- <groovy.version>2.5.7</groovy.version>
+ <groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
+ <groovy.version>2.5.8</groovy.version>
<mycila-license.version>3.0</mycila-license.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index beec23b..0d45856 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -76,9 +76,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin.version}</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>${groovy-maven-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -93,8 +93,8 @@
<plugins>
<plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
<executions>
<execution>
<id>sanity-checks</id>
@@ -103,8 +103,8 @@
</goals>
<phase>validate</phase>
<configuration>
- <scripts>
- <script><![CDATA[
+ <useSharedClassLoader>false</useSharedClassLoader>
+ <source><![CDATA[
final List<String> badDeps = []
final File pomXml = new File(project.basedir, "pom.xml")
if (pomXml.exists()) {
@@ -120,8 +120,7 @@
throw new RuntimeException("\nRemove explicit version from the following dependencies and rather manage them in one of the BOMs:\n\n "
+ badDeps.join("\n "))
}
- ]]></script>
- </scripts>
+ ]]></source>
</configuration>
</execution>
</executions>
[camel-quarkus] 01/02: Fixup #124 Deployments POM
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9f35cba4ec5560597be04d7755955e0eee4a7dd2
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Aug 22 10:28:06 2019 +0200
Fixup #124 Deployments POM
---
poms/bom-deployment/pom.xml | 97 ---------------------------------------------
1 file changed, 97 deletions(-)
diff --git a/poms/bom-deployment/pom.xml b/poms/bom-deployment/pom.xml
index c0aea31..32da42f 100644
--- a/poms/bom-deployment/pom.xml
+++ b/poms/bom-deployment/pom.xml
@@ -173,101 +173,4 @@
</dependencies>
</dependencyManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
- <version>${quarkus.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>extension-descriptor</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
- </deployment>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- <doclint>none</doclint>
- <show>package</show>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>sourcecheck</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-buildtools</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${maven-checkstyle.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>default-cli</id>
- <phase>validate</phase>
- <configuration>
- <includeResources>false</includeResources>
- <configLocation>camel-checkstyle.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <failsOnError>${checkstyle.failOnViolation}</failsOnError>
- <linkXRef>false</linkXRef>
- <suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
- <encoding>UTF-8</encoding>
- <sourceDirectories>
- <sourceDirectory>${basedir}/src</sourceDirectory>
- </sourceDirectories>
- <headerLocation>header-java.txt</headerLocation>
- <includes>**/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd</includes>
- <excludes>**/MyRoutes*.java,**/Target*.java,**/*Substitutions.java</excludes>
- </configuration>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>