You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2018/11/24 20:57:49 UTC
[incubator-plc4x] 11/11: [plc4j-scraper] Minor fixes. Added
commons-pool2 versioning.
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 582083523f2ed4540c217b6368c906b52284df76
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Sat Nov 24 21:55:32 2018 +0100
[plc4j-scraper] Minor fixes. Added commons-pool2 versioning.
---
plc4j/utils/connection-pool/pom.xml | 1 -
plc4j/utils/scraper/pom.xml | 34 ++++++++++++++++++----
.../org/apache/plc4x/java/scraper/ScraperTest.java | 6 +---
pom.xml | 6 ++++
4 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/plc4j/utils/connection-pool/pom.xml b/plc4j/utils/connection-pool/pom.xml
index 049d960..a27864c 100644
--- a/plc4j/utils/connection-pool/pom.xml
+++ b/plc4j/utils/connection-pool/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/plc4j/utils/scraper/pom.xml b/plc4j/utils/scraper/pom.xml
index 9956414..f32a624 100644
--- a/plc4j/utils/scraper/pom.xml
+++ b/plc4j/utils/scraper/pom.xml
@@ -43,6 +43,12 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-protocol-driver-base</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-driver-s7</artifactId>
<version>0.3.0-SNAPSHOT</version>
<scope>test</scope>
@@ -54,6 +60,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-protocol-test</artifactId>
<version>0.3.0-SNAPSHOT</version>
@@ -63,16 +74,29 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
- <!--TODO Remove this-->
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <usedDependencies combine.children="append">
+ <usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
+ </usedDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java
index 3dc0a50..ae23245 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java
@@ -116,12 +116,8 @@ class ScraperTest implements WithAssertions {
}
@Test
- void stop_stopsAllJobs() throws PlcConnectionException {
+ void stop_stopsAllJobs() {
PlcDriverManager driverManager = new PlcDriverManager();
- PlcMockConnection connection = (PlcMockConnection) driverManager.getConnection("mock:m1");
- connection.setDevice(mockDevice);
-
- when(mockDevice.read(any())).thenReturn(Pair.of(PlcResponseCode.OK, new DefaultIntegerFieldItem(1)));
Scraper scraper = new Scraper(driverManager, Collections.singletonList(
new Scraper.ScrapeJob("job1",
diff --git a/pom.xml b/pom.xml
index 6fd7439..9310ba6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
<commons-codec.version>1.11</commons-codec.version>
<commons-collections4.version>4.1</commons-collections4.version>
<commons-lang.version>2.6</commons-lang.version>
+ <commons-pool2.version>2.6.0</commons-pool2.version>
<groovy.version>2.5.3</groovy.version>
<gson.version>2.8.0</gson.version>
<hamcrest.version>1.3</hamcrest.version>
@@ -169,6 +170,11 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>${commons-pool2.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>