From: Andy Clement Date: Wed, 28 Jun 2017 05:31:17 +0000 (-0700) Subject: compatibility with JDK 190 build 175 X-Git-Tag: V1_9_0_RC3~2^2~87 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d159d8d96ba83edca8ca7aefdd1ad785912f9164;p=aspectj.git compatibility with JDK 190 build 175 --- diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java index a94def3f6..fae1aadd3 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java @@ -157,8 +157,8 @@ public class BuildArgParser extends Main { // TODO fix org.eclipse.jdt.internal.compiler.batch.Main so this hack isn't needed javaArgList.add("-classpath"); javaArgList.add(parser.classpath == null ? System.getProperty("user.dir") : parser.classpath); - javaArgList.add("-bootclasspath"); - javaArgList.add(parser.bootclasspath == null ? System.getProperty("user.dir") : parser.bootclasspath); +// javaArgList.add("-bootclasspath"); +// javaArgList.add(parser.bootclasspath == null ? System.getProperty("user.dir") : parser.bootclasspath); javaArgList.addAll(parser.getUnparsedArgs()); super.configure(javaArgList.toArray(new String[javaArgList.size()])); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties index 58448d3bf..920718aff 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties @@ -13,7 +13,133 @@ compiler.copyright = ## configure.version = AspectJ Compiler 1.1 configure.directoryNotExist = invalid option: {0} -## 3456789012345678901234567890123456789012345678901234567890123456789012345 + +### compile +compile.repetition = [repetition {0}/{1}] +compile.instantTime = [compiled {0} lines in {1} ms: {2} lines/s] +compile.detailedTime = [parse: {0} ms ({1}%), resolve: {2} ms ({3}%), analyze: {4} ms ({5}%), generate: {6} ms ({7}%) ] +compile.ioTime = [i/o: read: {0} ms ({1}%), write: {2} ms ({3}%)] +compile.averageTime = [average, excluding min-max {0} lines in {1} ms: {2} lines/s] +compile.totalTime = [total compilation time: {0}] +compile.oneProblem = 1 problem ({0}) +compile.severalProblemsErrorsOrWarnings = {0} problems ({1}) +compile.severalProblemsErrorsAndWarnings = {0} problems ({1}, {2}) +compile.severalProblems = {0} problems ({1}, {2}, {3}) +compile.oneError = 1 error +compile.severalErrors = {0} errors +compile.oneWarning = 1 warning +compile.severalWarnings = {0} warnings +compile.oneInfo = 1 info +compile.severalInfos = {0} info +compile.oneClassFileGenerated = [1 .class file generated] +compile.severalClassFilesGenerated = [{0} .class files generated] + +### configure +configure.requiresJDK1.2orAbove = Need to use a JVM >= 1.2 +configure.duplicateLog = duplicate log specification: {0} +configure.duplicateRepeat = duplicate repeat specification: {0} +configure.duplicateMaxProblems = duplicate max problems specification: {0} +configure.duplicateCompliance = duplicate compliance setting specification: {0} +configure.duplicateSource = duplicate source compliance setting specification: {0} +configure.duplicateTarget = duplicate target compliance setting specification: {0} +configure.source = source level should be comprised in between ''1.3'' and ''1.9'' (or ''5'', ''5.0'', ..., ''9'' or ''9.0''): {0} +configure.invalidSystem = invalid location for system libraries +configure.unsupportedOption = option {0} not supported at compliance level 9 and above +configure.duplicateOutputPath = duplicate output path specification: {0} +configure.duplicateModulePath = duplicate module path specification: {0} +configure.duplicateModuleSourcepath = duplicate source module path specification: {0} +configure.invalidModuleDescriptor = cannot open the module descriptor from {0} +configure.invalidModuleOption = incorrectly formatted option: {0} +configure.duplicateExport = can specify a package in a module only once with --add-export +configure.duplicateBootClasspath = duplicate bootclasspath specification: {0} +configure.duplicateExtDirs = duplicate extdirs specification: {0} +configure.duplicateSourcepath = duplicate sourcepath specification: {0} +configure.invalidDebugOption = invalid debug option: {0} +configure.invalidWarningConfiguration = invalid warning configuration: ''{0}'' +configure.invalidWarning = invalid warning token: ''{0}''. Ignoring warning and compiling +configure.invalidWarningOption = invalid warning option: ''{0}''. Must specify a warning token +configure.targetJDK = target JDK should be comprised in between ''1.1'' and ''1.4'': {0} +configure.incompatibleTargetForSource14 = ''1.4'' source mode requires ''-target 1.4'' : {0} +configure.incompatibleComplianceForSource14 = ''1.4'' source mode requires ''-1.4'' compliance mode: {0} +configure.incompatibleComplianceForTarget14 = ''1.4'' target mode requires ''-1.4'' compliance mode: {0} +configure.incompatibleComplianceForTarget11 = ''1.1'' target mode requires ''-1.3'' compliance mode: {0} +configure.incompatibleComplianceForTarget = Compliance level ''{0}'' is incompatible with target level ''{1}''. A compliance level ''{1}'' or better is required +configure.repetition = repetition must be a positive integer: {0} +configure.maxProblems = max problems must be a positive integer: {0} +configure.invalidNowarnOption = invalid syntax for nowarn option: {0} + +configure.invalidErrorConfiguration = invalid error configuration: ''{0}'' +configure.invalidError = invalid error token: ''{0}''. Ignoring this error token and compiling +configure.invalidErrorOption = invalid error option: ''{0}''. Must specify an error token + +configure.invalidInfoConfiguration = invalid info configuration: ''{0}'' +configure.invalidInfo = invalid info token: ''{0}''. Ignoring this info token and compiling +configure.invalidInfoOption = invalid info option: ''{0}''. Must specify an info token + +configure.directoryNotExist = directory does not exist: {0} +configure.IOError = i/o error : unable to retrieve .JAVA files in directory: {0} +configure.unrecognizedOption = Unrecognized option : {0} +configure.noClasspath = no classpath defined, using default directory instead +configure.incorrectClasspath = incorrect classpath: {0} +configure.invalidexpansionargumentname = expansion argument file {0} does not exist or cannot be read +configure.cannotOpenLog = cannot open .log file: {0} +configure.cannotOpenLogInvalidEncoding = cannot open .log file: {0}; because UTF-8 is not supported +configure.unexpectedCustomEncoding = unexpected custom encoding specification: {0}[{1}] +configure.unsupportedEncoding = unsupported encoding format: {0} +configure.duplicateDefaultEncoding = duplicate default encoding format specification: {0} +configure.invalidTaskTag ={0} is an invalid task tag +configure.incorrectExtDirsEntry = incorrect ext dir entry; {0} must be a directory +configure.incorrectEndorsedDirsEntry = incorrect endorsed dir entry; {0} must be a directory +configure.duplicateEndorsedDirs = duplicate endorseddirs specification: {0} +configure.missingDestinationPath = destination path must be provided with module source path +configure.incorrectDestinationPathEntry = incorrect destination path entry: {0} +configure.unexpectedBracket = unexpected bracket: {0} +configure.unexpectedDestinationPathEntry = unexpected destination path entry in {0} option +configure.unexpectedDestinationPathEntryFile = unexpected destination path entry for file: {0} +configure.accessRuleAfterDestinationPath = access rules cannot follow destination path entries: {0} +configure.duplicateDestinationPathEntry = duplicate destination path entry in {0} option +configure.invalidClassName = invalid class name: {0} +configure.unavailableAPT = Unable to load annotation processing manager {0} from classpath. +configure.incorrectVMVersionforAPT = Annotation processing got disabled, since it requires a 1.6 compliant JVM +configure.incompatibleSourceForCldcTarget=Target level ''{0}'' is incompatible with source level ''{1}''. A source level ''1.3'' or lower is required +configure.incompatibleComplianceForCldcTarget=Target level ''{0}'' is incompatible with compliance level ''{1}''. A compliance level ''1.4''or lower is required +configure.invalidClasspathSection = invalid Class-Path header in manifest of jar file: {0} +configure.multipleClasspathSections = multiple Class-Path headers in manifest of jar file: {0} +configure.missingwarningspropertiesfile=properties file {0} does not exist +configure.ioexceptionwarningspropertiesfile=An IOException occurred while reading the properties file {0} +configure.multipleencodings=Multiple encoding specified: {1}. The default encoding has been set to {0} +configure.differentencodings=Found encoding {0}. Different encodings were specified: {1} +configure.differentencoding=Found encoding {0}. A different encoding was specified: {1} + +### null annotations +configure.invalidNullAnnot = Token {0} is not in the expected format "nullAnnot( | | )" +configure.missingAnnotationPath = Missing argument to -annotationpath at ''{0}'' + +### requestor +requestor.error = {0}. ERROR in {1} +requestor.warning = {0}. WARNING in {1} +requestor.info = {0}. INFO in {1} +requestor.extraerror = {0}. ERROR: +requestor.extrawarning = {0}. WARNING: +requestor.extrainfo = {0}. INFO: +requestor.notRetrieveErrorMessage = Cannot retrieve the error message for {0} +requestor.noFileNameSpecified = (original file name is not available) + +### EMACS STYLE +output.emacs.error=error +output.emacs.warning=warning +output.emacs.info=info + +### unit +unit.more = File {0} is specified more than once +unit.missing = File {0} is missing + +### output +output.noClassFileCreated = No .class file created for file {1} in {0} because of an IOException: {2} + +### miscellaneous +misc.version = {0} {1}, {2} + ### miscellaneous misc.usage = {0}\n\ \n\ @@ -49,7 +175,7 @@ Standard Eclipse compiler options:\n\ \ Options enabled by default are prefixed with ''+''\n\ \ \n\ \ Classpath options:\n\ -\ -cp -classpath \n\ +\ -cp -classpath \n\ \ specify location for application classes and sources\n\ \ -bootclasspath \n\ \ specify location for system classes\n\ @@ -59,18 +185,21 @@ Standard Eclipse compiler options:\n\ \ when suffixed with ''['''']'' (e.g. X.java[utf8])\n\ \ \n\ \ Compliance options:\n\ -\ -1.3 use 1.3 compliance level (implicit -source 1.3 -target 1.1)\n\ -\ -1.4 + use 1.4 compliance level\n\ +\ -1.3 use 1.3 compliance (-source 1.3 -target 1.1)\n\ +\ -1.4 + use 1.4 compliance (-source 1.3 -target 1.2)\n\ \ -1.5 -5 -5.0 use 1.5 compliance (-source 1.5 -target 1.5)\n\ \ -1.6 -6 -6.0 use 1.6 compliance (-source 1.6 -target 1.6)\n\ \ -1.7 -7 -7.0 use 1.7 compliance (-source 1.7 -target 1.7)\n\ \ -1.8 -8 -8.0 use 1.8 compliance (-source 1.8 -target 1.8)\n\ \ -1.9 -9 -9.0 use 1.9 compliance (-source 1.9 -target 1.9)\n\ -\ -source set source level: 1.3 to 1.9 (or 5, 5.0, etc)\n\ -\ -target set classfile target: 1.1 to 1.9 (or 5, 5.0, etc)\n\ +\ -source set source level: 1.3 to 1.9 (or 6, 6.0, etc)\n\ +\ -target set classfile target: 1.1 to 1.9 (or 6, 6.0, etc)\n\ +\ cldc1.1 can also be used to generate the StackMap\n\ +\ attribute\n\ \ \n\ \ Warning options:\n\ -\ -deprecation + deprecation outside deprecated code\n\ +\ -deprecation + deprecation outside deprecated code (equivalent to\n\ +\ -warn:+deprecation)\n\ \ -nowarn -warn:none disable all warnings\n\ \ -warn: enable exactly the listed warnings\n\ \ -warn:+ enable additional warnings\n\ @@ -93,6 +222,8 @@ Standard Eclipse compiler options:\n\ \ emptyBlock undocumented empty block\n\ \ enumIdentifier ''enum'' used as identifier\n\ \ enumSwitch incomplete enum switch\n\ +\ enumSwitchPedantic + report missing enum switch cases even\n\ +\ in the presence of a default case\n\ \ fallthrough possible fall-through case\n\ \ fieldHiding field hiding another variable\n\ \ finalBound type parameter with final bound\n\ @@ -104,20 +235,53 @@ Standard Eclipse compiler options:\n\ \ includeAssertNull raise null warnings for variables\n\ \ that got tainted in an assert expression\n\ \ indirectStatic indirect reference to static member\n\ +\ inheritNullAnnot inherit null annotations\n\ \ intfAnnotation + annotation type used as super interface\n\ \ intfNonInherited + interface non-inherited method compatibility\n\ \ intfRedundant find redundant superinterfaces\n\ +\ invalidJavadoc all warnings for malformed javadoc tags\n\ +\ invalidJavadocTag validate javadoc tag arguments\n\ +\ invalidJavadocTagDep validate deprecated references in javadoc tag args\n\ +\ invalidJavadocTagNotVisible validate non-visible references in javadoc\n\ +\ tag args\n\ +\ invalidJavadocVisibility() specify visibility modifier\n\ +\ for malformed javadoc tag warnings\n\ \ javadoc invalid javadoc\n\ \ localHiding local variable hiding another variable\n\ \ maskedCatchBlock + hidden catch block\n\ +\ missingJavadocTags missing Javadoc tags\n\ +\ missingJavadocTagsOverriding missing Javadoc tags in overriding methods\n\ +\ missingJavadocTagsMethod missing Javadoc tags for method type parameter\n\ +\ missingJavadocTagsVisibility() specify visibility modifier\n\ +\ for missing javadoc tags warnings\n\ +\ missingJavadocComments missing Javadoc comments\n\ +\ missingJavadocCommentsOverriding missing Javadoc tags in overriding\n\ +\ methods\n\ +\ missingJavadocCommentsVisibility() specify visibility\n\ +\ modifier for missing javadoc comments warnings\n\ \ nls string literal lacking non-nls tag //$NON-NLS-$\n\ \ noEffectAssign + assignment without effect\n\ \ null potential missing or redundant null check\n\ +\ nullAnnot() annotation based null analysis,\n\ +\ nullable|nonnull|nonnullbydefault annotation types\n\ +\ optionally specified using fully qualified names.\n\ +\ Enabling this option enables all null-annotation\n\ +\ related sub-options. These can be individually\n\ +\ controlled using options listed below.\n\ +\ nullAnnotConflict conflict between null annotation specified\n\ +\ and nullness inferred. Is effective only with\n\ +\ nullAnnot option enabled.\n\ +\ nullAnnotRedundant redundant specification of null annotation. Is\n\ +\ effective only with nullAnnot option enabled.\n\ \ nullDereference + missing null check\n\ +\ nullUncheckedConversion unchecked conversion from non-annotated type\n\ +\ to @NonNull type. Is effective only with\n\ +\ nullAnnot option enabled.\n\ \ over-ann missing @Override annotation (superclass)\n\ \ paramAssign assignment to a parameter\n\ \ pkgDefaultMethod + attempt to override package-default method\n\ \ raw + usage of raw type\n\ +\ resource + (pot.) unsafe usage of resource of type Closeable\n\ \ semicolon unnecessary semicolon, empty statement\n\ \ serial + missing serialVersionUID\n\ \ specialParamHiding constructor or setter parameter hiding a field\n\ @@ -126,27 +290,45 @@ Standard Eclipse compiler options:\n\ \ staticReceiver + non-static reference to static member\n\ \ super overriding a method without making a super invocation\n\ \ suppress + enable @SuppressWarnings\n\ -\ When used with -err:, it can also silent optional\n\ +\ When used with -err:, it can also silence optional\n\ \ errors and warnings\n\ +\ switchDefault switch statement lacking a default case\n\ \ syncOverride missing synchronized in synchr. method override\n\ +\ syntacticAnalysis perform syntax-based null analysis for fields\n\ \ syntheticAccess synthetic access for innerclass\n\ \ tasks() tasks identified by tags inside comments\n\ \ typeHiding + type parameter hiding another type\n\ \ unavoidableGenericProblems + ignore unavoidable type safety problems\n\ \ due to raw APIs\n\ \ unchecked + unchecked type operation\n\ +\ unlikelyCollectionMethodArgumentType\n\ +\ + unlikely argument type for collection method\n\ +\ declaring an Object parameter\n\ +\ unlikelyEqualsArgumentType unlikely argument type for method equals()\n\ \ unnecessaryElse unnecessary else clause\n\ \ unqualifiedField unqualified reference to field\n\ \ unused macro for unusedAllocation, unusedArgument,\n\ \ unusedImport, unusedLabel, unusedLocal,\n\ -\ unusedPrivate, unusedThrown, and unusedTypeArgs\n\ +\ unusedPrivate, unusedThrown, and unusedTypeArgs,\n\ +\ unusedExceptionParam\n\ \ unusedAllocation allocating an object that is not used\n\ \ unusedArgument unread method parameter\n\ +\ unusedExceptionParam unread exception parameter\n\ \ unusedImport + unused import declaration\n\ \ unusedLabel + unused label\n\ \ unusedLocal + unread local variable\n\ +\ unusedParam unused parameter\n\ +\ unusedParamOverriding unused parameter for overriding method\n\ +\ unusedParamImplementing unused parameter for implementing method\n\ +\ unusedParamIncludeDoc unused parameter documented in comment tag\n\ \ unusedPrivate + unused private member declaration\n\ \ unusedThrown unused declared thrown exception\n\ +\ unusedThrownWhenOverriding unused declared thrown exception in \n\ +\ overriding method\n\ +\ unusedThrownIncludeDocComment unused declared thrown exception,\n\ +\ documented in a comment tag\n\ +\ unusedThrownExemptExceptionThrowable unused declared thrown exception,\n\ +\ exempt Exception and Throwable\n\ \ unusedTypeArgs + unused type arguments for method and constructor\n\ \ uselessTypeCheck unnecessary cast/instanceof operation\n\ \ varargsCast + varargs argument need explicit cast\n\ @@ -220,75 +402,3 @@ scanning.start = Collecting source files inside {0} ### progress progress.compiling = Compiling -### compile -compile.repetition = [repetition {0}/{1}] -compile.instantTime = [compiled {0} lines in {1} ms: {2} lines/s] -compile.averageTime = [average, excluding min-max {0} lines in {1} ms: {2} lines/s] -compile.totalTime = [total compilation time: {0}] -compile.oneProblem = 1 problem ({0}) -compile.severalProblemsErrorsOrWarnings = {0} problems ({1}) -compile.severalProblemsErrorsAndWarnings = {0} problems ({1}, {2}) -compile.oneError = 1 error -compile.severalErrors = {0} errors -compile.oneWarning = 1 warning -compile.severalWarnings = {0} warnings -compile.oneClassFileGenerated = [1 .class file generated] -compile.severalClassFilesGenerated = [{0} .class files generated] - -#compile.repetition = Repetition {0}/{1} -#compile.instantTime = Compiled {0} lines in {1} ms ({2} lines/s) -#compile.totalTime = Total compilation time: {0} -#compile.oneProblem = 1 problem -#compile.severalProblems = {0} problems -#compile.oneError = 1 error -#compile.severalErrors = {0} errors -#compile.oneWarning = 1 warning -#compile.severalWarnings = {0} warnings -#compile.oneClassFileGenerated = 1 .class file generated -#compile.severalClassFilesGenerated = {0} .class files generated - -### configure -configure.requiresJDK1.2orAbove = Need to use a JVM >= 1.2 -configure.duplicateLog = duplicate log specification: {0} -configure.duplicateRepeat = duplicate repeat specification: {0} -configure.duplicateCompliance = duplicate compliance setting specification: {0} -configure.source = invalid source option, source is in the range ''1.3'' > ''1.9'': {0} -configure.duplicateOutputPath = duplicate output path specification: {0} -configure.duplicateBootClasspath = duplicate bootclasspath specification: {0} -configure.invalidDebugOption = invalid debug option: {0} -configure.invalidWarningConfiguration = invalid warning configuration: {0} -configure.invalidWarning = invalid warning: {0} -configure.invalidWarningOption = invalid warning option: {0} -configure.targetJDK = target JDK should be comprised in between ''1.1'' and ''1.4'': {0} -configure.incompatibleTargetForSource14 = ''1.4'' source mode requires ''-target 1.4'' : {0} -configure.incompatibleComplianceForSource14 = ''1.4'' source mode requires ''-1.4'' compliance mode: {0} -configure.incompatibleComplianceForTarget14 = ''1.4'' target mode requires ''-1.4'' compliance mode: {0} -configure.incompatibleComplianceForTarget11 = ''1.1'' target mode requires ''-1.3'' compliance mode: {0} -configure.incompatibleComplianceForTarget = Compliance level ''{0}'' is incompatible with target level ''{1}''. A compliance level ''{1}'' or better is required -configure.repetition = repetition must be a positive integer: {0} -configure.directoryNotExist = directory does not exist: {0} -configure.IOError = i/o error : unable to retrieve .JAVA files in directory: {0} -configure.noClasspath = no classpath defined, using default directory instead -configure.incorrectClasspath = incorrect classpath: {0} -configure.invalidexpansionargumentname = expansion argument file {0} doesn't exist or cannot be read -configure.cannotOpenLog = cannot open .log file -configure.unexpectedCustomEncoding = unexpected custom encoding specification: {0}[{1}] -configure.unsupportedEncoding = unsupported encoding format: {0} -configure.duplicateDefaultEncoding = duplicate default encoding format specification: {0} -configure.invalidTaskTag ={0} is an invalid task tag - -### requestor -requestor.error = ERROR -requestor.warning = WARNING -requestor.in = in {0} -requestor.notRetrieveErrorMessage = Cannot retrieve the error message for {0} - -### unit -unit.more = File {0} is specified more than once -unit.missing = File {0} is missing - -### output -output.noClassFileCreated = No .class file created for file named {0} because of an IOException. - -### miscellaneous -misc.version = {0} ({1}) - {2} {3} diff --git a/tests/src/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java b/tests/src/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java index 4adbdfb76..c0323f0ef 100644 --- a/tests/src/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java +++ b/tests/src/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.ajc182; import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ182 { @@ -20,7 +19,6 @@ public class AllTestsAspectJ182 { TestSuite suite = new TestSuite("AspectJ 1.8.2 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc182Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/tests/src/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java b/tests/src/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java index 6caef2609..8b68b8e40 100644 --- a/tests/src/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java +++ b/tests/src/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.ajc183; import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ183 { @@ -20,7 +19,6 @@ public class AllTestsAspectJ183 { TestSuite suite = new TestSuite("AspectJ 1.8.3 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc183Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/tests/src/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java b/tests/src/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java index 1c1c61a98..be0b12112 100644 --- a/tests/src/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java +++ b/tests/src/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.ajc184; import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ184 { @@ -20,7 +19,6 @@ public class AllTestsAspectJ184 { TestSuite suite = new TestSuite("AspectJ 1.8.4 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc184Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/tests/src/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java b/tests/src/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java index a286daf0c..0cd580fce 100644 --- a/tests/src/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java +++ b/tests/src/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.ajc185; import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ185 { @@ -20,7 +19,6 @@ public class AllTestsAspectJ185 { TestSuite suite = new TestSuite("AspectJ 1.8.5 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc185Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/util/src/org/aspectj/util/LangUtil.java b/util/src/org/aspectj/util/LangUtil.java index 81688156e..3f913dc46 100644 --- a/util/src/org/aspectj/util/LangUtil.java +++ b/util/src/org/aspectj/util/LangUtil.java @@ -1460,7 +1460,7 @@ public class LangUtil { } public static String getJrtFsFilePath() { - return getJavaHome()+File.separator+JRT_FS; + return getJavaHome() + File.separator + "lib" + File.separator + JRT_FS; } public static String getJavaHome() {