Commit b1dd400
Backport fix AspectJ pointcut syntax
Backport of: "Fix AspectJ pointcut syntax (#5058)"
AspectJ pointcuts use the `&&` and `!` operators and the alternative
word form syntax with `and` and `not` operators is only allowed for
load-time weaving with `aop.xml` which cannot use the symbols in the XML.
This fixes compile-time weaving support which failed on the `and not`
syntax.
Closes gh-5285
Backport-Issue: gh-5058
Co-authored-by: Jonatan Ivanov <[email protected]>1 parent 7794bea commit b1dd400
File tree
3 files changed
+3
-3
lines changed- micrometer-core/src/main/java/io/micrometer/core/aop
- micrometer-observation/src/main/java/io/micrometer/observation/aop
3 files changed
+3
-3
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
167 | 167 | | |
168 | 168 | | |
169 | 169 | | |
170 | | - | |
| 170 | + | |
171 | 171 | | |
172 | 172 | | |
173 | 173 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
161 | 161 | | |
162 | 162 | | |
163 | 163 | | |
164 | | - | |
| 164 | + | |
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | | - | |
| 108 | + | |
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| |||
0 commit comments