Skip to content

Commit

Permalink
Remove many incubator/incubating things. (apache#2499)
Browse files Browse the repository at this point in the history
  • Loading branch information
wu-sheng authored Apr 21, 2019
1 parent e044fe2 commit 3354c0c
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 195 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ for us to fix.

## How to report a bug?

* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/apache/incubator-skywalking/issues).
* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/apache/skywalking/issues).

* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/apache/incubator-skywalking/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/apache/skywalking/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.


## How to add a new feature or change an existing one

_Before making any significant changes, please [open an issue](https://github.com/apache/incubator-skywalking/issues)._ Discussing your proposed changes ahead of time will make the contribution process smooth for everyone.
_Before making any significant changes, please [open an issue](https://github.com/apache/skywalking/issues)._ Discussing your proposed changes ahead of time will make the contribution process smooth for everyone.

Once we've discussed your changes and you've got your code ready, make sure that tests are passing and open your pull request. Your PR is most likely to be accepted if it:

Expand All @@ -40,4 +40,4 @@ Once we've discussed your changes and you've got your code ready, make sure that

## Do you have questions about the source code?

Ask any question about how to use SkyWalking in the [Gitter](https://gitter.im/OpenSkywalking/Lobby).
* Join `#skywalking` channel at [Apache Slack](https://join.slack.com/t/the-asf/shared_invite/enQtNDQ3OTEwNzE1MDg5LWY2NjkwMTEzMGI2ZTI1NzUzMDk0MzJmMWM1NWVmODg0MzBjNjAxYzUwMjIwNDI3MjlhZWRjNmNhOTM5NmIxNDk)
5 changes: 0 additions & 5 deletions DISCLAIMER

This file was deleted.

7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ microservices, cloud native and container-based (Docker, Kubernetes, Mesos) arch


[![Maven Central](https://img.shields.io/maven-central/v/org.apache.skywalking/apache-skywalking-apm-incubating.svg)](http://skywalking.apache.org/downloads/)
[![Build Status](https://travis-ci.org/apache/incubator-skywalking.svg?branch=master)](https://travis-ci.org/apache/incubator-skywalking)
[![Join the chat at https://gitter.im/sky-walking/Lobby](https://badges.gitter.im/openskywalking/Lobby.svg)](https://gitter.im/openskywalking/Lobby)
[![OpenTracing-1.x Badge](https://img.shields.io/badge/OpenTracing--1.x-enabled-blue.svg)](http://opentracing.io)
[![Build Status](https://travis-ci.org/apache/skywalking.svg?branch=master)](https://travis-ci.org/apache/incubator-skywalking)

# Abstract
**SkyWalking** is an open source APM system, including monitoring, tracing, diagnosing capabilities for distributed system
Expand Down Expand Up @@ -109,8 +107,5 @@ SkyWalking enriches the <a href="https://landscape.cncf.io/landscape=observabili
<br/>Our project enriches the <a href="https://openapm.io">OpenAPM Landscape!</a>
</p>

# Stargazers over time
[![Stargazers over time](https://starcharts.herokuapp.com/apache/incubator-skywalking.svg)](https://starcharts.herokuapp.com/apache/incubator-skywalking)

# License
[Apache 2.0 License.](/LICENSE)
12 changes: 6 additions & 6 deletions apm-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>apache-skywalking-apm-incubating</artifactId>
<artifactId>apache-skywalking-apm</artifactId>
<packaging>pom</packaging>

<profiles>
Expand Down Expand Up @@ -72,7 +72,7 @@
</profiles>

<build>
<finalName>apache-skywalking-apm-incubating-bin</finalName>
<finalName>apache-skywalking-apm-bin</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down Expand Up @@ -105,11 +105,11 @@
</goals>
<configuration>
<tasks>
<copy file="${project.build.directory}/apache-skywalking-apm-incubating-bin.tar.gz"
tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating-bin.tar.gz"
<copy file="${project.build.directory}/apache-skywalking-apm-bin.tar.gz"
tofile="${project.basedir}/../dist/apache-skywalking-apm-bin.tar.gz"
overwrite="true"/>
<copy file="${project.build.directory}/apache-skywalking-apm-incubating-bin.zip"
tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating-bin.zip"
<copy file="${project.build.directory}/apache-skywalking-apm-bin.zip"
tofile="${project.basedir}/../dist/apache-skywalking-apm-bin.zip"
overwrite="true"/>
</tasks>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ export DOCKER_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))

oap:
cd $(DOCKER_ROOT)/oap; \
cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./ ; \
cp ../../dist/apache-skywalking-apm-bin.tar.gz ./ ; \
docker build -t skywalking/oap:latest .

ui:
cd $(DOCKER_ROOT)/ui; \
cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./ ; \
cp ../../dist/apache-skywalking-apm-bin.tar.gz ./ ; \
docker build -t skywalking/ui:latest .

build: oap ui
Expand Down
2 changes: 1 addition & 1 deletion docker/oap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

FROM openjdk:8u181-jdk-stretch

ENV DIST_NAME=apache-skywalking-apm-incubating-bin \
ENV DIST_NAME=apache-skywalking-apm-bin \
JAVA_OPTS=" -Xms256M "

COPY "$DIST_NAME.tar.gz" /
Expand Down
Loading

0 comments on commit 3354c0c

Please sign in to comment.