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 2018/02/28 10:30:46 UTC
[incubator-plc4x] branch master updated (1f6ef99 -> 3c718d9)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 1f6ef99 Reactivated the separate deploy step and disabled the tests (Eventually Maven should skip recompiling as it is already compiled ... will have to check this)
new 3d3a756 Added some JavaDocs to stop the javadoc generation from complaining
new 3c718d9 Removed fontawesome 4.7 dependency as it seems we don't need it.
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/PlcDriverManagerTest.java | 17 +++++++++++++---
pom.xml | 23 ----------------------
src/site/site.xml | 1 -
3 files changed, 14 insertions(+), 27 deletions(-)
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.
[incubator-plc4x] 01/02: Added some JavaDocs to stop the javadoc
generation from complaining
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 3d3a7565e3eab7df540f6a3e5e53413e2a11de19
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Feb 28 11:27:25 2018 +0100
Added some JavaDocs to stop the javadoc generation from complaining
---
.../org/apache/plc4x/java/PlcDriverManagerTest.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/plc4j/core/src/test/java/org/apache/plc4x/java/PlcDriverManagerTest.java b/plc4j/core/src/test/java/org/apache/plc4x/java/PlcDriverManagerTest.java
index 7897b76..5897b91 100644
--- a/plc4j/core/src/test/java/org/apache/plc4x/java/PlcDriverManagerTest.java
+++ b/plc4j/core/src/test/java/org/apache/plc4x/java/PlcDriverManagerTest.java
@@ -41,6 +41,8 @@ public class PlcDriverManagerTest {
/**
* Tries to get the mock plc driver which is part of this testsuite.
+ *
+ * @throws PlcException something went wrong
*/
@Test
@Category(FastTests.class)
@@ -53,6 +55,8 @@ public class PlcDriverManagerTest {
/**
* Tries to get the mock plc driver with authentication which is part of this testsuite.
+ *
+ * @throws PlcException something went wrong
*/
@Test
@Category(FastTests.class)
@@ -68,7 +72,9 @@ public class PlcDriverManagerTest {
}
/**
- * In this test case a driver is requested which is not registered with the {@link PlcDriverManager}.
+ * In this test case a driver is requested which is not registered with the PlcDriverManager.
+ *
+ * @throws PlcConnectionException something went wrong
*/
@Test(expected = PlcConnectionException.class)
@Category(FastTests.class)
@@ -77,7 +83,9 @@ public class PlcDriverManagerTest {
}
/**
- * In this test case a driver is requested which is not registered with the {@link PlcDriverManager}.
+ * In this test case a driver is requested which is not registered with the PlcDriverManager.
+ *
+ * @throws PlcConnectionException something went wrong
*/
@Test(expected = PlcConnectionException.class)
@Category(FastTests.class)
@@ -86,9 +94,12 @@ public class PlcDriverManagerTest {
}
/**
- * In this test the {@link PlcDriverManager} will be configured with a service list that
+ * In this test the PlcDriverManager will be configured with a service list that
* contains multiple implementation instances of the same protocol. This should result in
* an error.
+ *
+ * @throws MalformedURLException something went wrong
+ * @throws PlcConnectionException something went wrong
*/
@Test(expected = IllegalStateException.class)
@Category(FastTests.class)
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.
[incubator-plc4x] 02/02: Removed fontawesome 4.7 dependency as it
seems we don't need it.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 3c718d9e6609cc21c35a847bf3e940c233383d73
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Feb 28 11:30:43 2018 +0100
Removed fontawesome 4.7 dependency as it seems we don't need it.
---
pom.xml | 23 -----------------------
src/site/site.xml | 1 -
2 files changed, 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index cdd1263..5294d66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,18 +418,6 @@
<outputFileName>bootstrap.min.css</outputFileName>
</configuration>
</execution>
- <execution>
- <id>get-fontawesome</id>
- <phase>pre-site</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>http://fontawesome.io/assets/font-awesome-4.7.0.zip</url>
- <outputDirectory>${project.build.directory}/dependency</outputDirectory>
- <unpack>true</unpack>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -454,17 +442,6 @@
<directory>${project.build.directory}/dependency/META-INF/resources/webjars/jquery/1.9.1</directory>
<targetPath>${project.build.directory}/site/js</targetPath>
</resource>
- <resource>
- <directory>${project.build.directory}/dependency/font-awesome-4.7.0/css</directory>
- <includes>
- <include>font-awesome.min.css</include>
- </includes>
- <targetPath>${project.build.directory}/site/css</targetPath>
- </resource>
- <resource>
- <directory>${project.build.directory}/dependency/font-awesome-4.7.0/fonts</directory>
- <targetPath>${project.build.directory}/site/fonts</targetPath>
- </resource>
</resources>
</configuration>
</execution>
diff --git a/src/site/site.xml b/src/site/site.xml
index e80bcfa..99f2a47 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -86,7 +86,6 @@
<body>
<head>
- <link rel="stylesheet" href="$resourcePath/css/font-awesome.min.css"/>
</head>
<menu ref="parent" inherit="top"/>
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.