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

Dpes updates and build clenaup #93

Merged
merged 5 commits into from
Jul 10, 2019
Merged

Dpes updates and build clenaup #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21cb196
chore(deps): update kotlin to v1.3.41
lburgazzoli Jul 9, 2019
f3f9d22
chore(deps): update joor to v0.9.12
lburgazzoli Jul 9, 2019
5254b29
chore(build): fix maven plugin versions
lburgazzoli Jul 9, 2019
2eed64c
chore(deps): update maven-remote-resources-plugin to v1.6.0
lburgazzoli Jul 9, 2019
db13f4a
chore(build): enable -Xlint:unchecked
lburgazzoli Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions camel-k-runtime-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,15 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<configuration>
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -195,6 +197,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -211,6 +214,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
<useAgent>${gpg.useagent}</useAgent>
Expand Down
2 changes: 2 additions & 0 deletions camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ public final class StepParserSupport {
private StepParserSupport() {
}

@SuppressWarnings("unchecked")
public static <T extends ProcessorDefinition<?>, I> T adaptProcessorToSuper(CamelContext context, I instance) {
ObjectHelper.notNull(context, "camel context");
ObjectHelper.notNull(instance, "instance");

return adaptProcessor(context, (Class<T>)instance.getClass().getSuperclass(), instance);
}

@SuppressWarnings("unchecked")
public static <T extends ProcessorDefinition<?>, I> T adaptProcessor(CamelContext context, Class<T> type, I instance) {
ObjectHelper.notNull(context, "camel context");
ObjectHelper.notNull(type, "type");
Expand Down
4 changes: 3 additions & 1 deletion distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
-->
<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">
<parent>
<artifactId>camel-k-runtime-parent</artifactId>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -33,7 +33,9 @@
<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</id>
Expand Down
58 changes: 34 additions & 24 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
<camel.version>3.0.0-M3</camel.version>
<catalog.version>${camel.version}</catalog.version>
<junit.version>5.5.0</junit.version>
<joor.version>0.9.11</joor.version>
<joor.version>0.9.12</joor.version>
<commons-io.version>2.6</commons-io.version>
<commons-lang.version>3.9</commons-lang.version>
<commons-collections4.version>4.3</commons-collections4.version>
<assertj.version>3.12.2</assertj.version>
<log4j2.version>2.12.0</log4j2.version>
<slf4j.version>1.7.26</slf4j.version>
<groovy.version>2.5.7</groovy.version>
<kotlin.version>1.3.40</kotlin.version>
<kotlin.version>1.3.41</kotlin.version>
<snakeyaml.version>1.24</snakeyaml.version>
<spock.version>1.3-groovy-2.5</spock.version>
<jackson.version>2.9.9</jackson.version>
Expand All @@ -56,14 +56,19 @@
<gmavenplus-plugin.version>1.7.1</gmavenplus-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-remote-resources-plugin.version>1.5</maven-remote-resources-plugin.version>
<maven-remote-resources-plugin.version>1.6.0</maven-remote-resources-plugin.version>
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<mycila-license.version>3.0</mycila-license.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<maven-checkstyle.version>7.6.1</maven-checkstyle.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
</properties>

<developers>
Expand Down Expand Up @@ -103,6 +108,7 @@
<target>1.8</target>
<compilerArgs>
<arg>-Xlint:deprecation</arg>
<arg>-Xlint:unchecked</arg>
</compilerArgs>
</configuration>
</plugin>
Expand Down Expand Up @@ -364,51 +370,55 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
<configuration>
<updateReleaseInfo>true</updateReleaseInfo>
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<additionalOptions>${javadoc.opts}</additionalOptions>
<additionalOptions>${javadoc.opts}</additionalOptions>
</configuration>
</plugin>
<!-- We want to sign the artifact, the POM, and all attached artifacts -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
<useAgent>${gpg.useagent}</useAgent>
<passphrase>${gpg.passphrase}</passphrase>
<useAgent>${gpg.useagent}</useAgent>
</configuration>
<executions>
<execution>
<goals>
<goal>sign</goal>
</goals>
</execution>
<execution>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
Expand Down