From 4f22c388b367eb89b9861cc0a2ee3b557e7710dd Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 26 Jun 2020 15:33:23 -0500 Subject: [PATCH] Remove a few more enterprise references --- Makefile | 8 -------- NOTICE | 21 --------------------- README.md | 11 +++++------ license.exceptions | 1 - 4 files changed, 5 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index 3aca82639..537281289 100644 --- a/Makefile +++ b/Makefile @@ -79,11 +79,8 @@ endif # Create release build tarballs for all supported platforms. Linux compilation happens under Docker. release: check-clean $(MAKE) release-build GOOS=darwin GOARCH=amd64 - $(MAKE) release-build GOOS=darwin GOARCH=amd64 ENTERPRISE=1 $(MAKE) release-build GOOS=linux GOARCH=amd64 - $(MAKE) release-build GOOS=linux GOARCH=amd64 ENTERPRISE=1 $(MAKE) release-build GOOS=linux GOARCH=386 - $(MAKE) release-build GOOS=linux GOARCH=386 ENTERPRISE=1 # try (e.g.) internal/clustertests/docker-compose-replication2.yml @@ -145,11 +142,6 @@ docker-tag-push: vendor docker push $(DOCKER_TARGET) @echo Pushed docker image: $(DOCKER_TARGET) -# Create Docker image from Dockerfile (enterprise) -docker-enterprise: vendor - docker build --build-arg MAKE_FLAGS="ENTERPRISE=1" -t "pilosa-enterprise:$(VERSION)" . - @echo Created docker image: pilosa-enterprise:$(VERSION) - # Compile Pilosa inside Docker container docker-build: docker run --rm -v $(PWD):/go/src/$(CLONE_URL) -w /go/src/$(CLONE_URL) -e GOOS=$(GOOS) -e GOARCH=$(GOARCH) golang:$(GO_VERSION) go build -tags='$(BUILD_TAGS)' -ldflags $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosa diff --git a/NOTICE b/NOTICE index 63c95e3c3..594272a27 100644 --- a/NOTICE +++ b/NOTICE @@ -14,27 +14,6 @@ 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. -Enterprise Edition software license -=================================== - -Files contained under the directory `enterprise` are subject to the following -license notice (Full license included in the file `COPYING`): - - Copyright (C) 2018 Pilosa Corp. All rights reserved. - - Pilosa Enterprise Edition is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Pilosa Enterprise Edition is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with Pilosa Enterprise Edition. If not, see . - Third-party software licenses ============================= diff --git a/README.md b/README.md index 8ccae2b91..1619c2b57 100644 --- a/README.md +++ b/README.md @@ -63,13 +63,12 @@ There are supported libraries for the following languages: - [Java](https://www.pilosa.com/docs/client-libraries/#java) - [Python](https://www.pilosa.com/docs/client-libraries/#python) -## Licenses +## License -The core Pilosa code base and all default builds (referred to as Pilosa Community Edition) are licensed completely under the Apache License, Version 2.0. -If you build Pilosa with the `enterprise` build tag (Pilosa Enterprise Edition), then that build will include features licensed under the GNU Affero General -Public License (AGPL). Enterprise code is located entirely in the [github.com/pilosa/pilosa/enterprise](https://github.com/pilosa/pilosa/tree/master/enterprise) -directory. See [github.com/pilosa/pilosa/NOTICE](https://github.com/pilosa/pilosa/blob/master/NOTICE) and -[github.com/pilosa/pilosa/LICENSE](https://github.com/pilosa/pilosa/blob/master/LICENSE) for more information about Pilosa licenses. +Pilosa is licensed under the Apache License, Version 2.0. + +A copy of the license is located in [github.com/pilosa/pilosa/LICENSE](https://github.com/pilosa/pilosa/blob/master/LICENSE). +More details about licensing are found in [github.com/pilosa/pilosa/NOTICE](https://github.com/pilosa/pilosa/blob/master/NOTICE). ## Get Support diff --git a/license.exceptions b/license.exceptions index 9f453efc4..ef44dcacc 100644 --- a/license.exceptions +++ b/license.exceptions @@ -4,7 +4,6 @@ ./internal/private.pb.go ./internal/public.pb.go ./lru/lru.go -./enterprise/enterprise.go ./roaring/btree.go ./roaring/btree_test.go ./proto/pilosa.pb.go