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/04/23 08:32:18 UTC
[plc4x] branch develop updated (e5ca759 -> 74bfe18)
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/plc4x.git.
from e5ca759 Merge pull request #59 from apache/feature/alternate-PLC4X-108
new f617792 - Finished the graduation-tasks after the git repos were renamed
new c4d7c22 - Try suppressing the false positive "commit to master" emails.
new 74bfe18 - Finalized the committee and project RDP files.
The 3 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:
Jenkinsfile | 16 ++++++++++------
README | 1 -
jenkins.pom | 2 +-
pom.xml | 8 ++++----
src/site/asciidoc/developers/ci.adoc | 2 +-
src/site/asciidoc/developers/contributing.adoc | 14 +++++++-------
src/site/asciidoc/users/download.adoc | 10 +++++-----
src/site/resources/plc4x-doap.rdf | 16 +++++++++++++---
src/site/resources/plc4x-pmc.rdf | 7 +++++++
tools/common.sh | 10 +++++-----
tools/download_staged_release.sh | 4 ++--
11 files changed, 55 insertions(+), 35 deletions(-)
[plc4x] 03/03: - Finalized the committee and project RDP files.
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/plc4x.git
commit 74bfe181344322f17f91d4ec398a851618966a5e
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Apr 23 10:25:00 2019 +0200
- Finalized the committee and project RDP files.
---
src/site/resources/plc4x-doap.rdf | 16 +++++++++++++---
src/site/resources/plc4x-pmc.rdf | 7 +++++++
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/site/resources/plc4x-doap.rdf b/src/site/resources/plc4x-doap.rdf
index 47d3cd2..3283d13 100644
--- a/src/site/resources/plc4x-doap.rdf
+++ b/src/site/resources/plc4x-doap.rdf
@@ -16,6 +16,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+
+ This file contains information about the project itself.
+ It should be updated as soon as a new language is supported.
+ It also contains the information needed to populate the project
+ categories and languages referenced on the Apache project listing
+ page. It is referenced from here:
+ https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/projects.xml
+
+-->
<rdf:RDF xml:lang="en"
xmlns="http://usefulinc.com/ns/doap#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -31,7 +41,7 @@
=======================================================================
-->
- <Project rdf:about="https://plc4x.rdf.apache.org/">
+ <Project rdf:about="https://plc4x.apache.org">
<name>Apache PLC4X</name>
<created>2019-04-18</created>
<license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0"/>
@@ -68,7 +78,7 @@
<release>
<Version>
- <name>Latest Legacy 0.3.1 release</name>
+ <name>Latest 0.3.1 release</name>
<created>2017-03-13</created>
<revision>0.3.1</revision>
</Version>
@@ -95,4 +105,4 @@
</Version>
</release>
</Project>
-</rdf:RDF>
+</rdf:RDF>
\ No newline at end of file
diff --git a/src/site/resources/plc4x-pmc.rdf b/src/site/resources/plc4x-pmc.rdf
index 19b6bb6..ff18ef1 100644
--- a/src/site/resources/plc4x-pmc.rdf
+++ b/src/site/resources/plc4x-pmc.rdf
@@ -15,6 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+
+ This file contains information about the committee/PMC of the project.
+ It should be updated as soon as the PMC or the chair of the project changes.
+ It is referenced from https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/committees.xml
+
+-->
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
[plc4x] 02/03: - Try suppressing the false positive "commit to
master" emails.
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/plc4x.git
commit c4d7c22f2a1faf7d3b080fe6f908aadc58a23394
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Apr 23 09:29:08 2019 +0200
- Try suppressing the false positive "commit to master" emails.
---
Jenkinsfile | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e1ecf6c..e496da6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -280,16 +280,20 @@ Is back to normal.
always {
script {
if(env.BRANCH_NAME == "master") {
- emailext(
- subject: "[COMMIT-TO-MASTER]: A commit to the master branch was made'",
- body: """
+ // Double check if something was really changed as sometimes the
+ // build just runs without any changes.
+ if(currentBuild.changeSets.size() > 0) {
+ emailext(
+ subject: "[COMMIT-TO-MASTER]: A commit to the master branch was made'",
+ body: """
COMMIT-TO-MASTER: A commit to the master branch was made:
Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>"
""",
- to: "dev@plc4x.apache.org",
- recipientProviders: [[$class: 'DevelopersRecipientProvider']]
- )
+ to: "dev@plc4x.apache.org",
+ recipientProviders: [[$class: 'DevelopersRecipientProvider']]
+ )
+ }
}
}
}
[plc4x] 01/03: - Finished the graduation-tasks after the git repos
were renamed
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/plc4x.git
commit f61779291896932db41db18bba8a49a9a50df035
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Apr 23 07:27:24 2019 +0200
- Finished the graduation-tasks after the git repos were renamed
---
README | 1 -
jenkins.pom | 2 +-
pom.xml | 8 ++++----
src/site/asciidoc/developers/ci.adoc | 2 +-
src/site/asciidoc/developers/contributing.adoc | 14 +++++++-------
src/site/asciidoc/users/download.adoc | 10 +++++-----
tools/common.sh | 10 +++++-----
tools/download_staged_release.sh | 4 ++--
8 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/README b/README
index 6cbbcca..cf52f45 100644
--- a/README
+++ b/README
@@ -85,4 +85,3 @@ Licensing
---------
Apache PLC4X is released under the Apache License Version 2.0.
-
diff --git a/jenkins.pom b/jenkins.pom
index d376990..8fd4a3e 100644
--- a/jenkins.pom
+++ b/jenkins.pom
@@ -40,7 +40,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:git:https://gitbox.apache.org/repos/asf/incubator-plc4x-website.git</url>
+ <url>scm:git:https://gitbox.apache.org/repos/asf/plc4x-website.git</url>
</site>
</distributionManagement>
diff --git a/pom.xml b/pom.xml
index d897f32..c2341be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,9 @@
<inceptionYear>2017</inceptionYear>
<scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/incubator-plc4x.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/incubator-plc4x.git</developerConnection>
- <url>https://github.com/apache/incubator-plc4x</url>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/plc4x.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/plc4x.git</developerConnection>
+ <url>https://github.com/apache/plc4x</url>
<tag>HEAD</tag>
</scm>
@@ -52,7 +52,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:git:https://gitbox.apache.org/repos/asf/incubator-plc4x-website.git</url>
+ <url>scm:git:https://gitbox.apache.org/repos/asf/plc4x-website.git</url>
</site>
</distributionManagement>
diff --git a/src/site/asciidoc/developers/ci.adoc b/src/site/asciidoc/developers/ci.adoc
index a811fe2..3e601cf 100644
--- a/src/site/asciidoc/developers/ci.adoc
+++ b/src/site/asciidoc/developers/ci.adoc
@@ -21,7 +21,7 @@
We are currently using two different CI systems.
- Apache's Jenkins at: https://builds.apache.org/view/M-R/job/PLC4X/
-- Travis at: https://travis-ci.org/apache/incubator-plc4x/
+- Travis at: https://travis-ci.org/apache/plc4x/
Hereby Apache Jenkins clearly is responsible for running the full testsuite with all integration-tests.
Also only jobs on Apache Jenkins are allowed to publish SNAPSHOT versions of the Maven artifacts to Apaches Nexus.
diff --git a/src/site/asciidoc/developers/contributing.adoc b/src/site/asciidoc/developers/contributing.adoc
index a49beb9..94ff18b 100644
--- a/src/site/asciidoc/developers/contributing.adoc
+++ b/src/site/asciidoc/developers/contributing.adoc
@@ -38,7 +38,7 @@ The simplest way to submit code changes, is via a GitHub pull-request.
In order to do this first create a GitHub account and sign into you account.
-After that's done, please to to our https://github.com/apache/incubator-plc4x[GitHub site] and create a so-called `Fork`.
+After that's done, please to to our https://github.com/apache/plc4x[GitHub site] and create a so-called `Fork`.
image::contributing-github-fork.png[]
@@ -46,7 +46,7 @@ What happens now, is that GitHub creates a full copy of the PLC4X repo in your a
Now ideally you check-out your cloned repository:
- git clone https://github.com/{your-user-id}/incubator-plc4x.git
+ git clone https://github.com/{your-user-id}/plc4x.git
Now you have a copy of PLC4X on your computer and you can change whatever you want and as it's your copy, you can even commit these changes without any danger of breaking things.
@@ -72,7 +72,7 @@ Usually you will call the second remote `upstream` but in general you can call i
Add the remote on the commandline (or your git gui of choice):
- git remote add upstream https://github.com/apache/incubator-plc4x.git
+ git remote add upstream https://github.com/apache/plc4x.git
If you list all your remotes, with the following command:
@@ -80,10 +80,10 @@ If you list all your remotes, with the following command:
It should output something like this:
- origin https://github.com/{your-user-id}/incubator-plc4x.git (fetch)
- origin https://github.com/{your-user-id}/incubator-plc4x.git (push)
- upstream https://github.com/apache/incubator-plc4x.git (fetch)
- upstream https://github.com/apache/incubator-plc4x.git (push)
+ origin https://github.com/{your-user-id}/plc4x.git (fetch)
+ origin https://github.com/{your-user-id}/plc4x.git (push)
+ upstream https://github.com/apache/plc4x.git (fetch)
+ upstream https://github.com/apache/plc4x.git (push)
If that's so, you're fine to continue, if not ... well you could ask for assistance on our dev-list.
diff --git a/src/site/asciidoc/users/download.adoc b/src/site/asciidoc/users/download.adoc
index bbf28c6..f7a4849 100644
--- a/src/site/asciidoc/users/download.adoc
+++ b/src/site/asciidoc/users/download.adoc
@@ -17,12 +17,12 @@
== Download
-Be sure to verify your downloads by these https://www.apache.org/info/verification[procedures] using these https://www.apache.org/dist/incubator/plc4x/KEYS[KEYS] for any Apache release.
+Be sure to verify your downloads by these https://www.apache.org/info/verification[procedures] using these https://www.apache.org/dist/plc4x/KEYS[KEYS] for any Apache release.
=== Current Releases
[#release-0.3.1]
-==== 0.3.1 Official https://www.apache.org/dyn/closer.lua/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip[source release] [ https://www.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip.sha512[SHA512] ] [ https://www.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip.asc[ASC] ]
+==== 0.3.1 (incubating) Official https://www.apache.org/dyn/closer.lua/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip[source release] [ https://www.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip.sha512[SHA512] ] [ https://www.apache.org/dist/incubator/plc4x/0.3.1-incubating/apache-plc4x-incubating-0.3.1-source-release.zip.asc[ASC] ]
===== New Features
@@ -42,7 +42,7 @@ Be sure to verify your downloads by these https://www.apache.org/info/verificati
=== Previous Releases
[#release-0.3.0]
-==== 0.3.0 Official http://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip[source release] [ http://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip.sha512[SHA512] ] [ http://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip.asc[ASC] ]
+==== 0.3.0 (incubating) Official http://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip[source release] [ http://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip.sha512[SHA512] ] [ http://archive.apache.org/dist/incubator/plc4x/0.3.0-incubating/apache-plc4x-incubating-0.3.0-source-release.zip.asc[ASC] ]
===== New Features
@@ -71,7 +71,7 @@ Be sure to verify your downloads by these https://www.apache.org/info/verificati
- Fixed a Bug where S7 was not able to read arrays.
[#release-0.2.0]
-==== 0.2.0 Official http://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip[source release] [ http://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip.sha512[SHA512] ] [ http://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip.asc[ASC] ]
+==== 0.2.0 (incubating) Official http://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip[source release] [ http://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip.sha512[SHA512] ] [ http://archive.apache.org/dist/incubator/plc4x/0.2.0-incubating/apache-plc4x-incubating-0.2.0-source-release.zip.asc[ASC] ]
===== Changes:
@@ -81,7 +81,7 @@ Be sure to verify your downloads by these https://www.apache.org/info/verificati
* Bug fixes
[#release-0.1.0]
-==== 0.1.0 Official http://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip[source release] [ http://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip.sha512[SHA512] ] [ https://www.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip.asc[ASC] ]
+==== 0.1.0 (incubating) Official http://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip[source release] [ http://archive.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip.sha512[SHA512] ] [ https://www.apache.org/dist/incubator/plc4x/0.1.0-incubating/apache-plc4x-incubating-0.1.0-source-release.zip.asc[ASC] ]
// Disabled as this is the first release ...
//https://github.com/apache/incubator-plc4x/tree/rel/0.1.0/CHANGELOG.md[CHANGELOG]
\ No newline at end of file
diff --git a/tools/common.sh b/tools/common.sh
index 5994911..e748e1c 100755
--- a/tools/common.sh
+++ b/tools/common.sh
@@ -25,11 +25,11 @@ PLC4X_ROOT_DIR=.
# BUNDLE_DIR is results of maven release:perform's creation of release candidate
BUNDLE_DIR=${PLC4X_ROOT_DIR}/target/checkout/target
-PLC4X_ASF_GIT_URL=https://git-wip-us.apache.org/repos/asf/incubator-plc4x.git
-PLC4X_ASF_DIST_URL=https://www.apache.org/dist/incubator/plc4x
-PLC4X_ASF_DIST_DYN_URL=https://www.apache.org/dyn/closer.cgi/incubator/plc4x
-PLC4X_ASF_SVN_RELEASE_URL=https://dist.apache.org/repos/dist/release/incubator/plc4x
-PLC4X_ASF_SVN_RC_URL=https://dist.apache.org/repos/dist/dev/incubator/plc4x
+PLC4X_ASF_GIT_URL=https://git-wip-us.apache.org/repos/asf/plc4x.git
+PLC4X_ASF_DIST_URL=https://www.apache.org/dist/plc4x
+PLC4X_ASF_DIST_DYN_URL=https://www.apache.org/dyn/closer.cgi/plc4x
+PLC4X_ASF_SVN_RELEASE_URL=https://dist.apache.org/repos/dist/release/plc4x
+PLC4X_ASF_SVN_RC_URL=https://dist.apache.org/repos/dist/dev/plc4x
USAGE=
diff --git a/tools/download_staged_release.sh b/tools/download_staged_release.sh
index 0889387..25f0490 100755
--- a/tools/download_staged_release.sh
+++ b/tools/download_staged_release.sh
@@ -23,8 +23,8 @@ set -e
# Download the collection of files associated with an Apache PLC4X
# Release or Release Candidate from the Apache Distribution area:
-# https://dist.apache.org/repos/dist/release/incubator/plc4x
-# or https://dist.apache.org/repos/dist/dev/incubator/plc4x
+# https://dist.apache.org/repos/dist/release/plc4x
+# or https://dist.apache.org/repos/dist/dev/plc4x
# respectively.
#
# Prompts before taking actions unless "--nquery"