Skip to content

Commit ef51f6f

Browse files
eyalkoreneyalkoren
authored
Adding NOTICE and LICENSE (#621)
1 parent fbea034 commit ef51f6f

File tree

20 files changed

+707
-58
lines changed

20 files changed

+707
-58
lines changed

‎license/apache2_license/LICENSE.txt renamed to ‎LICENSE

File renamed without changes.

‎NOTICE

Lines changed: 361 additions & 0 deletions
Large diffs are not rendered by default.

‎apm-agent-api/pom.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
<apm-agent-parent.base.dir>${project.basedir}/..</apm-agent-parent.base.dir>
55
</properties>
66

7+
<licenses>
8+
<license>
9+
<name>The Apache Software License, Version 2.0</name>
10+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
11+
</license>
12+
</licenses>
13+
714
<parent>
815
<artifactId>apm-agent-parent</artifactId>
916
<groupId>co.elastic.apm</groupId>
@@ -15,7 +22,34 @@
1522
<name>${project.groupId}:${project.artifactId}</name>
1623

1724
<build>
25+
<resources>
26+
<resource>
27+
<directory>${apm-agent-parent.base.dir}</directory>
28+
<includes>
29+
<include>LICENSE</include>
30+
</includes>
31+
<targetPath>META-INF</targetPath>
32+
</resource>
33+
<resource>
34+
<directory>src/main/resources/META-INF</directory>
35+
<targetPath>META-INF</targetPath>
36+
</resource>
37+
</resources>
1838
<plugins>
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-source-plugin</artifactId>
42+
<version>3.0.1</version>
43+
<executions>
44+
<execution>
45+
<id>generate-source-jar</id>
46+
<phase>package</phase>
47+
<goals>
48+
<goal>jar-no-fork</goal>
49+
</goals>
50+
</execution>
51+
</executions>
52+
</plugin>
1953
<plugin>
2054
<groupId>org.apache.maven.plugins</groupId>
2155
<artifactId>maven-jar-plugin</artifactId>

‎apm-agent-api/src/main/resources/META-INF/NOTICE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Elastic APM Java Agent Instrumentation API
2+
Copyright 2018-2019 Elasticsearch B.V.
3+

‎apm-agent-attach/pom.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

10+
<licenses>
11+
<license>
12+
<name>The Apache Software License, Version 2.0</name>
13+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
14+
</license>
15+
</licenses>
16+
1017
<properties>
1118
<apm-agent-parent.base.dir>${project.basedir}/..</apm-agent-parent.base.dir>
1219
</properties>
@@ -31,6 +38,20 @@
3138

3239
<build>
3340
<plugins>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-source-plugin</artifactId>
44+
<version>3.0.1</version>
45+
<executions>
46+
<execution>
47+
<id>generate-source-jar</id>
48+
<phase>prepare-package</phase>
49+
<goals>
50+
<goal>jar-no-fork</goal>
51+
</goals>
52+
</execution>
53+
</executions>
54+
</plugin>
3455
<plugin>
3556
<groupId>org.apache.maven.plugins</groupId>
3657
<artifactId>maven-dependency-plugin</artifactId>
@@ -83,6 +104,14 @@
83104
<Can-Retransform-Classes>true</Can-Retransform-Classes>
84105
</manifestEntries>
85106
</transformer>
107+
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
108+
<resource>META-INF/NOTICE</resource>
109+
<file>resources/NOTICE</file>
110+
</transformer>
111+
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
112+
<resource>META-INF/LICENSE</resource>
113+
<file>${apm-agent-parent.base.dir}/LICENSE</file>
114+
</transformer>
86115
</transformers>
87116
</configuration>
88117
</execution>

‎elastic-apm-agent/src/main/resources/META-INF/LICENSE renamed to ‎apm-agent-attach/resources/NOTICE

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Elastic APM Java Agent Attach Tool
2+
Copyright 2018-2019 Elasticsearch B.V.
3+
4+
This tool includes software from Byte Buddy, under the Apache License 2.0
5+
Copyright 2014 - 2019 Rafael Winterhalter
6+
7+
18
Apache License
29
Version 2.0, January 2004
310
http://www.apache.org/licenses/
@@ -178,15 +185,15 @@
178185
APPENDIX: How to apply the Apache License to your work.
179186

180187
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "[]"
188+
boilerplate notice, with the fields enclosed by brackets "{}"
182189
replaced with your own identifying information. (Don't include
183190
the brackets!) The text should be enclosed in the appropriate
184191
comment syntax for the file format. We also recommend that a
185192
file or class name and description of purpose be included on the
186193
same "printed page" as the copyright notice for easier
187194
identification within third-party archives.
188195

189-
Copyright 2018 - 2019 Elasticsearch BV
196+
Copyright {yyyy} {name of copyright owner}
190197

191198
Licensed under the Apache License, Version 2.0 (the "License");
192199
you may not use this file except in compliance with the License.
@@ -199,13 +206,3 @@
199206
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200207
See the License for the specific language governing permissions and
201208
limitations under the License.
202-
203-
===============================================
204-
= Non-Apache 2.0 licenses of bundled products =
205-
===============================================
206-
207-
This product bundles dsl-json, which is available under a "3-clause BSD" license.
208-
For details, see https://github.com/ngs-doo/dsl-json/blob/master/LICENSE.
209-
210-
This product bundles slf4j, which is available under a "MIT" license.
211-
For details, see https://www.slf4j.org/license.html.

‎apm-agent-core/src/main/java/co/elastic/apm/agent/bci/bytebuddy/CustomElementMatchers.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ public boolean matches(@Nullable ProtectionDomain protectionDomain) {
184184
}
185185

186186
/**
187-
* Based on <a href="https://gist.github.com/brianguertin/ada4b65c6d1c4f6d3eee3c12b6ce021b">https://gist.github.com/brianguertin</a>
187+
* Based on <a href="https://gist.github.com/brianguertin/ada4b65c6d1c4f6d3eee3c12b6ce021b">https://gist.github.com/brianguertin</a>.
188+
* This code was released into the public domain by Brian Guertin on July 8, 2016 citing, verbatim the unlicense.
188189
*/
189190
private static class Version implements Comparable<Version> {
190191
private final int[] numbers;

‎apm-agent-core/src/main/resources/META-INF/NOTICE

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎apm-agent-core/src/test/java/co/elastic/apm/agent/metrics/builtin/SystemMetricsTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626

2727
import co.elastic.apm.agent.metrics.MetricRegistry;
2828
import co.elastic.apm.agent.report.ReporterConfiguration;
29-
import org.junit.jupiter.api.Disabled;
3029
import org.junit.jupiter.api.Test;
3130

3231
import java.util.Collections;
3332

3433
import static org.assertj.core.api.Assertions.assertThat;
3534
import static org.mockito.Mockito.mock;
36-
@Disabled
35+
3736
class SystemMetricsTest {
3837

3938
private MetricRegistry metricRegistry = new MetricRegistry(mock(ReporterConfiguration.class));

‎apm-agent-plugins/apm-servlet-plugin/src/main/resources/META-INF/NOTICE

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎apm-agent-plugins/apm-web-plugin/src/main/resources/META-INF/NOTICE

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎apm-opentracing/pom.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

10+
<licenses>
11+
<license>
12+
<name>The Apache Software License, Version 2.0</name>
13+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
14+
</license>
15+
</licenses>
16+
1017
<properties>
1118
<apm-agent-parent.base.dir>${project.basedir}/..</apm-agent-parent.base.dir>
1219
</properties>
@@ -41,7 +48,34 @@
4148
</dependencies>
4249

4350
<build>
51+
<resources>
52+
<resource>
53+
<directory>${apm-agent-parent.base.dir}</directory>
54+
<includes>
55+
<include>LICENSE</include>
56+
</includes>
57+
<targetPath>META-INF</targetPath>
58+
</resource>
59+
<resource>
60+
<directory>src/main/resources/META-INF</directory>
61+
<targetPath>META-INF</targetPath>
62+
</resource>
63+
</resources>
4464
<plugins>
65+
<plugin>
66+
<groupId>org.apache.maven.plugins</groupId>
67+
<artifactId>maven-source-plugin</artifactId>
68+
<version>3.0.1</version>
69+
<executions>
70+
<execution>
71+
<id>generate-source-jar</id>
72+
<phase>package</phase>
73+
<goals>
74+
<goal>jar-no-fork</goal>
75+
</goals>
76+
</execution>
77+
</executions>
78+
</plugin>
4579
<plugin>
4680
<groupId>org.apache.maven.plugins</groupId>
4781
<artifactId>maven-jar-plugin</artifactId>

0 commit comments

Comments
 (0)