diff options
| author | Andy Clement <aclement@pivotal.io> | 2017-11-09 13:14:02 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2017-11-09 13:14:02 -0800 |
| commit | d92319c43f5723d57887e09f2a839ee5b595fcfd (patch) | |
| tree | 155e25d455e598ff5b55b0563645d4af23903bb4 /tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml | |
| parent | 6765fdc34c775e99799b36d88cff8ab88dffc8e7 (diff) | |
| download | aspectj-d92319c43f5723d57887e09f2a839ee5b595fcfd.tar.gz aspectj-d92319c43f5723d57887e09f2a839ee5b595fcfd.zip | |
Updates to better cope with future JDKs
The version handling in LangUtil has been overhauled
to cope better with post 1.8 releases (JDK9 and JDK10 or 18.3
or whatever they call it). As part of this moved
to treating JDK9 as '9' rather than '1.9'. Also removed
duplicate version processing logic and had that defer to
the one place in LangUtil where we now deal with it.
Includes some generics tidyup in ajdoc. More ajdoc work
is necessary for Java10 because it removes the standard doclet
(old style). However trying to invoke the internal Javadoc
handler in Java10 is failing due to module visibility rules.
Diffstat (limited to 'tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml index 8011cd68f..38f46c7d6 100644 --- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml +++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml @@ -258,9 +258,9 @@ <run class="AnnoBinding2"> <stdout> <line text="get(int AnnoBinding2.field1) @Marker(message=foo)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> -<line text="get(int AnnoBinding2.field1) @Marker(message="foo")" vm="1.9"/> +<line text="get(int AnnoBinding2.field1) @Marker(message="foo")" vm="9+"/> <line text="get(int AnnoBinding2.field2) @Marker(message=bar)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> -<line text="get(int AnnoBinding2.field2) @Marker(message="bar")" vm="1.9"/> +<line text="get(int AnnoBinding2.field2) @Marker(message="bar")" vm="9+"/> <line text="2 ajc$anno$NNN fields"/> </stdout> </run> |