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


The following commit(s) were added to refs/heads/master by this push:
     new b482930  PLC4X-60 - Fix findings by the last release
b482930 is described below

commit b48293074c14c5ff9acf12544347494bc77ed057
Author: Christofer Dutz <christofer.d...@c-ware.de>
AuthorDate: Wed Sep 26 16:03:15 2018 -0400

    PLC4X-60 - Fix findings by the last release
    
    - Handled appending things to the NOTICE and LICENSE files as required.
    - Added a Downloads page
---
 .../remote-resources/META-INF/{NOTICE => LICENSE}  |  0
 .../remote-resources/META-INF/{NOTICE => LICENSE}  |  1 +
 .../src/remote-resources/META-INF/NOTICE           | 11 +++-----
 src/site/asciidoc/users/download.adoc              | 30 ++++++++++++++++++++++
 src/site/site.xml                                  |  1 +
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/examples/google/src/remote-resources/META-INF/NOTICE 
b/examples/google/src/remote-resources/META-INF/LICENSE
similarity index 100%
rename from examples/google/src/remote-resources/META-INF/NOTICE
rename to examples/google/src/remote-resources/META-INF/LICENSE
diff --git a/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE 
b/plc4j/utils/raw-sockets/src/remote-resources/META-INF/LICENSE
similarity index 93%
copy from plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
copy to plc4j/utils/raw-sockets/src/remote-resources/META-INF/LICENSE
index ae40e6e..9d9d033 100644
--- a/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
+++ b/plc4j/utils/raw-sockets/src/remote-resources/META-INF/LICENSE
@@ -1,4 +1,5 @@
 ===============================================================
+
 The Files:
 src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketListener.java
 src/main/java/org/apache/plc4x/java/utils/rawsockets/RawIpSocket.java
diff --git a/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE 
b/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
index ae40e6e..ccad4c4 100644
--- a/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
+++ b/plc4j/utils/raw-sockets/src/remote-resources/META-INF/NOTICE
@@ -1,7 +1,4 @@
-===============================================================
-The Files:
-src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketListener.java
-src/main/java/org/apache/plc4x/java/utils/rawsockets/RawIpSocket.java
-src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketException.java
-src/main/java/org/apache/plc4x/java/utils/rawsockets/RawSocketListener.java
-Are copyrighted by the The Netty Project which is distributed under the Apache 
2.0 license.
\ No newline at end of file
+----------------------------------------------
+
+This product includes software developed at
+The Netty project (https://netty.io/).
diff --git a/src/site/asciidoc/users/download.adoc 
b/src/site/asciidoc/users/download.adoc
new file mode 100644
index 0000000..c48b443
--- /dev/null
+++ b/src/site/asciidoc/users/download.adoc
@@ -0,0 +1,30 @@
+//
+//  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.
+//
+
+== 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.
+
+=== Current Releases
+
+The first release still has to be performed.
+
+// Template for a release:
+//0.1.0
+//Official 
https://www.apache.org/dyn/closer.lua/incubator/plc4x/apache-plc4x-incubating-0.1.0/apache-plc4x-incubating-sources-0.1.0.zip[source
 release] [ 
https://www.apache.org/dist/incubator/plc4x/apache-plc4x-incubating-0.1.0/apache-plc4x-incubating-sources-0.1.0.zip.sha512[SHA512]
 ] [ 
https://www.apache.org/dist/incubator/plc4x/apache-plc4x-incubating-0.1.0/apache-plc4x-incubating-sources-0.1.0.zip.asc[ASC]
 ]
+//
+//https://github.com/apache/incubator-plc4x/blob/release-0.1.0/CHANGELOG.md[CHANGELOG]
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index 3bae883..cff7a60 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -100,6 +100,7 @@
       <item name="Conferences &amp; Meetups" 
href="community/conferences.html"/>
     </menu>
     <menu name="Users">
+      <item name="Download" href="users/download.html"/>
       <item name="Getting Started" href="users/gettingstarted.html"/>
       <item name="Industry 4.0 with Apache" href="users/industry40.html"/>
       <item name="Security" href="users/security.html"/>

Reply via email to