This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch hamcrest_migration
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit f61c74018a1f2670c57aa50c3fb4ad7045636be6
Author: Sebastian Rühl <sru...@apache.org>
AuthorDate: Fri Feb 16 19:43:42 2018 +0100
manage commons-codec from parent-pom
---
plc4j/protocols/ads/pom.xml | 1 -
pom.xml | 18 +++++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/plc4j/protocols/ads/pom.xml b/plc4j/protocols/ads/pom.xml
index 53dd86a..96a3292 100644
--- a/plc4j/protocols/ads/pom.xml
+++ b/plc4j/protocols/ads/pom.xml
@@ -76,7 +76,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.11</version>
<scope>test</scope>
</dependency>
<!-- Used to create a pcap dump file for wireshark. -->
diff --git a/pom.xml b/pom.xml
index 2ed2681..f745e31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
<sonar.exclusions>**/generated-sources</sonar.exclusions>
<commons-io.version>2.6</commons-io.version>
+ <commons-codec.version>1.11</commons-codec.version>
<commons-lang.version>2.6</commons-lang.version>
<hamcrest.version>1.3</hamcrest.version>
<gson.version>2.8.0</gson.version>
@@ -141,6 +142,11 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
@@ -388,7 +394,8 @@
</goals>
<configuration>
<url>http://netdna.bootstrapcdn.com/bootswatch/2.3.2/flatly/bootstrap.min.css</url>
-
<outputDirectory>${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/2.3.2/css/</outputDirectory>
+
<outputDirectory>${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/2.3.2/css/
+ </outputDirectory>
<outputFileName>bootstrap.min.css</outputFileName>
</configuration>
</execution>
@@ -421,7 +428,8 @@
<outputDirectory>${project.build.directory}/site</outputDirectory>
<resources>
<resource>
-
<directory>${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/2.3.2</directory>
+
<directory>${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/2.3.2
+ </directory>
</resource>
<resource>
<directory>${project.build.directory}/dependency/META-INF/resources/webjars/jquery/1.9.1</directory>
@@ -745,7 +753,7 @@
<artifactId>maven-changelog-plugin</artifactId>
<version>2.3</version>
</plugin>
-
+
<!--
This is a fake plugin which is used to tell m2e (Eclipse) how
to process this maven project.
@@ -767,14 +775,14 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
-
+
</plugins>
</pluginManagement>
</build>
--
To stop receiving notification emails like this one, please contact
sru...@apache.org.
