diff options
| author | Andy Clement <aclement@pivotal.io> | 2021-11-15 09:54:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 09:54:30 -0800 |
| commit | 37773d026ac7d3de2e7cdb8a946a8c57a5050439 (patch) | |
| tree | 17d28c22d98e3ecceb90f46a219c001f66296aab | |
| parent | 0f85ca109b9e6ab849e201e76f62d5023cbfcb98 (diff) | |
| parent | 2998309ea2f8e746a55926ff73215b93bbadfb80 (diff) | |
| download | aspectj-37773d026ac7d3de2e7cdb8a946a8c57a5050439.tar.gz aspectj-37773d026ac7d3de2e7cdb8a946a8c57a5050439.zip | |
Merge pull request #98 from kriegaex/release-198
Make AspectJ Ant task compatible with Java 16, 17
| -rw-r--r-- | pom.xml | 38 | ||||
| -rw-r--r-- | taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java | 6 |
2 files changed, 8 insertions, 36 deletions
@@ -68,22 +68,8 @@ </releases> </repository> <repository> - <id>aspectj-dev</id> - <name>AspectJ artifacts on aspectj.dev</name> - <url>https://aspectj.dev/maven</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - </repository> - <repository> - <id>ossrh-snapshots-classic</id> - <name>Sonatype OSSRH snapshots classic</name> + <id>ossrh-snapshots</id> + <name>Sonatype OSSRH snapshots</name> <url>https://oss.sonatype.org/content/repositories/snapshots</url> <layout>default</layout> <snapshots> @@ -96,23 +82,9 @@ </releases> </repository> <repository> - <id>ossrh-snapshots-new</id> - <name>Sonatype OSSRH snapshots new</name> - <url> https://s01.oss.sonatype.org/content/repositories/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - </repository> - <repository> - <id>ossrh-snapshots</id> - <name>Sonatype OSSRH snapshots</name> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> + <id>aspectj-dev</id> + <name>AspectJ artifacts on aspectj.dev</name> + <url>https://aspectj.dev/maven</url> <layout>default</layout> <snapshots> <enabled>true</enabled> diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java index 218fc56d5..a515f8e78 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java @@ -250,9 +250,9 @@ public class AjcTask extends MatchingTask { public static final String COMMAND_EDITOR_NAME = AjcTask.class.getName() + ".COMMAND_EDITOR"; - static final String[] TARGET_INPUTS = new String[] { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", "10", "11", "12", "13", "14", "15" }; - static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", "10", "11", "12", "13", "14", "15" }; - static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8", "-1.9", "-9", "-10", "-11", "-12", "-13", "-14", "15" }; + static final String[] TARGET_INPUTS = new String[] { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", "10", "11", "12", "13", "14", "15", "16", "17" }; + static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", "10", "11", "12", "13", "14", "15", "16", "17" }; + static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8", "-1.9", "-9", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17" }; private static final ICommandEditor COMMAND_EDITOR; |