kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/lytscu/skywalking into develop 

yes
:
This commit is contained in:
lytscu 2017-11-16 14:47:50 +08:00
parent 4eeb5ab8df 46370f0079
commit 5691a94987
112 changed files with 395 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-application-toolkit/apm-toolkit-opentracing/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-application-toolkit/apm-toolkit-trace/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-application-toolkit/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-application-toolkit</artifactId>

2
apm-collector/apm-collector-agent/collector-agent-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-agent/collector-agent-grpc-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-agent/collector-agent-jetty-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-agent/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

33
apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017, OpenSkywalking Organization All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ 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.
~
~ Project repository: https://github.com/OpenSkywalking/skywalking
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-baseline-computing-define</artifactId>
</project>

38
apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/java/org/skywalking/apm/collector/baseline/computing/ComputingModule.java Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* 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.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package org.skywalking.apm.collector.baseline.computing;
import org.skywalking.apm.collector.core.module.Module;
/**
* The <code>ComputingModule</code> defines the required service interfaces.
*
* @author wu-sheng
*/
public class ComputingModule extends Module {
public static final String NAME = "baseline-computing";
@Override public String name() {
return NAME;
}
@Override public Class[] services() {
return new Class[0];
}
}

19
apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module Normal file
View File

@ -0,0 +1,19 @@
#
# Copyright 2017, OpenSkywalking Organization All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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.
#
# Project repository: https://github.com/OpenSkywalking/skywalking
#
org.skywalking.apm.collector.baseline.computing.ComputingModule

44
apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017, OpenSkywalking Organization All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ 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.
~
~ Project repository: https://github.com/OpenSkywalking/skywalking
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-baseline-computing-provider</artifactId>
<dependencies>
<dependency>
<groupId>org.skywalking</groupId>
<artifactId>collector-baseline-computing-define</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.skywalking</groupId>
<artifactId>collector-baseline-computing-define</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

58
apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/java/org/skywalking/collector/baseline/computing/provider/ComputingProvider.java Normal file
View File

@ -0,0 +1,58 @@
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* 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.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package org.skywalking.collector.baseline.computing.provider;
import java.util.Properties;
import org.skywalking.apm.collector.baseline.computing.ComputingModule;
import org.skywalking.apm.collector.core.module.Module;
import org.skywalking.apm.collector.core.module.ModuleProvider;
import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
/**
* The <code>ComputingProvider</code> is the default implementation of {@link ComputingModule}
*
* @author wu-sheng
*/
public class ComputingProvider extends ModuleProvider {
public static final String NAME = "default";
@Override public String name() {
return NAME;
}
@Override public Class<? extends Module> module() {
return ComputingModule.class;
}
@Override public void prepare(Properties config) throws ServiceNotProvidedException {
}
@Override public void start(Properties config) throws ServiceNotProvidedException {
}
@Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
}
@Override public String[] requiredModules() {
return new String[0];
}
}

19
apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider Normal file
View File

@ -0,0 +1,19 @@
#
# Copyright 2017, OpenSkywalking Organization All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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.
#
# Project repository: https://github.com/OpenSkywalking/skywalking
#
org.skywalking.collector.baseline.computing.provider.ComputingProvider

33
apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017, OpenSkywalking Organization All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ 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.
~
~ Project repository: https://github.com/OpenSkywalking/skywalking
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-baseline-scheduler-define</artifactId>
</project>

45
apm-collector/apm-collector-baseline/pom.xml Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017, OpenSkywalking Organization All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ 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.
~
~ Project repository: https://github.com/OpenSkywalking/skywalking
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-collector-baseline</artifactId>
<packaging>pom</packaging>
<modules>
<module>collector-baseline-computing-define</module>
<module>collector-baseline-computing-provider</module>
<module>collector-baseline-scheduler-define</module>
</modules>
<dependencies>
<dependency>
<groupId>org.skywalking</groupId>
<artifactId>apm-collector-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

2
apm-collector/apm-collector-boot/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-cache/collector-cache-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cache</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cache</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-cache/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-cluster/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-component/client-component/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector-component</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-component/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-component/server-component/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector-component</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-grpc-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-grpc-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-grpc-manager/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-instrument/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-jetty-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-jetty-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-jetty-manager/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-naming/collector-naming-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-naming</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-naming</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-naming/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-queue</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-queue/collector-queue-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-queue</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-queue</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-queue/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-remote/collector-remote-define/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector-remote</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-remote</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-remote</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-remote/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-storage/collector-storage-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-storage</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-storage</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-storage</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-storage/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-stream/collector-stream-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-stream</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-stream/collector-stream-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-stream</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-stream/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-ui/collector-ui-define/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-ui</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-ui</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-collector/apm-collector-ui/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

3
apm-collector/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -46,6 +46,7 @@
<module>apm-collector-stream</module>
<module>apm-collector-queue</module>
<module>apm-collector-instrument</module>
<module>apm-collector-baseline</module>
</modules>
<properties>

2
apm-commons/apm-datacarrier/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-commons/apm-util/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-commons/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-network/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-agent-core/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-agent-core</artifactId>

2
apm-sniffer/apm-agent/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-agent</artifactId>

2
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-grpc-1.x-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-httpClient-4.x-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-jedis-2.x-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>jetty-plugins</artifactId>

2
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-mongodb-3.x-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>nutz-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>nutz-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>nutz-plugins</artifactId>

2
apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-sdk-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
View File

@ -25,7 +25,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-resin-3.x-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
View File

@ -25,7 +25,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-resin-4.x-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml
View File

@ -23,7 +23,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>spring-plugins</artifactId>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>spring-cloud</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>netflix-plugins</artifactId>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>netflix-plugins</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-spring-cloud-feign-1.x-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>spring-plugins</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>spring-cloud</artifactId>

2
apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-spymemcached-2.x-plugin</artifactId>

2
apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Some files were not shown because too many files have changed in this diff Show More