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/05/20 21:35:33 UTC
[plc4x] branch develop updated: Fixed some issues with the build
that surfaced during the last release attempt.
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 52833f7 Fixed some issues with the build that surfaced during the last release attempt.
52833f7 is described below
commit 52833f74f0d1f32eb769726570d3a4ee1e090488
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon May 20 23:35:23 2019 +0200
Fixed some issues with the build that surfaced during the last release attempt.
---
plc4j/drivers/delta-v/pom.xml | 37 ----------------------
plc4j/examples/hello-connectivity-kafka/pom.xml | 2 +-
plc4j/examples/hello-integration-edgent/pom.xml | 2 +-
plc4j/examples/hello-storage-elasticsearch/pom.xml | 2 +-
.../apache-karaf/karaf-demo-server/pom.xml | 10 +++---
plc4j/utils/interop/pom.xml | 2 --
plc4net/pom.xml | 2 +-
plc4py/pom.xml | 3 --
src/site/asciidoc/developers/release.adoc | 10 +++---
9 files changed, 14 insertions(+), 56 deletions(-)
diff --git a/plc4j/drivers/delta-v/pom.xml b/plc4j/drivers/delta-v/pom.xml
deleted file mode 100644
index c04e7c3..0000000
--- a/plc4j/drivers/delta-v/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<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>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-drivers</artifactId>
- <version>0.4.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>plc4j-driver-delta-v</artifactId>
- <name>PLC4J: Driver: DeltaV</name>
- <description>Implementation of a PLC4X driver able to speak with devices using the DeltaV protocol.</description>
-
- <dependencies>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-connectivity-kafka/pom.xml b/plc4j/examples/hello-connectivity-kafka/pom.xml
index c035912..e7b6b91 100644
--- a/plc4j/examples/hello-connectivity-kafka/pom.xml
+++ b/plc4j/examples/hello-connectivity-kafka/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>apache-edgent</artifactId>
+ <artifactId>plc4j-apache-edgent</artifactId>
<version>0.4.0-SNAPSHOT</version>
</dependency>
diff --git a/plc4j/examples/hello-integration-edgent/pom.xml b/plc4j/examples/hello-integration-edgent/pom.xml
index 079362c..68843a0 100644
--- a/plc4j/examples/hello-integration-edgent/pom.xml
+++ b/plc4j/examples/hello-integration-edgent/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>apache-edgent</artifactId>
+ <artifactId>plc4j-apache-edgent</artifactId>
<version>0.4.0-SNAPSHOT</version>
</dependency>
diff --git a/plc4j/examples/hello-storage-elasticsearch/pom.xml b/plc4j/examples/hello-storage-elasticsearch/pom.xml
index 3b099dc..6bf5449 100644
--- a/plc4j/examples/hello-storage-elasticsearch/pom.xml
+++ b/plc4j/examples/hello-storage-elasticsearch/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>apache-edgent</artifactId>
+ <artifactId>plc4j-apache-edgent</artifactId>
<version>0.4.0-SNAPSHOT</version>
</dependency>
diff --git a/plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml b/plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml
index d6e3d31..cb69d8c 100644
--- a/plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml
+++ b/plc4j/integrations/apache-karaf/karaf-demo-server/pom.xml
@@ -50,35 +50,35 @@
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-ads-feature</artifactId>
+ <artifactId>plc4j-karaf-ads-feature</artifactId>
<version>0.4.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-ethernet-ip-feature</artifactId>
+ <artifactId>plc4j-karaf-ethernet-ip-feature</artifactId>
<version>0.4.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-modbus-feature</artifactId>
+ <artifactId>plc4j-karaf-modbus-feature</artifactId>
<version>0.4.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-s7-feature</artifactId>
+ <artifactId>plc4j-karaf-s7-feature</artifactId>
<version>0.4.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>karaf-simulated-feature</artifactId>
+ <artifactId>plc4j-karaf-simulated-feature</artifactId>
<version>0.4.0-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
diff --git a/plc4j/utils/interop/pom.xml b/plc4j/utils/interop/pom.xml
index 213f072..95cc26d 100644
--- a/plc4j/utils/interop/pom.xml
+++ b/plc4j/utils/interop/pom.xml
@@ -49,7 +49,6 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-proxy</artifactId>
- <version>0.4.0-SNAPSHOT</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
@@ -57,7 +56,6 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-thrift</artifactId>
- <version>0.4.0-SNAPSHOT</version>
<type>zip</type>
<classifier>compiler-${os.classifier}</classifier>
<overWrite>true</overWrite>
diff --git a/plc4net/pom.xml b/plc4net/pom.xml
index 2b0123f..c5e4b40 100644
--- a/plc4net/pom.xml
+++ b/plc4net/pom.xml
@@ -40,7 +40,7 @@
<modules>
<module>api</module>
- <!--module>plc4net.driver</module-->
+ <module>plc4net.driver</module>
</modules>
</project>
\ No newline at end of file
diff --git a/plc4py/pom.xml b/plc4py/pom.xml
index 661acc7..01fe970 100644
--- a/plc4py/pom.xml
+++ b/plc4py/pom.xml
@@ -58,7 +58,6 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-proxy</artifactId>
- <version>0.4.0-SNAPSHOT</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
@@ -66,7 +65,6 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-thrift</artifactId>
- <version>0.4.0-SNAPSHOT</version>
<type>zip</type>
<classifier>compiler-${os.classifier}</classifier>
<overWrite>true</overWrite>
@@ -87,7 +85,6 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>interop-server</artifactId>
- <version>0.4.0-SNAPSHOT</version>
<type>jar</type>
<classifier>jar-with-dependencies</classifier>
<overWrite>true</overWrite>
diff --git a/src/site/asciidoc/developers/release.adoc b/src/site/asciidoc/developers/release.adoc
index 3a19639..854eacf 100644
--- a/src/site/asciidoc/developers/release.adoc
+++ b/src/site/asciidoc/developers/release.adoc
@@ -102,22 +102,22 @@ This is the version the `develop` branch will be changed to.
The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
Otherwise we would have to define the working copy version for each module.
- mvn release:branch -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
+ mvn release:branch -Pwith-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
-So in case of preparing the release branch for `0.2.0-SNAPSHOT` the command would be the following:
+So in case of preparing the release branch for `0.4.0-SNAPSHOT` the command would be the following:
- mvn release:branch -DbranchName=rel/0.2 -DautoVersionSubmodules=true
+ mvn release:branch -Pwith-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox -DbranchName=rel/0.4 -DautoVersionSubmodules=true
The plugin will then aks for the version:
- What is the new working copy version for "PLC4X"? (org.apache.plc4x:plc4x-parent) 0.2.1-SNAPSHOT: : 0.3.0-SNAPSHOT
+ What is the new working copy version for "PLC4X"? (org.apache.plc4x:plc4x-parent) 0.4.1-SNAPSHOT: : 0.5.0-SNAPSHOT
Where the suggested default is manually overridden.
This step now should perform quite quickly as no build and no tests are involved.
-However in the end the versions of the `develop` branch are updated and a new `rel/0.2` branch is created.
+However in the end the versions of the `develop` branch are updated and a new `rel/0.4` branch is created.
=== Preparing `develop` for the next iteration