Skip to content

Commit 07993fd

Browse files
authored
WIP - Remove 'incubat(ing, ion, or)' designation and disclaimer (#454)
* Remove 'incubat(ing, ion, or)' designation and disclaimer * Updating commit hash in build.gradle; not sure how to regen vendor.json * used 'govendor update +vendor' to update vendor.json... i think * update commit hash for 'client-go' in build.gradle * update commit hash for 'client-go' in build.gradle
1 parent bca476d commit 07993fd

30 files changed

+145
-132
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Godeps/_workspace
1515
build
1616
/release/
1717
/vendor/*/
18-
incubator-openwhisk-cli.iml
18+
openwhisk-cli.iml
1919
wski18n/i18n_resources.go
2020
bin/
2121
tests/build/

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ before_script:
5555
- GO_FILES=$(find . -iname '*.go' -type f | grep -v /vendor/)
5656
- test -z "$(gofmt -s -l $(echo $GO_FILES))"
5757
- cd $TRAVIS_BUILD_DIR/..
58-
- git clone https://github.com/apache/incubator-openwhisk-utilities.git
59-
- git clone https://github.com/apache/incubator-openwhisk.git
60-
- cd incubator-openwhisk
58+
- git clone https://github.com/apache/openwhisk-utilities.git
59+
- git clone https://github.com/apache/openwhisk.git
60+
- cd openwhisk
6161
- ./tools/travis/setup.sh
6262

6363
script:
64-
- cd $TRAVIS_BUILD_DIR/../incubator-openwhisk
64+
- cd $TRAVIS_BUILD_DIR/../openwhisk
6565
- ./gradlew install
6666
- cd $TRAVIS_BUILD_DIR
6767
- export BUILD_VERSION="latest"
@@ -92,9 +92,9 @@ before_deploy:
9292
git config --global user.name "Travis CI";
9393
export GIT_TAG="latest";
9494
git tag -d $GIT_TAG;
95-
git push -q https://[email protected]/apache/incubator-openwhisk-cli :refs/tags/$GIT_TAG;
95+
git push -q https://[email protected]/apache/openwhisk-cli :refs/tags/$GIT_TAG;
9696
GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER";
97-
git push -f -q https://[email protected]/apache/incubator-openwhisk-cli $GIT_TAG;
97+
git push -f -q https://[email protected]/apache/openwhisk-cli $GIT_TAG;
9898
fi
9999
- echo "The GIT_TAG of this Travis build is $GIT_TAG."
100100

@@ -111,6 +111,6 @@ deploy:
111111
target_commitish: $TRAVIS_COMMIT
112112
tag_name: $GIT_TAG
113113
on:
114-
repo: apache/incubator-openwhisk-cli
114+
repo: apache/openwhisk-cli
115115
tags: $TAG
116116
condition: "$DEPLOY_BUILD_READY = true"

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ created a directory named $GOPATH/src/github.com/apache/ and download the source
2929

3030
```
3131
$ cd $GOPATH/src/github.com/apache/
32-
$ git clone https://github.com/apache/incubator-openwhisk-cli.git
32+
$ git clone https://github.com/apache/openwhisk-cli.git
3333
```
3434

3535
After cloning the source code, you need to install all the dependencies by running the command under openwhisk cli folder:
@@ -44,17 +44,17 @@ or
4444
$ make deps
4545
```
4646

47-
You should be able to build the binaries with either the go command or the Gradle command, which is available in [README](https://github.com/apache/incubator-openwhisk-cli/blob/master/README.md).
47+
You should be able to build the binaries with either the go command or the Gradle command, which is available in [README](https://github.com/apache/openwhisk-cli/blob/master/README.md).
4848

4949

5050
## Proposing new features
5151

52-
If you would like to implement a new feature, please [raise an issue](https://github.com/apache/incubator-openwhisk-cli/issues) before sending a pull request so the feature can be discussed.
52+
If you would like to implement a new feature, please [raise an issue](https://github.com/apache/openwhisk-cli/issues) before sending a pull request so the feature can be discussed.
5353
This is to avoid you spending your valuable time working on a feature that the project developers are not willing to accept into the code base.
5454

5555
## Fixing bugs
5656

57-
If you would like to fix a bug, please [raise an issue](https://github.com/apache/incubator-openwhisk-cli/issues) before sending a pull request so it can be discussed.
57+
If you would like to fix a bug, please [raise an issue](https://github.com/apache/openwhisk-cli/issues) before sending a pull request so it can be discussed.
5858
If the fix is trivial or non controversial then this is not usually necessary.
5959

6060
## Merge approval
@@ -69,7 +69,7 @@ Please use [Slack channel #whisk-users](https://cloudplatform.slack.com/messages
6969

7070
## Setup
7171

72-
Project was written with `Go v1.9`. It has a dependency on [incubator-openwhisk-client-go](https://github.com/apache/incubator-openwhisk-client-go).
72+
Project was written with `Go v1.9`. It has a dependency on [openwhisk-client-go](https://github.com/apache/openwhisk-client-go).
7373

7474
## Testing
7575

@@ -85,12 +85,12 @@ Use idomatic go. Document exported functions.
8585

8686
[Homebrew](https://brew.sh) is used to install `wsk` locally. Once we release a new version of `wsk` we should update its version in homebrew.
8787

88-
Get the new release SHA256 checksum by downloading the Source Code (tar.gz) from the [releases page](https://github.com/apache/incubator-openwhisk-cli/releases) and running `shasum -a 256 X.Y.Z.tar.gz` on the tarball.
88+
Get the new release SHA256 checksum by downloading the Source Code (tar.gz) from the [releases page](https://github.com/apache/openwhisk-cli/releases) and running `shasum -a 256 X.Y.Z.tar.gz` on the tarball.
8989

9090
Update brew formula with the automation command `brew bump-formula-pr`:
9191
```bash
9292
$ brew bump-formula-pr \
93-
--url='https://github.com/apache/incubator-openwhisk-cli/archive/X.Y.Z.tar.gz' \
93+
--url='https://github.com/apache/openwhisk-cli/archive/X.Y.Z.tar.gz' \
9494
--sha256='PASTE THE SHA256 CHECKSUM HERE' \
9595
wsk
9696
```

DISCLAIMER.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# OpenWhisk Command-line Interface `wsk`
2121

22-
[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-cli.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-cli)
22+
[![Build Status](https://travis-ci.org/apache/openwhisk-cli.svg?branch=master)](https://travis-ci.org/apache/openwhisk-cli)
2323
[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
2424
[![Join Slack](https://img.shields.io/badge/join-slack-9B69A0.svg)](http://slack.openwhisk.org/)
2525
[![Twitter](https://img.shields.io/twitter/follow/openwhisk.svg?style=social&logo=twitter)](https://twitter.com/intent/follow?screen_name=openwhisk)
@@ -29,7 +29,7 @@ provides a consistent interface to interact with OpenWhisk services.
2929

3030
# Where to download the binary of OpenWhisk CLI
3131

32-
The OpenWhisk CLI is available on the [releases page](https://github.com/apache/incubator-openwhisk-cli/releases). We
32+
The OpenWhisk CLI is available on the [releases page](https://github.com/apache/openwhisk-cli/releases). We
3333
currently have binaries available for Linux, Mac OS and Windows under i386 and
3434
amd64 architectures. Linux versions are also available under Linux on Z, Power
3535
and 64-bit ARM architectures. You can download the binary, which fits your
@@ -115,8 +115,8 @@ typing:
115115

116116
```
117117
$ cd $GOPATH
118-
$ go get github.com/apache/incubator-openwhisk-cli
119-
$ cd $GOPATH/src/github.com/apache/incubator-openwhisk-cli
118+
$ go get github.com/apache/openwhisk-cli
119+
$ cd $GOPATH/src/github.com/apache/openwhisk-cli
120120
```
121121

122122
The CLI internationalization should be generated dynamically using the
@@ -136,7 +136,7 @@ $ govendor sync # Download and install packages with specified dependencies.
136136
```
137137

138138
NOTE: As a temporary workaround, you have to remove a redundant instance of `spf13/cobra`
139-
in the vendor folder. See this [issue](https://github.com/apache/incubator-openwhisk-cli/issues/398) for details.
139+
in the vendor folder. See this [issue](https://github.com/apache/openwhisk-cli/issues/398) for details.
140140
```
141141
$ rm -rf vendor/github.com/spf13
142142
```
@@ -186,7 +186,3 @@ Travis CI is used as a continuous delivery service for Linux and Mac.
186186
Currently Travis CI supports the environments of Linux and Mac,
187187
but it is not available for Windows. We will add support of AppVeyor CI in
188188
future to run test cases and build the binary for Windows.
189-
190-
# Disclaimer
191-
192-
Apache OpenWhisk Command-line Interface (CLI) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. 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.

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ subprojects {
3535
}
3636

3737
golang {
38-
packagePath = 'github.com/apache/incubator-openwhisk-cli' as String
38+
packagePath = 'github.com/apache/openwhisk-cli' as String
3939
buildTags = (rootProject.findProperty('goTags')?:'').split(',')
4040
goVersion = '1.9.3'
4141
}
@@ -57,8 +57,8 @@ dependencies {
5757
build(['name':'golang.org/x/sys/unix', 'version':'7f918dd405547ecb864d14a8ecbbfe205b5f930f', 'transitive':false])
5858
build(['name':'gopkg.in/yaml.v2', 'version':'eb3733d160e74a9c7e442f435eb3bea458e1d19f', 'transitive':false])
5959
build(['name':'github.com/ghodss/yaml', 'version':'0ca9ea5df5451ffdf184b4428c902747c2c11cd7', 'transitive':false])
60-
build(['name':'github.com/apache/incubator-openwhisk-client-go/whisk','version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7','transitive':false])
61-
build(['name':'github.com/apache/incubator-openwhisk-wskdeploy','version':'1b972a08b66492155ee3cb9e737254952c1157cc','transitive':false])
60+
build(['name':'github.com/apache/openwhisk-client-go/whisk','version':'d8ccb1442651beee6a9245913e3ca0cb182888b1','transitive':false])
61+
build(['name':'github.com/apache/openwhisk-wskdeploy','version':'cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2','transitive':false])
6262
// END - Imported from Godeps
6363
test name:'github.com/stretchr/testify', version:'b91bfb9ebec76498946beb6af7c0230c7cc7ba6c', transitive:false //, tag: 'v1.2.0'
6464
test name:'github.com/spf13/viper', version:'aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5', transitive:false

commands/action.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"strings"
3131
"time"
3232

33-
"github.com/apache/incubator-openwhisk-cli/wski18n"
34-
"github.com/apache/incubator-openwhisk-client-go/whisk"
33+
"github.com/apache/openwhisk-cli/wski18n"
34+
"github.com/apache/openwhisk-client-go/whisk"
3535

3636
"github.com/fatih/color"
3737
"github.com/mattn/go-colorable"

commands/activation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"syscall"
2727
"time"
2828

29-
"github.com/apache/incubator-openwhisk-cli/wski18n"
30-
"github.com/apache/incubator-openwhisk-client-go/whisk"
29+
"github.com/apache/openwhisk-cli/wski18n"
30+
"github.com/apache/openwhisk-client-go/whisk"
3131

3232
"github.com/fatih/color"
3333
"github.com/spf13/cobra"

commands/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"strconv"
2727
"strings"
2828

29-
"github.com/apache/incubator-openwhisk-cli/wski18n"
30-
"github.com/apache/incubator-openwhisk-client-go/whisk"
29+
"github.com/apache/openwhisk-cli/wski18n"
30+
"github.com/apache/openwhisk-client-go/whisk"
3131

3232
"encoding/json"
3333
"github.com/fatih/color"

commands/commands.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"os"
2424
"runtime"
2525

26-
"github.com/apache/incubator-openwhisk-cli/wski18n"
27-
"github.com/apache/incubator-openwhisk-client-go/whisk"
26+
"github.com/apache/openwhisk-cli/wski18n"
27+
"github.com/apache/openwhisk-client-go/whisk"
2828

2929
"github.com/spf13/cobra"
3030
)

0 commit comments

Comments
 (0)