Skip to content

Commit

Permalink
add disclaimer (#19)
Browse files Browse the repository at this point in the history
* add disclaimer

* update notice

* upgrade github workflow
  • Loading branch information
pjfanning committed Feb 27, 2023
1 parent ae0f3df commit 91a1946
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 47 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
jobs:
copy-identical-files:
name: Verify identical files are correct
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Checkout GitHub merge
if: github.event.pull_request
Expand All @@ -25,10 +25,10 @@ jobs:
java-compile-and-test-part1:
name: Compile and Test Part 1 (Java)
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Checkout GitHub merge
if: github.event.pull_request
Expand All @@ -37,9 +37,9 @@ jobs:
git checkout scratch
- name: Set up JDK 11
uses: olafurpg/setup-scala@v10
uses: olafurpg/setup-scala@v13
with:
java-version: adopt@1.11.0-9
java-version: adopt@1.11

- uses: actions/cache@v2.1.3
with:
Expand Down Expand Up @@ -79,10 +79,10 @@ jobs:

java-compile-and-test-part2:
name: Compile and Test Part 2 (Java)
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Checkout GitHub merge
if: github.event.pull_request
Expand All @@ -93,7 +93,7 @@ jobs:
- name: Set up JDK 11
uses: olafurpg/setup-scala@v10
with:
java-version: adopt@1.11.0-9
java-version: adopt@1.11

- uses: actions/cache@v2.1.3
with:
Expand All @@ -109,10 +109,10 @@ jobs:

scala-compile-and-test-part1:
name: Compile and Test Part 1 (Scala)
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Checkout GitHub merge
if: github.event.pull_request
Expand All @@ -123,7 +123,7 @@ jobs:
- name: Set up JDK 11
uses: olafurpg/setup-scala@v10
with:
java-version: adopt@1.11.0-9
java-version: adopt@1.11

- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
Expand Down Expand Up @@ -160,10 +160,10 @@ jobs:

scala-compile-and-test-part2:
name: Compile and Test Part 2 (Scala)
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Checkout GitHub merge
if: github.event.pull_request
Expand All @@ -174,7 +174,7 @@ jobs:
- name: Set up JDK 11
uses: olafurpg/setup-scala@v10
with:
java-version: adopt@1.11.0-9
java-version: adopt@1.11

- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-wip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: main

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/link-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:

jobs:
validate-links:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# See https://github.com/actions/checkout/issues/299#issuecomment-677674415
ref: ${{ github.event.pull_request.head.sha }}
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Set up JDK 11
uses: olafurpg/setup-scala@v10
with:
java-version: adopt@1.11.0-9
java-version: adopt@1.11

- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/validate-telemetry-sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ env:

jobs:
validate-java-sample:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up JDK 11
uses: olafurpg/setup-scala@v10
with:
java-version: adopt@1.11.0-9
java-version: adopt@1.11

- uses: actions/cache@v2.1.3
with:
Expand All @@ -30,15 +30,15 @@ jobs:
run: scripts/mvn-test.sh ./docs-source/docs/modules/telemetry/examples/telemetry-sample

validate-scala-sample:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up JDK 11
uses: olafurpg/setup-scala@v10
with:
java-version: adopt@1.11.0-9
java-version: adopt@1.11

- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
Expand Down
1 change: 0 additions & 1 deletion .travis/known_hosts

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Welcome! Thank you for contributing to Akka!
# Welcome! Thank you for contributing to Apache Pekko!

We follow the standard GitHub [fork & pull](https://help.github.com/articles/using-pull-requests/#fork--pull) approach to pull requests. Just fork the official repo, develop in a branch, and submit a PR!

Expand Down
10 changes: 10 additions & 0 deletions DISCLAIMER
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Apache Pekko (incubating) is an effort undergoing incubation at the Apache
Software Foundation (ASF), sponsored by the Apache Incubator PMC.

Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure, communications, and decision making process
have stabilized in a manner consistent with other successful ASF projects.

While incubation status is not necessarily a reflection of the completeness
or stability of the code, it does indicate that the project has yet to be
fully endorsed by the ASF.
11 changes: 0 additions & 11 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -199,14 +199,3 @@
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.

---------------

Licenses for dependency projects can be found here:
[http://akka.io/docs/akka/current/project/licenses.html]

---------------

akka-protobuf contains the sources of Google protobuf 2.5.0 runtime support,
moved into the source package `akka.protobuf` so as to avoid version conflicts.
For license information see COPYING.protobuf
11 changes: 11 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Apache Pekko Platform Guide
Copyright 2022, 2023 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

This product contains significant parts that were originally based on software from Lightbend (Akka <https://akka.io/>).
Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>

Apache Pekko Platform Guide is derived from Akka Platform Guide, the last version that was distributed under the
Apache License, Version 2.0 License.
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
Akka Platform Guide
===================
Apache Pekko Platform Guide
===========================

Review and feedback
-------------------

This is the repository for the Akka Platform Guide and we would love to hear your feedback.
This is the repository for the Apache Pekko Platform Guide and we would love to hear your feedback.

This guide is published at https://developer.lightbend.com/docs/akka-platform-guide/

Feel free to give your feedback in the form of issues/PRs, or chat in https://gitter.im/akka/dev.
Feel free to give your feedback in the form of issues/PRs.

Contributing
------------
Contributions are *very* welcome!

If you see an issue that you'd like to see fixed, the best way to make it happen is to help out by submitting a pull request implementing it.

Refer to the [CONTRIBUTING.md](https://github.com/akka/akka-platform-guide/blob/master/CONTRIBUTING.md) file for more details about the workflow,
Refer to the [CONTRIBUTING.md](https://github.com/apache/incubator-pekko-platform-guide/blob/master/CONTRIBUTING.md) file for more details about the workflow,
and general hints on how to prepare your pull request. You can also ask for clarifications or guidance in GitHub issues directly,
or in the akka/dev chat if a more real time communication would be of benefit.

License
-------

Akka is Open Source and available under the Apache 2 License.
Apache Pekko is Open Source and available under the Apache 2 License.

0 comments on commit 91a1946

Please sign in to comment.