Skip to content

Commit

Permalink
Removed mentions to incubator-pulsar (apache#2620)
Browse files Browse the repository at this point in the history
* Removed mentions to incubator-pulsar

* Removed DISCLAIMER link from offloaders package

* Trigger build
  • Loading branch information
merlimat authored Sep 25, 2018
1 parent a4d1624 commit 96c10dc
Show file tree
Hide file tree
Showing 72 changed files with 222 additions and 227 deletions.
12 changes: 6 additions & 6 deletions .test-infra/jenkins/common_job_properties.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ class common_job_properties {
String branch = 'master') {
// GitHub project.
context.properties {
githubProjectUrl('https://[email protected]/apache/incubator-pulsar/')
githubProjectUrl('https://[email protected]/apache/pulsar/')
}

setTopLevelJobProperties(
context,
'https://gitbox.apache.org/repos/asf/incubator-pulsar.git',
'https://gitbox.apache.org/repos/asf/pulsar.git',
branch,
'git-websites',
30)
Expand All @@ -46,13 +46,13 @@ class common_job_properties {
String jenkinsExecutorLabel = 'Hadoop') {
// GitHub project.
context.properties {
githubProjectUrl('https://github.com/apache/incubator-pulsar/')
githubProjectUrl('https://github.com/apache/pulsar/')
}


setTopLevelJobProperties(
context,
'https://github.com/apache/incubator-pulsar.git',
'https://github.com/apache/pulsar.git',
branch,
jenkinsExecutorLabel,
timeout)
Expand Down Expand Up @@ -227,7 +227,7 @@ class common_job_properties {
static void setPostCommit(context,
String buildSchedule = '0 */6 * * *',
boolean triggerEveryPush = true,
String notifyAddress = 'dev@pulsar.incubator.apache.org',
String notifyAddress = '[email protected]',
boolean emailIndividuals = true) {
// Set build triggers
context.triggers {
Expand All @@ -247,7 +247,7 @@ class common_job_properties {
// Sets common config for Website PostCommit jobs.
static void setWebsitePostCommit(context,
String buildSchedule = 'H 1 * * *',
String notifyAddress = 'dev@pulsar.incubator.apache.org',
String notifyAddress = '[email protected]',
boolean emailIndividuals = true) {
// Set build triggers
context.triggers {
Expand Down
2 changes: 1 addition & 1 deletion .test-infra/jenkins/job_seed.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ job('pulsar-seed') {
delegate,
'H 6 * * *',
false,
'dev@pulsar.incubator.apache.org')
'[email protected]')

// Allows triggering this build against pull requests.
common_job_properties.enablePhraseTriggeringFromPullRequest(
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ deploy:
skip_cleanup: true
script: mvn install deploy -Papache-release -DskipTests --settings .travis/settings.xml
on:
repo: apache/incubator-pulsar
repo: apache/pulsar
tags: true
-
provider: releases
Expand All @@ -77,14 +77,14 @@ deploy:
file_glob: true
file: "distribution/server/target/pulsar-*.tar.gz"
on:
repo: apache/incubator-pulsar
repo: apache/pulsar
tags: true
-
provider: script
skip_cleanup: true
script: (cd site && make travis_publish)
on:
repo: apache/incubator-pulsar
repo: apache/pulsar
branch: master
-
provider: script
Expand Down
6 changes: 0 additions & 6 deletions DISCLAIMER

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Pulsar is a distributed pub-sub messaging platform with a very
flexible messaging model and an intuitive client API.

https://pulsar.incubator.apache.org
https://pulsar.apache.org

## Main features
* Horizontally scalable (Millions of independent topics and millions
Expand Down Expand Up @@ -64,16 +64,16 @@ Start standalone Pulsar service:
$ bin/pulsar standalone
```

Check https://pulsar.incubator.apache.org for documentation and examples.
Check https://pulsar.apache.org for documentation and examples.

## Contact

##### Mailing lists

| Name | Scope | | | |
|:------------------------------------------------------------------------------|:--------------------------------|:----------------------------------------------------------------|:--------------------------------------------------------------------|:-----------------------------------------------------------------------------|
| [users@pulsar.incubator.apache.org](mailto:users@pulsar.incubator.apache.org) | User-related discussions | [Subscribe](mailto:users-subscribe@pulsar.incubator.apache.org) | [Unsubscribe](mailto:users-unsubscribe@pulsar.incubator.apache.org) | [Archives](http://mail-archives.apache.org/mod_mbox/incubator-pulsar-users/) |
| [dev@pulsar.incubator.apache.org](mailto:dev@pulsar.incubator.apache.org) | Development-related discussions | [Subscribe](mailto:dev-subscribe@pulsar.incubator.apache.org) | [Unsubscribe](mailto:dev-unsubscribe@pulsar.incubator.apache.org) | [Archives](http://mail-archives.apache.org/mod_mbox/incubator-pulsar-dev/) |
| [[email protected]](mailto:[email protected]) | User-related discussions | [Subscribe](mailto:[email protected]) | [Unsubscribe](mailto:[email protected]) | [Archives](http://mail-archives.apache.org/mod_mbox/pulsar-users/) |
| [[email protected]](mailto:[email protected]) | Development-related discussions | [Subscribe](mailto:[email protected]) | [Unsubscribe](mailto:[email protected]) | [Archives](http://mail-archives.apache.org/mod_mbox/pulsar-dev/) |

##### Slack

Expand Down
2 changes: 1 addition & 1 deletion dashboard/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ Pulsar dashboard is a web application that monitors
a complete instance of Pulsar and gives insights
about about all the topics.

See [docs/Dashboard.md](https://github.com/apache/incubator-pulsar/blob/master/docs/Dashboard.md) for more information.
See [docs/Dashboard.md](https://github.com/apache/pulsar/blob/master/docs/Dashboard.md) for more information.
2 changes: 1 addition & 1 deletion distribution/io/src/assemble/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Please refer to http://pulsar.incubator.apache.org/ for access to documentation.
Please refer to http://pulsar.apache.org/ for access to documentation.

This package contains Pulsar IO connectors archives. Each archive
contains:
Expand Down
5 changes: 0 additions & 5 deletions distribution/io/src/assemble/io.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<files>
<file>
<source>${basedir}/../../DISCLAIMER</source>
<outputDirectory>.</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>${basedir}/../../LICENSE</source>
<outputDirectory>.</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion distribution/offloaders/src/assemble/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Please refer to http://pulsar.incubator.apache.org/ for access to documentation.
Please refer to http://pulsar.apache.org/ for access to documentation.

This package contains Pulsar offloader archives. Each archive
contains:
Expand Down
5 changes: 0 additions & 5 deletions distribution/offloaders/src/assemble/offloaders.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<files>
<file>
<source>${basedir}/../../DISCLAIMER</source>
<outputDirectory>.</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>${basedir}/../../LICENSE</source>
<outputDirectory>.</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion distribution/server/src/assemble/README.bin.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Please refer to http://pulsar.incubator.apache.org/ for access to documentation.
Please refer to http://pulsar.apache.org/ for access to documentation.

This distribution includes cryptographic software. The country in which you currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. See <http://www.wassenaar.org/> for more information.

Expand Down
5 changes: 0 additions & 5 deletions distribution/server/src/assemble/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@
</fileSet>
</fileSets>
<files>
<file>
<source>${basedir}/../../DISCLAIMER</source>
<outputDirectory>.</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>${basedir}/src/assemble/README.bin.txt</source>
<destName>README</destName>
Expand Down
1 change: 0 additions & 1 deletion distribution/server/src/assemble/src.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**/README.md</include>
<include>**/DISCLAIMER</include>
<include>**/LICENSE</include>
<include>**/NOTICE</include>
<include>**/pom.xml</include>
Expand Down
4 changes: 2 additions & 2 deletions examples/flink-consumer-source/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This page describes how to use the connectors to read and write Pulsar topics with [Apache Flink](https://flink.apache.org/) stream processing applications.

Build end-to-end stream processing pipelines that use Pulsar as the stream storage and message bus, and Apache Flink for computation over the streams.
See the [Pulsar Concepts](https://pulsar.incubator.apache.org/docs/en/concepts-overview/) page for more information.
See the [Pulsar Concepts](https://pulsar.apache.org/docs/en/concepts-overview/) page for more information.

## Example

Expand All @@ -16,7 +16,7 @@ The steps to run the example:

1. Start Pulsar Standalone.

You can follow the [instructions](https://pulsar.incubator.apache.org/docs/en/standalone/) to start a Pulsar standalone locally.
You can follow the [instructions](https://pulsar.apache.org/docs/en/standalone/) to start a Pulsar standalone locally.

```shell
$ bin/pulsar standalone
Expand Down
4 changes: 2 additions & 2 deletions faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ This is a lightweight option of having multiple clusters for different users, si


### Is there "regex" topic in Pulsar?
There is regex subscription coming up in Pulsar 2.0. See [PIP-13](https://github.com/apache/incubator-pulsar/wiki/PIP-13:-Subscribe-to-topics-represented-by-regular-expressions).
There is regex subscription coming up in Pulsar 2.0. See [PIP-13](https://github.com/apache/pulsar/wiki/PIP-13:-Subscribe-to-topics-represented-by-regular-expressions).

### Does Pulsar have, or plan to have, a concept of log compaction where only the latest message with the same key will be kept ?
Yes, see [PIP-9](https://github.com/ivankelly/incubator-pulsar-wiki/pull/1/files) for more details.
Yes, see [PIP-9](https://github.com/ivankelly/pulsar-wiki/pull/1/files) for more details.

### When I use an exclusive subscription to a partitioned topic, is the subscription attached to the "whole topic" or to a "topic partition"?
On a partitioned topic, you can use all the 3 supported subscription types (exclusive, failover, shared), same as with non partitioned topics.
Expand Down
15 changes: 7 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<name>Pulsar</name>
<description>Pulsar is a distributed pub-sub messaging platform with a very
flexible messaging model and an intuitive client API.</description>
<url>https://github.com/apache/incubator-pulsar</url>
<url>https://github.com/apache/pulsar</url>

<organization>
<name>Apache Software Foundation</name>
Expand All @@ -49,7 +49,7 @@ flexible messaging model and an intuitive client API.</description>
<developers>
<developer>
<organization>Apache Pulsar developers</organization>
<organizationUrl>http://pulsar.incubator.apache.org/</organizationUrl>
<organizationUrl>http://pulsar.apache.org/</organizationUrl>
</developer>
</developers>

Expand All @@ -62,14 +62,14 @@ flexible messaging model and an intuitive client API.</description>
</licenses>

<scm>
<url>https://github.com/apache/incubator-pulsar</url>
<connection>scm:git:https://github.com/apache/incubator-pulsar.git</connection>
<developerConnection>scm:git:ssh://[email protected]:apache/incubator-pulsar.git</developerConnection>
<url>https://github.com/apache/pulsar</url>
<connection>scm:git:https://github.com/apache/pulsar.git</connection>
<developerConnection>scm:git:ssh://[email protected]:apache/pulsar.git</developerConnection>
</scm>

<ciManagement>
<system>Travis</system>
<url>https://travis-ci.org/apache/incubator-pulsar</url>
<url>https://travis-ci.org/apache/pulsar</url>
</ciManagement>

<modules>
Expand Down Expand Up @@ -123,7 +123,7 @@ flexible messaging model and an intuitive client API.</description>

<issueManagement>
<system>Github</system>
<url>https://github.com/apache/incubator-pulsar/issues</url>
<url>https://github.com/apache/pulsar/issues</url>
</issueManagement>

<properties>
Expand Down Expand Up @@ -974,7 +974,6 @@ flexible messaging model and an intuitive client API.</description>
<excludes>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
<exclude>DISCLAIMER</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.pem</exclude>
<exclude>**/*.crt</exclude>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2625,7 +2625,7 @@ public void testFlushBatchDisabled() throws Exception {
log.info("-- Exiting {} test --", methodName);
}

// Issue 1452: https://github.com/apache/incubator-pulsar/issues/1452
// Issue 1452: https://github.com/apache/pulsar/issues/1452
// reachedEndOfTopic should be called only once if a topic has been terminated before subscription
@Test
public void testReachedEndOfTopic() throws Exception
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<!-- /TOC -->
Examples for using the API to publish and consume messages can be found on
https://github.com/apache/incubator-pulsar/tree/master/pulsar-client-cpp/examples
https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/examples

## Requirements

Expand Down
4 changes: 2 additions & 2 deletions pulsar-client-cpp/docs/MainPage.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# The Pulsar C++ client

Welcome to the Doxygen documentation for [Pulsar](https://pulsar.incubator.apache.org/).
Welcome to the Doxygen documentation for [Pulsar](https://pulsar.apache.org/).

## Supported platforms

Expand All @@ -44,7 +44,7 @@ You need to have the following installed to use the C++ client:
There are separate compilation instructions for [MacOS](#macos) and [Linux](#linux). For both systems, start by cloning the Pulsar repository:

```shell
$ git clone https://github.com/apache/incubator-pulsar
$ git clone https://github.com/apache/pulsar
```

### Linux
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-cpp/homebrew/libpulsar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Libpulsar < Formula
desc "Apache Pulsar C++ library"
homepage "https://pulsar.apache.org"

head "https://github.com/apache/incubator-pulsar.git"
head "https://github.com/apache/pulsar.git"

# TODO: Switch to official 2.1 version when available
version "2.1.0-incubating-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-cpp/lib/ClientConnection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ void ClientConnection::handleIncomingCommand() {
case BaseCommand::ACTIVE_CONSUMER_CHANGE: {
LOG_DEBUG(cnxString_ << "Received notification about active consumer changes");
// ignore this message for now.
// TODO: @link{https://github.com/apache/incubator-pulsar/issues/1240}
// TODO: @link{https://github.com/apache/pulsar/issues/1240}
break;
}

Expand Down
7 changes: 3 additions & 4 deletions pulsar-client-cpp/pkg/deb/build-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cd $SRC_ROOT_DIR/pulsar-client-cpp/pkg/deb

POM_VERSION=`cat ../../../pom.xml | xmllint --format - | sed "s/xmlns=\".*\"//g" | xmllint --stream --pattern /project/version --debug - | grep -A 2 "matches pattern" | grep text | sed "s/.* [0-9] //g"`
# Sanitize VERSION by removing `SNAPSHOT` if any since it's not legal in DEB
VERSION=`echo $POM_VERSION | awk -F- '{print $1}'`-incubating
VERSION=`echo $POM_VERSION | awk -F- '{print $1}'`

ROOT_DIR=apache-pulsar-$POM_VERSION
CPP_DIR=$ROOT_DIR/pulsar-client-cpp
Expand All @@ -47,7 +47,7 @@ mkdir -p $DEST_DIR/DEBIAN
cat <<EOF > $DEST_DIR/DEBIAN/control
Package: apache-pulsar-client
Version: ${VERSION}
Maintainer: Apache Pulsar <dev@pulsar.incubator.apache.org>
Maintainer: Apache Pulsar <[email protected]>
Architecture: amd64
Description: The Apache Pulsar client contains a C++ and C APIs to interact with Apache Pulsar brokers.
EOF
Expand All @@ -57,7 +57,7 @@ mkdir -p $DEVEL_DEST_DIR/DEBIAN
cat <<EOF > $DEVEL_DEST_DIR/DEBIAN/control
Package: apache-pulsar-client-dev
Version: ${VERSION}
Maintainer: Apache Pulsar <dev@pulsar.incubator.apache.org>
Maintainer: Apache Pulsar <[email protected]>
Architecture: amd64
Depends: apache-pulsar-client
Description: The Apache Pulsar client contains a C++ and C APIs to interact with Apache Pulsar brokers.
Expand All @@ -76,7 +76,6 @@ pushd $DEST_DIR/usr/lib
ln -s libpulsar.so.$POM_VERSION libpulsar.so
popd

cp $ROOT_DIR/DISCLAIMER $DEST_DIR/usr/share/doc/pulsar-client-$VERSION
cp $ROOT_DIR/NOTICE $DEST_DIR/usr/share/doc/pulsar-client-$VERSION
cp $CPP_DIR/pkg/licenses/* $DEST_DIR/usr/share/doc/pulsar-client-$VERSION
cp $CPP_DIR/pkg/licenses/LICENSE.txt $DEST_DIR/usr/share/doc/pulsar-client-$VERSION/copyright
Expand Down
5 changes: 2 additions & 3 deletions pulsar-client-cpp/pkg/rpm/SPECS/pulsar-client.spec
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#

%define name apache-pulsar-client
%define release 1_incubating
%define release 1
%define buildroot %{_topdir}/%{name}-%{version}-root

BuildRoot: %{buildroot}
Summary: Apache Pulsar client library
URL: https://pulsar.incubator.apache.org/
URL: https://pulsar.apache.org/
License: Apache License v2
Name: %{name}
Version: %{version}
Expand Down Expand Up @@ -68,7 +68,6 @@ cp lib/libpulsar.a $LIB_DIR
cp lib/libpulsar.so.%{pom_version} $LIB_DIR

# Copy LICENSE files
cp ../DISCLAIMER $DOC_DIR
cp ../NOTICE $DOC_DIR
cp pkg/licenses/* $DOC_DIR

Expand Down
Loading

0 comments on commit 96c10dc

Please sign in to comment.