Skip to content

Commit

Permalink
[#noissue] upgrade maven plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
emeroad committed Aug 13, 2018
1 parent fdb27f7 commit 4cc2714
Show file tree
Hide file tree
Showing 20 changed files with 186 additions and 61 deletions.
4 changes: 2 additions & 2 deletions agent-it/pom.xml
Expand Up @@ -321,15 +321,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${plugin.surefire.verison}</version>
<version>${plugin.surefire.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${plugin.failsafe.verison}</version>
<version>${plugin.failsafe.version}</version>
<configuration>
<jvm>${env.JAVA_8_HOME}/bin/java</jvm>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion agent/pom.xml
Expand Up @@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<version>${plugin.assembly.version}</version>
<configuration>
<descriptors>
<descriptor>src/assembly/distribution.xml</descriptor>
Expand Down
2 changes: 1 addition & 1 deletion agent/src/assembly/distribution.xml
Expand Up @@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>${basedir}/src/main/resources-${env}</directory>
<outputDirectory></outputDirectory>
<outputDirectory>./</outputDirectory>
</fileSet>
</fileSets>

Expand Down
8 changes: 4 additions & 4 deletions bootstrap-java9/pom.xml
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.openclover</groupId>
<artifactId>clover</artifactId>
<version>4.2.1</version>
<version>${plugin.clover.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -124,7 +124,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.16</version>
<version>${plugin.animal-sniffer.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand All @@ -133,7 +133,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.21.0</version>
<version>${plugin.surefire.version}</version>
<configuration>
<excludes>
<exclude>**/Mock*</exclude>
Expand All @@ -159,7 +159,7 @@
<!-- http://openclover.org/ -->
<!-- https://bitbucket.org/openclover/clover/issues/61/430-support-java-9 -->
<!-- 4.3 will support java9 -->
<version>4.2.1</version>
<version>${plugin.clover.version}</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down
7 changes: 3 additions & 4 deletions flink/pom.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017 NAVER Corp.
~ Copyright 2018 NAVER Corp.
~
~ Licensed 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
~ 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,
Expand Down Expand Up @@ -176,7 +176,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
Expand All @@ -192,7 +191,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<version>${plugin.shade.version}</version>
<executions>
<execution>
<id>build-first</id>
Expand Down
2 changes: 1 addition & 1 deletion plugins/jboss/pom.xml
Expand Up @@ -83,7 +83,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<version>${plugin.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
2 changes: 1 addition & 1 deletion plugins/jetty/pom.xml
Expand Up @@ -87,7 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<version>${plugin.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
2 changes: 1 addition & 1 deletion plugins/resin/pom.xml
Expand Up @@ -89,7 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<version>${plugin.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
2 changes: 1 addition & 1 deletion plugins/tomcat/pom.xml
Expand Up @@ -108,7 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<version>${plugin.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
18 changes: 17 additions & 1 deletion plugins/undertow/pom.xml
@@ -1,3 +1,19 @@
<!--
~ Copyright 2018 NAVER Corp.
~
~ Licensed 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.
-->

<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -62,7 +78,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<version>${plugin.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
2 changes: 1 addition & 1 deletion plugins/weblogic/pom.xml
Expand Up @@ -81,7 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<version>${plugin.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
18 changes: 17 additions & 1 deletion plugins/websphere/pom.xml
@@ -1,3 +1,19 @@
<!--
~ Copyright 2018 NAVER Corp.
~
~ Licensed 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.
-->

<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -62,7 +78,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<version>${plugin.shade.version}</version>
<executions>
<execution>
<phase>package</phase>
Expand Down

0 comments on commit 4cc2714

Please sign in to comment.