nicolaferraro closed pull request #283: Runtime cleanup URL: https://github.com/apache/camel-k/pull/283
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/runtime/.maven-versions-rules.xml b/runtime/.maven-versions-rules.xml new file mode 100644 index 00000000..44e512be --- /dev/null +++ b/runtime/.maven-versions-rules.xml @@ -0,0 +1,39 @@ +<?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. + +--> +<ruleset xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + comparisonMethod="maven" + xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd";> + + <ignoreVersions> + <!-- Ignore Alpha's, Beta's, release candidates and milestones --> + <ignoreVersion type="regex">(?i).*Alpha(?:-?\d+)?</ignoreVersion> + <ignoreVersion type="regex">(?i).*a(?:-?\d+)?</ignoreVersion> + <ignoreVersion type="regex">(?i).*Beta(?:-?\d+)?</ignoreVersion> + <ignoreVersion type="regex">(?i).*-B(?:-?\d+)?</ignoreVersion> + <ignoreVersion type="regex">(?i).*RC(?:-?\d+)?</ignoreVersion> + <ignoreVersion type="regex">(?i).*CR(?:-?\d+)?</ignoreVersion> + <ignoreVersion type="regex">(?i).*M(?:-?\d+)?</ignoreVersion> + </ignoreVersions> + + <rules> + </rules> + +</ruleset> \ No newline at end of file diff --git a/runtime/camel-knative/.gitignore b/runtime/camel-knative/.gitignore deleted file mode 100644 index ed929831..00000000 --- a/runtime/camel-knative/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -target - -*.iml - -.idea -.project -.metadata -.settings -.factorypath -.classpath diff --git a/runtime/catalog-builder/.gitignore b/runtime/catalog-builder/.gitignore deleted file mode 100644 index ed929831..00000000 --- a/runtime/catalog-builder/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -target - -*.iml - -.idea -.project -.metadata -.settings -.factorypath -.classpath diff --git a/runtime/dependency-lister/.gitignore b/runtime/dependency-lister/.gitignore deleted file mode 100644 index ed929831..00000000 --- a/runtime/dependency-lister/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -target - -*.iml - -.idea -.project -.metadata -.settings -.factorypath -.classpath diff --git a/runtime/groovy/.gitignore b/runtime/groovy/.gitignore deleted file mode 100644 index ed929831..00000000 --- a/runtime/groovy/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -target - -*.iml - -.idea -.project -.metadata -.settings -.factorypath -.classpath diff --git a/runtime/jvm/.gitignore b/runtime/jvm/.gitignore deleted file mode 100644 index ed929831..00000000 --- a/runtime/jvm/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -target - -*.iml - -.idea -.project -.metadata -.settings -.factorypath -.classpath diff --git a/runtime/kotlin/.gitignore b/runtime/kotlin/.gitignore deleted file mode 100644 index ed929831..00000000 --- a/runtime/kotlin/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -target - -*.iml - -.idea -.project -.metadata -.settings -.factorypath -.classpath diff --git a/runtime/pom.xml b/runtime/pom.xml index e7f2c3aa..7e421b9c 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -17,22 +17,17 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime-parent</artifactId> <version>0.1.1-SNAPSHOT</version> <packaging>pom</packaging> - + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - <camel.version>2.23.0</camel.version> <junit.version>4.12</junit.version> <junit-jupiter.version>5.3.2</junit-jupiter.version> @@ -49,11 +44,12 @@ <spock.version>1.2-groovy-2.5</spock.version> <jackson.version>2.9.7</jackson.version> <spring-boot.version>2.1.0.RELEASE</spring-boot.version> - <gmavenplus-plugin.version>1.6.1</gmavenplus-plugin.version> <fabric8-maven-plugin.version>3.5.40</fabric8-maven-plugin.version> <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version> + <versions-maven-plugin.version>2.7</versions-maven-plugin.version> + <directory-maven-plugin.version>0.3.1</directory-maven-plugin.version> </properties> <dependencyManagement> @@ -79,7 +75,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven-compiler-plugin.version}</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -96,7 +92,7 @@ </plugins> </pluginManagement> </build> - + <modules> <module>jvm</module> <module>groovy</module> @@ -108,4 +104,42 @@ <module>camel-knative</module> </modules> -</project> + <profiles> + <profile> + <id>deps</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <defaultGoal>initialize versions:display-dependency-updates</defaultGoal> + <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>initialize</phase> + <configuration> + <property>camel-k.project.root</property> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>${versions-maven-plugin.version}</version> + <configuration> + <rulesUri>file:///${camel-k.project.root}/.maven-versions-rules.xml</rulesUri> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> \ No newline at end of file diff --git a/runtime/spring-boot/.gitignore b/runtime/spring-boot/.gitignore deleted file mode 100644 index ed929831..00000000 --- a/runtime/spring-boot/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -target - -*.iml - -.idea -.project -.metadata -.settings -.factorypath -.classpath ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
