You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/01/18 10:08:06 UTC
[incubator-plc4x] branch develop updated (c32afe3 -> 717cdd4)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from c32afe3 - Added a annotation to prevent Mockito unnecessary-stubbing exceptions
new 3b736d7 - Further attempts to get the ScraperTaskTest running on all platforms
new 717cdd4 - Moved the JAR related plugin configuration to the java-module profile to reduce the number of warnings in the build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/plc4x/java/scraper/ScraperTaskTest.java | 3 ++
pom.xml | 57 +++++++++++++---------
2 files changed, 38 insertions(+), 22 deletions(-)
[incubator-plc4x] 02/02: - Moved the JAR related plugin
configuration to the java-module profile to reduce the number of warnings
in the build
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 717cdd45b5db4cbf5a2b4f61c4f19a2930329493
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Jan 18 11:08:03 2019 +0100
- Moved the JAR related plugin configuration to the java-module profile to reduce the number of warnings in the build
---
pom.xml | 57 +++++++++++++++++++++++++++++++++++----------------------
1 file changed, 35 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 158d53f..926be74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -591,28 +591,6 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Plugin for analysing the project based on neo4j queries -->
<plugin>
<groupId>com.buschmais.jqassistant</groupId>
@@ -1003,6 +981,12 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.1.0</version>
@@ -1624,6 +1608,35 @@
</plugin>
<!--
+ Generate an OSGI compatible MANIFEST file.
+ -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--
+ Use the MANIFEST file generated by the maven-bundle-plugin.
+ -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <!--
Make the failsafe execute all integration-tests
-->
<plugin>
[incubator-plc4x] 01/02: - Further attempts to get the
ScraperTaskTest running on all platforms
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 3b736d791787223532687535711a2d3c06ea4c2c
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Jan 18 11:07:25 2019 +0100
- Further attempts to get the ScraperTaskTest running on all platforms
---
.../src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java
index 670a0b7..4184fe5 100644
--- a/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java
+++ b/plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java
@@ -32,6 +32,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import java.util.Collections;
import java.util.concurrent.*;
@@ -41,6 +43,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ScraperTaskTest implements WithAssertions {
@Mock