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/10/25 10:22:08 UTC
[plc4x] branch develop updated: Mixed things I noticed while
validating the release
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/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 0064a3b Mixed things I noticed while validating the release
0064a3b is described below
commit 0064a3bcf85a69295a226da5e2af2cc1968e7858
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Oct 25 12:20:00 2019 +0200
Mixed things I noticed while validating the release
---
README.md | 12 ++++++------
plc4cpp/pom.xml | 8 ++++----
plc4j/integrations/logstash-plugin/pom.xml | 2 +-
plc4j/karaf-features/karaf-itest/pom.xml | 5 +++--
src/main/script/prerequisiteCheck.groovy | 2 --
src/site/asciidoc/developers/release.adoc | 7 +++++++
tools/check_sigs.sh | 2 +-
tools/download_staged_release.sh | 2 +-
8 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 818d6be..b909fde 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ See the PLC4J user guide on the website to start using PLC4X in your Java applic
Currently the project is configured to require the following software:
-1. Java 8 JDK: For running Maven in general as well as compiling the Java and Scala modules `JAVA_HOME configured to
+1. Java 8 JDK: For running Maven in general as well as compiling the Java and Scala modules `JAVA_HOME` configured to
point to that.
2. libpcap/WinPcap for raw socket tests in Java
3. (Optional) Graphwiz: For generating the graphs in the documentation (http://www.graphviz.org/)
@@ -144,8 +144,8 @@ Not quite sure which elements are really needed, better just install all of them
WARNING: If you don't use the installer version of the distribution. The build will probably fail and it will be pretty
impossible to see the problem. When manually executing the command, a popup will appear complaining about not being able
-to find some DLL. So if you are having these problems, please try using the installer instead of the manually unpackable
-archive.
+to find some DLL. So if you are having these problems, please try using the installer instead of manually unpacking
+the archive.
For Bison, please download the Setup installer version from here: http://gnuwin32.sourceforge.net/packages/bison.htm (When using the zip version the bison.exe couldn't find some DLL files)
It seems the official 2.4.1 version has issues when installed in a directory which's path contains spaces. Please make sure you replace the exe with a patched version form here: http://marin.jb.free.fr/bison/bison-2.4.1-modified.zip
@@ -172,8 +172,8 @@ Build PLC4X Java jars and install them in your local maven repository
./mvnw install -P with-java # add -DskipTests to omit running the tests
```
-You can now construct Java applications that use PLC4X. The PLC4X samples
-are a good place to start and are available inside the `examples`
+You can now construct Java applications that use PLC4X. The PLC4X examples
+are a good place to start and are available inside the `plc4j/examples`
directory.
If you want to also build the C++ libraries, this has to be enabled by activating
@@ -195,7 +195,7 @@ However both of these are in a pretty experimental state.
In order to build everything the following command should work:
```
-./mvnw -P with-java,with-cpp,with-dotnet,with-python,with-proxies,with-sandbox install
+./mvnw -P with-boost,with-cpp,with-dotnet,with-java,with-logstash,with-proxies,with-python,with-sandbox install
```
### Installing libpcap/WinPcap
diff --git a/plc4cpp/pom.xml b/plc4cpp/pom.xml
index be2ad5b..bb03207 100644
--- a/plc4cpp/pom.xml
+++ b/plc4cpp/pom.xml
@@ -145,7 +145,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-thrift</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>cpp-${os.classifier}</classifier>
<outputDirectory>${project.build.directory}/lib/thrift</outputDirectory>
@@ -202,7 +202,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-boost</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>lib-${os.classifier}</classifier>
<outputDirectory>${project.build.directory}/lib/boost</outputDirectory>
@@ -211,7 +211,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-proxy</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
@@ -220,7 +220,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-thrift</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>compiler-${os.classifier}</classifier>
<overWrite>true</overWrite>
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index 669ec18..3b95f6b 100644
--- a/plc4j/integrations/logstash-plugin/pom.xml
+++ b/plc4j/integrations/logstash-plugin/pom.xml
@@ -40,7 +40,7 @@
<build>
<plugins>
<!--
- As ruby and gem seem to have problems wirh Maven SNAPSHOT versions,
+ As ruby and gem seem to have problems with Maven SNAPSHOT versions,
calculate how the version would be without the "SNAPSHOT" prefix and
make this available in the property "current-full-version".
-->
diff --git a/plc4j/karaf-features/karaf-itest/pom.xml b/plc4j/karaf-features/karaf-itest/pom.xml
index b3b186d..f2e3895 100644
--- a/plc4j/karaf-features/karaf-itest/pom.xml
+++ b/plc4j/karaf-features/karaf-itest/pom.xml
@@ -18,12 +18,13 @@
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>karaf-features</artifactId>
<groupId>org.apache.plc4x</groupId>
+ <artifactId>karaf-features</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>karaf-itest</artifactId>
diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index 72a1558..97b65aa 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -153,8 +153,6 @@ def checkPython() {
def stdErr = new StringBuilder()
process.consumeProcessOutput(stdOut, stdErr)
process.waitForOrKill(500)
- println "StdOut: " + stdOut
- println "StrErr: " + stdErr
Matcher matcher = extractVersion(stdErr)
if(matcher.size() > 0) {
def curVersion = matcher[0][1]
diff --git a/src/site/asciidoc/developers/release.adoc b/src/site/asciidoc/developers/release.adoc
index d967190..2bde5c0 100644
--- a/src/site/asciidoc/developers/release.adoc
+++ b/src/site/asciidoc/developers/release.adoc
@@ -288,6 +288,13 @@ The directory structure of this directory is as follows:
./{current-full-version}/rc1/apache-plc4x-{current-full-version}-source-release.zip.sha512
----
+You can generally import the stuff, by preparing a directory structure like above locally and then using `svn import` to do the importing:
+
+----
+cd ./{current-full-version}
+svn import rc1 https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1 -m"Staging of rc1 of PLC4X {current-full-version}"
+----
+
The `KEYS` file contains the PGP public key which belongs to the private key used to sign the release artifacts.
If this is your first release be sure to add your key to this file.
diff --git a/tools/check_sigs.sh b/tools/check_sigs.sh
index d385ba3..3cd874c 100755
--- a/tools/check_sigs.sh
+++ b/tools/check_sigs.sh
@@ -43,7 +43,7 @@ function checkFile() {
echo
echo "Checking $FILE..."
- HASH=`shasum -p -a 512 "${FILE}" | awk '{print$1}'`
+ HASH=`shasum -a 512 "${FILE}" | awk '{print$1}'`
CHECK=`cat "${FILE}.sha512"`
if [ "$HASH" != "$CHECK" ]
diff --git a/tools/download_staged_release.sh b/tools/download_staged_release.sh
index 28eec59..4726c2f 100755
--- a/tools/download_staged_release.sh
+++ b/tools/download_staged_release.sh
@@ -114,7 +114,7 @@ fi
mkdir -p ${DST_VER_DIR}
cd ${DST_VER_DIR}
-mywget ${URL}/README
+mywget ${URL}/README.md
mywget ${URL}/RELEASE_NOTES
getSignedBundle ${URL}/apache-plc4x-${VER}-source-release.zip