Skip to content

Commit

Permalink
Clean up checkstyle import control and unused licenses (apache#7660)
Browse files Browse the repository at this point in the history
  • Loading branch information
kezhenxu94 authored Sep 6, 2021
1 parent 26b81a2 commit 559b88a
Show file tree
Hide file tree
Showing 16 changed files with 0 additions and 701 deletions.
2 changes: 0 additions & 2 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ header:
- '.gitmodules'
- '.muse'
- '.mvn'
- 'apm-checkstyle/CHECKSTYLE_HEAD'
- 'apm-protocol/apm-network/src/main/proto/.gitignore'
- 'codeStyle.xml'
- 'docker/.env'
Expand All @@ -53,7 +52,6 @@ header:
- '**/src/main/fbs/istio/**'
- '**/src/main/proto/envoy/**'
- '**/src/main/proto/udpa/**'
- '**/src/main/proto/gogoproto/gogo.proto'
- '**/src/main/proto/google/**'
- '**/src/main/proto/istio/**'
- '**/src/main/proto/jaeger/**'
Expand Down
18 changes: 0 additions & 18 deletions apm-checkstyle/CHECKSTYLE_HEAD

This file was deleted.

15 changes: 0 additions & 15 deletions apm-checkstyle/checkStyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
<property name="eachLine" value="true"/>
</module>

<module name="RegexpHeader">
<property name="headerFile" value="${checkstyle.header.file}"/>
<property name="multiLines" value="1, 2, 3, 18"/>
</module>

<module name="RegexpSingleline">
<property name="format" value="System\.out\.println"/>
<property name="message" value="Prohibit invoking System.out.println in source code !"/>
Expand Down Expand Up @@ -119,15 +114,5 @@
<property name="allowMultipleEmptyLines" value="false"/>
<property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
</module>

<module name="ImportControl">
<property name="file" value="${import.control}"/>
<property name="path" value="apm-sniffer/(apm-sdk-plugin|bootstrap-plugins|optional-plugins)/.+/src/main/.+Instrumentation.java$"/>
</module>

<module name="ImportControl">
<property name="file" value="${import.control}"/>
<property name="path" value="apm-sniffer/apm-toolkit-activation/.+/src/main/.+Activation.java$"/>
</module>
</module>
</module>
28 changes: 0 additions & 28 deletions apm-checkstyle/importControl.xml

This file was deleted.

7 changes: 0 additions & 7 deletions dist-material/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,12 @@ The following components are provided under the MIT License. See project link fo
The text of each license is also included at licenses/LICENSE-[project].txt.

slf4j 1.7.25: https://www.slf4j.org/ , MIT
Jedis 2.9.0: https://github.com/xetorthio/jedis , MIT
GraphQL java 8.0: https://github.com/graphql-java/graphql-java , MIT
GraphQL Java Tools 5.2.3: https://github.com/graphql-java/graphql-java-tools , MIT
bcpkix-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
bcprov-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
bcprov-ext-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
bcutil-ext-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
minimal-json 0.9.5: https://github.com/ralfstx/minimal-json, MIT
checker-qual 2.8.1: https://github.com/typetools/checker-framework, MIT
influxdb-java 2.15: https://github.com/influxdata/influxdb-java, MIT

Expand All @@ -364,13 +362,10 @@ The text of each license is also included at licenses/LICENSE-[project].txt.

asm 9.0:https://gitlab.ow2.org , BSD-3-Clause
antlr4-runtime 4.5.1: http://www.antlr.org/license.html, BSD-3-Clause
jline 0.9.94: http://mvnrepository.com/artifact/jline/jline/0.9.94, BSD
Google: protobuf-java 3.13.0: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
Google: protobuf-java-util 3.12.4: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
reflectasm 1.11.7: https://github.com/EsotericSoftware/reflectasm , BSD-3-Clause

proto files from gogo: https://github.com/gogo/protobuf BSD-2
proto files from grpc-gateway, https://github.com/grpc-ecosystem/grpc-gateway/tree/master/protoc-gen-swagger/options BSD-3
zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause
postgresql 42.2.18: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause
LatencyUtils 2.0.3: https://github.com/LatencyUtils/LatencyUtils, BSD-2-Clause
Expand Down Expand Up @@ -398,7 +393,6 @@ EPL licenses
The following components are provided under the EPL License. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.

aspectjweaver 1.8.6: http://central.maven.org/maven2/org/aspectj/aspectjweaver/1.8.6/aspectjweaver-1.8.6.pom , EPL 1.0
logback 1.1.11: https://github.com/qos-ch/logback: EPL 1.0

========================================================================
Expand All @@ -408,7 +402,6 @@ CDDL licenses
The following components are provided under the CDDL License. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.

jersey 1.19.1: https://github.com/jersey/jersey , CDDL 1.1 and GPL 2.0
jsr311-api 1.1.1: http://central.maven.org/maven2/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.pom , CDDL 1.1

========================================================================
Expand Down
70 changes: 0 additions & 70 deletions dist-material/release-docs/licenses/LICENSE-aspectjweaver.txt

This file was deleted.

13 changes: 0 additions & 13 deletions dist-material/release-docs/licenses/LICENSE-fastjson.txt

This file was deleted.

Loading

0 comments on commit 559b88a

Please sign in to comment.