This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new bca62f6 Openapi-definitions file loader fix (#7417)
bca62f6 is described below
commit bca62f63fa0c57bf3bb5d8ebde9d6969b55b8429
Author: Halil Onur Çeçen <[email protected]>
AuthorDate: Sat Aug 7 04:53:48 2021 +0300
Openapi-definitions file loader fix (#7417)
* excluded openapi-definitions resource folder
jar class loader comes before runtime config folder
* update CHANGES.md
* include openapi-definitions folder in bin packages.
Co-authored-by: Halil Onur Cecen <[email protected]>
---
CHANGES.md | 1 +
apm-dist-es7/src/main/assembly/binary-es7.xml | 1 +
apm-dist/src/main/assembly/binary.xml | 1 +
oap-server/server-bootstrap/pom.xml | 1 +
4 files changed, 4 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index abbd7af..53a3e47 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ Release Notes.
* Add `event` http receiver
* Support Metric level function `serviceRelation` in `MAL`.
* Support envoy metrics binding into the topology.
+* Fix openapi-definitions folder not being read correctly.
#### UI
diff --git a/apm-dist-es7/src/main/assembly/binary-es7.xml
b/apm-dist-es7/src/main/assembly/binary-es7.xml
index 337217b..049c0ff 100644
--- a/apm-dist-es7/src/main/assembly/binary-es7.xml
+++ b/apm-dist-es7/src/main/assembly/binary-es7.xml
@@ -63,6 +63,7 @@
<include>envoy-metrics-rules/*.yaml</include>
<include>meter-analyzer-config/*.yaml</include>
<include>zabbix-rules/*.yaml</include>
+ <include>openapi-definitions/*</include>
<include>otel-oc-rules/*</include>
<include>ui-initialized-templates/*</include>
<include>lal/*</include>
diff --git a/apm-dist/src/main/assembly/binary.xml
b/apm-dist/src/main/assembly/binary.xml
index 562fe8b..bd8093f 100644
--- a/apm-dist/src/main/assembly/binary.xml
+++ b/apm-dist/src/main/assembly/binary.xml
@@ -63,6 +63,7 @@
<include>envoy-metrics-rules/*.yaml</include>
<include>meter-analyzer-config/*.yaml</include>
<include>zabbix-rules/*.yaml</include>
+ <include>openapi-definitions/*</include>
<include>otel-oc-rules/*</include>
<include>ui-initialized-templates/*</include>
<include>lal/*</include>
diff --git a/oap-server/server-bootstrap/pom.xml
b/oap-server/server-bootstrap/pom.xml
index af09132..a9e8964 100644
--- a/oap-server/server-bootstrap/pom.xml
+++ b/oap-server/server-bootstrap/pom.xml
@@ -280,6 +280,7 @@
<exclude>fetcher-prom-rules/</exclude>
<exclude>envoy-metrics-rules/</exclude>
<exclude>meter-analyzer-config/</exclude>
+ <exclude>openapi-definitions/</exclude>
<exclude>otel-oc-rules/</exclude>
<exclude>ui-initialized-templates/</exclude>
<exclude>zabbix-rules/</exclude>
