From fff8eef683e8b7e426319101d3bb9dec56c7d7d6 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sat, 13 Mar 2021 13:54:45 +0700 Subject: Add Java 15 class vile version to BCEL constants, adjust test tools etc. Signed-off-by: Alexander Kriegisch --- testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing-util') diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java index 508f71550..e6587c4ee 100644 --- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java +++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java @@ -412,8 +412,8 @@ public final class TestUtil { } /** - * Checks that two multi-line strings have the same value. Each line is trimmed before comparision Produces an error on the - * particular line of conflict + * Checks that two multi-line strings have the same value. Each line is trimmed before comparison. + * Produces an error on the particular line of conflict. */ public static void assertMultiLineStringEquals(String message, String s1, String s2) { try { -- cgit v1.2.3 From 01283150755102e2280e8a864a436a91a8e50278 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sun, 21 Mar 2021 17:12:48 +0700 Subject: Java 16 fix: ParseUtil.fileToEncodedURL(File) causes IllegalAccessError Migrate 'ParseUtil.fileToEncodedURL(f)' to 'f.toURI().toURL()'. Signed-off-by: Alexander Kriegisch --- testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing-util') diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java index e6587c4ee..ddd6a7caf 100644 --- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java +++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java @@ -399,7 +399,7 @@ public final class TestUtil { // use the non-canonicalized filename } try { - urls[count++] = ParseUtil.fileToEncodedURL(f); + urls[count++] = f.toURI().toURL(); } catch (IOException x) { } } -- cgit v1.2.3 From ecb5320c7b61d72edbf4a440e4996171a9c8f7dd Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sun, 21 Mar 2021 17:34:09 +0700 Subject: Fix some deprecated Java and JUnit warnings by using newer API calls Signed-off-by: Alexander Kriegisch --- asm/src/main/java/org/aspectj/asm/AsmManager.java | 4 ++-- .../asm/internal/JDTLikeHandleProvider.java | 22 +++++++++++----------- .../classfile/annotation/SimpleElementValue.java | 14 +++++++------- .../RuntimeVisibleAnnotationAttributeTest.java | 2 +- .../java/org/aspectj/bridge/ReflectionFactory.java | 2 +- .../main/java/$installer$/org/aspectj/Main.java | 2 +- .../internal/tools/ant/taskdefs/AntBuilder.java | 4 ++-- .../java/org/aspectj/weaver/loadtime/Options.java | 2 +- .../weaver/loadtime/WeavingURLClassLoader.java | 7 ++----- .../aspectj/weaver/loadtime/JRockitAgentTest.java | 4 ++-- .../weaver/loadtime/WeavingContextTest.java | 6 +++--- .../compiler/AjPipeliningCompilerAdapter.java | 2 +- .../java/org/aspectj/tools/ajc/AjcTestCase.java | 2 +- .../org/aspectj/weaver/SimpleAnnotationValue.java | 2 +- ...eflectionBasedReferenceTypeDelegateFactory.java | 8 +++++++- .../aspectj/weaver/reflect/ReflectionWorld.java | 10 ++++++---- .../org/aspectj/weaver/tools/AbstractTrace.java | 4 ++-- .../org/aspectj/weaver/tools/TraceFactory.java | 4 ++-- .../aspectj/weaver/patterns/PatternsTestCase.java | 2 +- .../org/aspectj/tools/ant/taskdefs/AjcTask.java | 6 +++--- .../aspectj/tools/ant/taskdefs/compilers/Ajc.java | 2 +- .../java/org/aspectj/testing/util/TestUtil.java | 7 +++---- .../testing/AutowiredXMLBasedAjcTestCase.java | 2 +- .../testing/harness/bridge/AjcSpecTest.java | 1 - .../testing/util/options/OptionChecker.java | 2 +- .../aspectj/testing/util/options/OptionsTest.java | 2 +- .../aspectj/systemtest/ajc150/GenericsTests.java | 2 +- .../org/aspectj/systemtest/ajc186/Ajc186Tests.java | 2 +- .../systemtest/ajc190/EfficientTJPTests.java | 2 +- .../java/org/aspectj/weaver/bcel/LazyClassGen.java | 2 +- .../main/java/org/aspectj/weaver/ltw/LTWWorld.java | 7 +++---- .../weaver/bcel/ClassLoaderRepositoryTest.java | 2 +- .../aspectj/weaver/tools/PointcutParserTest.java | 2 +- 33 files changed, 73 insertions(+), 71 deletions(-) (limited to 'testing-util') diff --git a/asm/src/main/java/org/aspectj/asm/AsmManager.java b/asm/src/main/java/org/aspectj/asm/AsmManager.java index eaf728296..cbebe2842 100644 --- a/asm/src/main/java/org/aspectj/asm/AsmManager.java +++ b/asm/src/main/java/org/aspectj/asm/AsmManager.java @@ -1173,8 +1173,8 @@ public class AsmManager implements IStructureModel { private ModelInfo(IHierarchy hierarchy, IRelationshipMap relationshipMap) { IProgramElement ipe = hierarchy.getRoot(); walkModel(ipe); - recordStat("FileMapSize", new Integer(hierarchy.getFileMapEntrySet().size()).toString()); - recordStat("RelationshipMapSize", new Integer(relationshipMap.getEntries().size()).toString()); + recordStat("FileMapSize", Integer.toString(hierarchy.getFileMapEntrySet().size())); + recordStat("RelationshipMapSize", Integer.toString(relationshipMap.getEntries().size())); } private void walkModel(IProgramElement ipe) { diff --git a/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java index 60a823e20..0ae669502 100644 --- a/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java +++ b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java @@ -171,7 +171,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { String existingHandle = object.getHandleIdentifier(); int suffixPosition = existingHandle.indexOf('!'); if (suffixPosition != -1) { - count = new Integer(existingHandle.substring(suffixPosition + 1)) + 1; + count = Integer.parseInt(existingHandle.substring(suffixPosition + 1)) + 1; } else { if (count == 1) { count = 2; @@ -181,13 +181,13 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { } } if (count > 1) { - return CharOperation.concat(countDelim, new Integer(count).toString().toCharArray()); + return CharOperation.concat(countDelim, Integer.toString(count).toCharArray()); } } else if (ipe.getKind().isDeclare()) { // // look at peer declares int count = computeCountBasedOnPeers(ipe); if (count > 1) { - return CharOperation.concat(countDelim, new Integer(count).toString().toCharArray()); + return CharOperation.concat(countDelim, Integer.toString(count).toCharArray()); } } else if (ipe.getKind().equals(IProgramElement.Kind.ADVICE)) { // Look at any peer advice @@ -227,7 +227,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { String existingHandle = object.getHandleIdentifier(); int suffixPosition = existingHandle.indexOf('!'); if (suffixPosition != -1) { - count = new Integer(existingHandle.substring(suffixPosition + 1)) + 1; + count = Integer.valueOf(existingHandle.substring(suffixPosition + 1)) + 1; } else { if (count == 1) { count = 2; @@ -238,7 +238,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { } } if (count > 1) { - return CharOperation.concat(countDelim, new Integer(count).toString().toCharArray()); + return CharOperation.concat(countDelim, Integer.toString(count).toCharArray()); } } else if (ipe.getKind().equals(IProgramElement.Kind.INITIALIZER)) { // return String.valueOf(++initializerCounter).toCharArray(); @@ -279,7 +279,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { String existingHandle = object.getHandleIdentifier(); int suffixPosition = existingHandle.indexOf('!'); if (suffixPosition != -1) { - count = new Integer(existingHandle.substring(suffixPosition + 1)) + 1; + count = Integer.valueOf(existingHandle.substring(suffixPosition + 1)) + 1; } else { if (count == 1) { count = 2; @@ -290,7 +290,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { } } // if (count > 1) { - return new Integer(count).toString().toCharArray(); + return Integer.toString(count).toCharArray(); // return CharOperation.concat(countDelim, new Integer(count).toString().toCharArray()); // } } else if (ipe.getKind().equals(IProgramElement.Kind.CODE)) { @@ -314,7 +314,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { int suffixPosition = existingHandle.lastIndexOf('!'); int lastSquareBracket = existingHandle.lastIndexOf('['); // type delimiter if (suffixPosition != -1 && lastSquareBracket < suffixPosition) { // pr260384 - count = new Integer(existingHandle.substring(suffixPosition + 1)) + 1; + count = Integer.valueOf(existingHandle.substring(suffixPosition + 1)) + 1; } else { if (count == 1) { count = 2; @@ -334,7 +334,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { int suffixPosition = existingHandle.lastIndexOf('!'); int lastSquareBracket = existingHandle.lastIndexOf('['); // type delimiter if (suffixPosition != -1 && lastSquareBracket < suffixPosition) { // pr260384 - count = new Integer(existingHandle.substring(suffixPosition + 1)) + 1; + count = Integer.valueOf(existingHandle.substring(suffixPosition + 1)) + 1; } else { if (count == 1) { count = 2; @@ -345,7 +345,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { } } if (count > 1) { - return CharOperation.concat(countDelim, new Integer(count).toString().toCharArray()); + return CharOperation.concat(countDelim, Integer.toString(count).toCharArray()); } } return empty; @@ -383,7 +383,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { String existingHandle = object.getHandleIdentifier(); int suffixPosition = existingHandle.indexOf('!'); if (suffixPosition != -1) { - count = new Integer(existingHandle.substring(suffixPosition + 1)) + 1; + count = Integer.valueOf(existingHandle.substring(suffixPosition + 1)) + 1; } else { if (count == 1) { count = 2; diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java index 2c795b136..fabfa8ca4 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java @@ -239,7 +239,7 @@ public class SimpleElementValue extends ElementValue { return Integer.toString(b.getValue()); case PRIMITIVE_CHAR: ConstantInteger ch = (ConstantInteger) cpool.getConstant(idx); - return new Character((char) ch.getIntValue()).toString(); + return Character.toString((char) ch.getIntValue()); case PRIMITIVE_BOOLEAN: ConstantInteger bo = (ConstantInteger) cpool.getConstant(idx); if (bo.getValue() == 0) { @@ -262,11 +262,11 @@ public class SimpleElementValue extends ElementValue { switch (type) { case PRIMITIVE_INT: ConstantInteger c = (ConstantInteger) cpool.getConstant(idx); - s.append("(int)").append(Integer.toString(c.getValue())); + s.append("(int)").append(c.getValue()); break; case PRIMITIVE_LONG: ConstantLong j = (ConstantLong) cpool.getConstant(idx); - s.append("(long)").append(Long.toString(j.getValue())); + s.append("(long)").append(j.getValue()); break; case PRIMITIVE_DOUBLE: ConstantDouble d = (ConstantDouble) cpool.getConstant(idx); @@ -274,19 +274,19 @@ public class SimpleElementValue extends ElementValue { break; case PRIMITIVE_FLOAT: ConstantFloat f = (ConstantFloat) cpool.getConstant(idx); - s.append("(float)").append(Float.toString(f.getValue())); + s.append("(float)").append(f.getValue()); break; case PRIMITIVE_SHORT: ConstantInteger ci = (ConstantInteger) cpool.getConstant(idx); - s.append("(short)").append(Integer.toString(ci.getValue())); + s.append("(short)").append(ci.getValue()); break; case PRIMITIVE_BYTE: ConstantInteger b = (ConstantInteger) cpool.getConstant(idx); - s.append("(byte)").append(Integer.toString(b.getValue())); + s.append("(byte)").append(b.getValue()); break; case PRIMITIVE_CHAR: ConstantInteger ch = (ConstantInteger) cpool.getConstant(idx); - s.append("(char)").append(new Character((char) ch.getIntValue()).toString()); + s.append("(char)").append((char) ch.getIntValue()); break; case PRIMITIVE_BOOLEAN: ConstantInteger bo = (ConstantInteger) cpool.getConstant(idx); diff --git a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java index 5fe956790..62c1b3bd7 100644 --- a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java +++ b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java @@ -201,7 +201,7 @@ public class RuntimeVisibleAnnotationAttributeTest extends BcelTestCase { checkValue(ann,"dval","33.4"); checkValue(ann,"sval","99"); checkValue(ann,"bval","2"); - checkValue(ann,"cval",new Character('5').toString()); + checkValue(ann,"cval", Character.toString('5')); checkValue(ann,"zval","false"); } diff --git a/bridge/src/main/java/org/aspectj/bridge/ReflectionFactory.java b/bridge/src/main/java/org/aspectj/bridge/ReflectionFactory.java index 8eb65b3a0..73f063dc4 100644 --- a/bridge/src/main/java/org/aspectj/bridge/ReflectionFactory.java +++ b/bridge/src/main/java/org/aspectj/bridge/ReflectionFactory.java @@ -47,7 +47,7 @@ public class ReflectionFactory { // XXX lease, pool final Class cfn = Class.forName(cname); String error = null; if (args == NONE) { - result = cfn.newInstance(); + result = cfn.getDeclaredConstructor().newInstance(); } else { Class[] types = getTypes(args); Constructor constructor = cfn.getConstructor(types); diff --git a/build/src/main/java/$installer$/org/aspectj/Main.java b/build/src/main/java/$installer$/org/aspectj/Main.java index f75f28a6e..a307be930 100644 --- a/build/src/main/java/$installer$/org/aspectj/Main.java +++ b/build/src/main/java/$installer$/org/aspectj/Main.java @@ -145,7 +145,7 @@ public class Main { try { String className = (String) properties.get("installer.main.class"); //UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - Installer installer = (Installer) Class.forName(className).newInstance(); + Installer installer = (Installer) Class.forName(className).getDeclaredConstructor().newInstance(); InstallContext installerContext = new InstallContext(properties); installerContext.setHasGui(hasGui); installer.setContext(installerContext); diff --git a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java index 31ed76201..82edad5ea 100644 --- a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java +++ b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java @@ -599,7 +599,7 @@ public class AntBuilder extends Builder { ClassLoader parent = Task.class.getClassLoader(); ClassLoader loader = new URLClassLoader(cp, parent); Class c = loader.loadClass(AJCTASK); - task = c.newInstance(); + task = c.getDeclaredConstructor().newInstance(); // Westodo Project project = javac.getProject(); Method m = c.getMethod("setupAjc", new Class[] { Javac.class }); m.invoke(task, new Object[] { javac }); @@ -825,4 +825,4 @@ class ProjectMessager extends Messager { return true; } -} \ No newline at end of file +} diff --git a/loadtime/src/main/java/org/aspectj/weaver/loadtime/Options.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/Options.java index e76f60e7c..1577ffc21 100644 --- a/loadtime/src/main/java/org/aspectj/weaver/loadtime/Options.java +++ b/loadtime/src/main/java/org/aspectj/weaver/loadtime/Options.java @@ -65,7 +65,7 @@ public class Options { String handlerClass = arg.substring(OPTIONVALUED_messageHandler.length()).trim(); try { Class handler = Class.forName(handlerClass, false, laoder); - weaverOption.messageHandler = ((IMessageHandler) handler.newInstance()); + weaverOption.messageHandler = ((IMessageHandler) handler.getDeclaredConstructor().newInstance()); } catch (Throwable t) { weaverOption.messageHandler.handleMessage(new Message("Cannot instantiate message handler " + handlerClass, IMessage.ERROR, t, null)); diff --git a/loadtime/src/main/java/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java index 9ee650dc6..f0773c0ed 100644 --- a/loadtime/src/main/java/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java +++ b/loadtime/src/main/java/org/aspectj/weaver/loadtime/WeavingURLClassLoader.java @@ -98,13 +98,10 @@ public class WeavingURLClassLoader extends ExtensibleURLClassLoader implements W File f = new File(t.nextToken().trim()); try { if (f.exists()) { - URL url = f.toURL(); - if (url != null) { + URL url = f.toURI().toURL(); urlList.add(url); } - } - } catch (MalformedURLException e) { - } + } catch (MalformedURLException ignored) {} } URL[] urls = new URL[urlList.size()]; diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java index 4c37d568b..223f66fbb 100644 --- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java +++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java @@ -112,7 +112,7 @@ public class JRockitAgentTest extends TestCase { } Class agentClazz = Class.forName("org.aspectj.weaver.loadtime.JRockitAgent", false, this); - Object obj = agentClazz.newInstance(); + Object obj = agentClazz.getDeclaredConstructor().newInstance(); if (debug) System.out.println("JRockitClassLoader.JRockitClassLoader() obj=" + obj); this.agent = obj; @@ -130,7 +130,7 @@ public class JRockitAgentTest extends TestCase { String escaped = s.substring(i + 1, i + 3); s = s.substring(i + 3); Integer value = Integer.valueOf(escaped, 16); - result.append(new Character((char) value.intValue())); + result.append(Character.valueOf((char) value.intValue())); i = s.indexOf("%"); } result.append(s); diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java index 9ef64a04b..98ecf1bae 100644 --- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java +++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java @@ -84,7 +84,7 @@ public class WeavingContextTest extends TestCase { public void testGetFile() throws IOException { File file = new File("../loadtime/testdata"); - URL fileURL = file.getCanonicalFile().toURL(); + URL fileURL = file.getCanonicalFile().toURI().toURL(); URLClassLoader loader = new URLClassLoader(new URL[] { fileURL },null); IWeavingContext context = new TestWeavingContext(loader) { @@ -102,7 +102,7 @@ public class WeavingContextTest extends TestCase { public void testGetId() throws IOException { File file = new File("../loadtime/testdata"); - URL fileURL = file.getCanonicalFile().toURL(); + URL fileURL = file.getCanonicalFile().toURI().toURL(); URLClassLoader loader = new URLClassLoader(new URL[] { fileURL },null); IWeavingContext context = new TestWeavingContext(loader) { @@ -120,7 +120,7 @@ public class WeavingContextTest extends TestCase { public void testGetDefinitions () throws Exception { File file = new File("../loadtime/testdata"); - URL fileURL = file.getCanonicalFile().toURL(); + URL fileURL = file.getCanonicalFile().toURI().toURL(); URLClassLoader loader = new URLClassLoader(new URL[] { fileURL },null); IWeavingContext context = new TestWeavingContext(loader) { diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java index e576ee0d3..eb6bb92da 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java @@ -229,7 +229,7 @@ public class AjPipeliningCompilerAdapter extends AbstractCompilerAdapter { if (pipelineOutput == null) { pipelineOutput = new Hashtable(); } - pipelineOutput.put("filesContainingAspects", new Integer(toWaitFor).toString()); + pipelineOutput.put("filesContainingAspects", Integer.toString(toWaitFor)); StringBuffer order = new StringBuffer(); order.append("["); for (int i = 0; i < units.length; i++) { diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java index a8c3f5a44..c326c0a69 100644 --- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java @@ -898,7 +898,7 @@ public abstract class AjcTestCase extends TestCase { URL[] urls = new URL[strTok.countTokens()]; try { for (int i = 0; i < urls.length; i++) { - urls[i] = new File(strTok.nextToken()).getCanonicalFile().toURL(); + urls[i] = new File(strTok.nextToken()).getCanonicalFile().toURI().toURL(); } } catch (Exception malEx) { fail("Bad classpath specification: " + classpath); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java index 32e55f6b4..2fe37e2cb 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java @@ -84,7 +84,7 @@ public class SimpleAnnotationValue extends AnnotationValue { case 'B': // byte return Byte.toString(theByte); case 'C': // char - return new Character(theChar).toString(); + return Character.toString(theChar); case 'D': // double return Double.toString(theDouble); case 'F': // float diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java index 9edf23f8f..a56950261 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java @@ -69,7 +69,7 @@ public class ReflectionBasedReferenceTypeDelegateFactory { ClassLoader usingClassLoader, World inWorld) { try { Class delegateClass = Class.forName("org.aspectj.weaver.reflect.Java15ReflectionBasedReferenceTypeDelegate"); - ReflectionBasedReferenceTypeDelegate ret = (ReflectionBasedReferenceTypeDelegate) delegateClass.newInstance(); + ReflectionBasedReferenceTypeDelegate ret = (ReflectionBasedReferenceTypeDelegate) delegateClass.getDeclaredConstructor().newInstance(); ret.initialize(forReferenceType, forClass, usingClassLoader, inWorld); return ret; } catch (ClassNotFoundException cnfEx) { @@ -81,6 +81,12 @@ public class ReflectionBasedReferenceTypeDelegateFactory { } catch (IllegalAccessException illAccEx) { throw new IllegalStateException("Attempted to create Java 1.5 reflection based delegate but IllegalAccessException: " + illAccEx + " occured"); + } catch (NoSuchMethodException nsMethEx) { + throw new IllegalStateException("Attempted to create Java 1.5 reflection based delegate but NoSuchMethodException: " + + nsMethEx + " occured"); + } catch (InvocationTargetException invTargEx) { + throw new IllegalStateException("Attempted to create Java 1.5 reflection based delegate but InvocationTargetException: " + + invTargEx + " occured"); } } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java index e3e19e64b..464aba367 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java @@ -8,6 +8,7 @@ * ******************************************************************/ package org.aspectj.weaver.reflect; +import java.lang.reflect.InvocationTargetException; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -116,16 +117,17 @@ public class ReflectionWorld extends World implements IReflectionWorld { AnnotationFinder annotationFinder = null; try { Class java15AnnotationFinder = Class.forName("org.aspectj.weaver.reflect.Java15AnnotationFinder"); - annotationFinder = (AnnotationFinder) java15AnnotationFinder.newInstance(); + annotationFinder = (AnnotationFinder) java15AnnotationFinder.getDeclaredConstructor().newInstance(); annotationFinder.setClassLoader(loader); annotationFinder.setWorld(world); } catch (ClassNotFoundException ex) { // must be on 1.4 or earlier - } catch (IllegalAccessException ex) { + } catch (IllegalAccessException | InstantiationException | NoSuchMethodException ex) { // not so good throw new BCException("AspectJ internal error", ex); - } catch (InstantiationException ex) { - throw new BCException("AspectJ internal error", ex); + } + catch (InvocationTargetException e) { + e.printStackTrace(); } return annotationFinder; } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java index fe2f86f54..bca1985e7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java @@ -68,7 +68,7 @@ public abstract class AbstractTrace implements Trace { @Override public void exit (String methodName, int i) { - exit(methodName,new Integer(i)); + exit(methodName, Integer.valueOf(i)); } @Override @@ -210,4 +210,4 @@ public abstract class AbstractTrace implements Trace { return args; } -} \ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java index 3fc92f5b4..8190d67a3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java @@ -45,7 +45,7 @@ public abstract class TraceFactory { } else { Class factoryClass = Class.forName(factoryName); - instance = (TraceFactory)factoryClass.newInstance(); + instance = (TraceFactory)factoryClass.getDeclaredConstructor().newInstance(); } } catch (Throwable th) { @@ -58,7 +58,7 @@ public abstract class TraceFactory { if (instance == null) try { { Class factoryClass = Class.forName("org.aspectj.weaver.tools.Jdk14TraceFactory"); - instance = (TraceFactory)factoryClass.newInstance(); + instance = (TraceFactory)factoryClass.getDeclaredConstructor().newInstance(); } } catch (Throwable th) { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTestCase.java index 62a3c0566..82c1dc35c 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTestCase.java @@ -24,7 +24,7 @@ public abstract class PatternsTestCase extends TestCase { public URLClassLoader getClassLoaderForFile(File f) { try { - URLClassLoader ucl = new URLClassLoader(new URL[] { f.toURL() }, this.getClass().getClassLoader()); + URLClassLoader ucl = new URLClassLoader(new URL[] { f.toURI().toURL() }, this.getClass().getClassLoader()); return ucl; } catch (MalformedURLException mue) { throw new RuntimeException(mue); 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 a48769ecb..a4415833a 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 @@ -287,7 +287,7 @@ public class AjcTask extends MatchingTask { if (null != editorClassName) { ClassLoader cl = AjcTask.class.getClassLoader(); Class editorClass = cl.loadClass(editorClassName); - editor = (ICommandEditor) editorClass.newInstance(); + editor = (ICommandEditor) editorClass.getDeclaredConstructor().newInstance(); } } catch (Throwable t) { System.err.println("Warning: unable to load command editor"); @@ -865,7 +865,7 @@ public class AjcTask extends MatchingTask { public void setMessageHolderClass(String className) { try { Class mclass = Class.forName(className); - IMessageHolder holder = (IMessageHolder) mclass.newInstance(); + IMessageHolder holder = (IMessageHolder) mclass.getDeclaredConstructor().newInstance(); setMessageHolder(holder); } catch (Throwable t) { String m = "unable to instantiate message holder: " + className; @@ -889,7 +889,7 @@ public class AjcTask extends MatchingTask { public void setCommandEditorClass(String className) { // skip Ant interface? try { Class mclass = Class.forName(className); - setCommandEditor((ICommandEditor) mclass.newInstance()); + setCommandEditor((ICommandEditor) mclass.getDeclaredConstructor().newInstance()); } catch (Throwable t) { String m = "unable to instantiate command editor: " + className; throw new BuildException(m, t); diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java index a3bcbd91a..fe6900755 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java @@ -92,7 +92,7 @@ public class Ajc extends DefaultCompilerAdapter { System.setErr(logstr); return (Integer) main.getMethod ("compile", new Class[]{String[].class}).invoke - (main.newInstance(), new Object[]{ + (main.getDeclaredConstructor().newInstance(), new Object[]{ removeUnsupported(cline, logstr) }) == AJC_COMPILER_SUCCESS; } catch (Exception e) { diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java index ddd6a7caf..79ae9a776 100644 --- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java +++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java @@ -40,13 +40,12 @@ import org.aspectj.util.Reflection; import jdiff.text.FileLine; import jdiff.util.Diff; import jdiff.util.DiffNormalOutput; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestResult; import junit.framework.TestSuite; -import sun.net.www.ParseUtil; /** * Things that junit should perhaps have, but doesn't. Note the file-comparison methods require JDiff to run, but JDiff types are @@ -163,7 +162,7 @@ public final class TestUtil { public static URL fileToURL(File file) { try { - return file.toURL(); + return file.toURI().toURL(); } catch (MalformedURLException e) { return null; } @@ -303,7 +302,7 @@ public final class TestUtil { public static URL libURL(String rpath) { File file = libFile(rpath); try { - return file.toURL(); + return file.toURI().toURL(); } catch (MalformedURLException e) { throw new IllegalArgumentException("bad URL from: " + file); } diff --git a/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java index ca9a7f431..a0314017b 100644 --- a/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java @@ -53,7 +53,7 @@ public abstract class AutowiredXMLBasedAjcTestCase extends XMLBasedAjcTestCase { // wire the spec file try { - final AutowiredXMLBasedAjcTestCase wired = (AutowiredXMLBasedAjcTestCase) testCaseClass.newInstance(); + final AutowiredXMLBasedAjcTestCase wired = (AutowiredXMLBasedAjcTestCase) testCaseClass.getDeclaredConstructor().newInstance(); System.out.println("LOADING SUITE: " + wired.getSpecFile().getPath()); Digester d = wired.getDigester(); try { diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java index 2ff173362..5adf128e3 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java @@ -13,7 +13,6 @@ package org.aspectj.testing.harness.bridge; -import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; diff --git a/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java index 79d1ff286..6c30f97b1 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java @@ -16,7 +16,7 @@ import java.util.Arrays; import org.aspectj.testing.util.LangUtil; -import junit.framework.Assert; +import org.junit.Assert; /** * Drivers to test a given set of Options. diff --git a/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java index 5c380d739..f0f4f066c 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java @@ -14,7 +14,7 @@ package org.aspectj.testing.util.options; import org.aspectj.testing.util.options.Option.InvalidInputException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; /** diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java index ee6fb6af6..8bb04f389 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java @@ -882,7 +882,7 @@ public class GenericsTests extends XMLBasedAjcTestCase { Set methodsFound = new HashSet<>(); StringBuffer debugString = new StringBuffer(); try { - ClassLoader cl = new URLClassLoader(new URL[]{ajc.getSandboxDirectory().toURL()}); + ClassLoader cl = new URLClassLoader(new URL[]{ajc.getSandboxDirectory().toURI().toURL()}); Class clz = Class.forName(classname,false,cl); java.lang.reflect.Method[] ms = clz.getDeclaredMethods(); if (ms!=null) { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java index 379c54333..be324c279 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java @@ -105,7 +105,7 @@ public class Ajc186Tests extends org.aspectj.testing.XMLBasedAjcTestCase { URLClassLoader ucl = new URLClassLoader(new URL[] {ajc.getSandboxDirectory().toURI().toURL()},this.getClass().getClassLoader()); Class applicationClass = Class.forName("Application",false,ucl); assertNotNull(applicationClass); - Object instance = applicationClass.newInstance(); + Object instance = applicationClass.getDeclaredConstructor().newInstance(); Method works = applicationClass.getDeclaredMethod("fromInnerClass"); works.setAccessible(true); Runnable r = (Runnable) works.invoke(instance); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java index 2f01d0d97..726987f34 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java @@ -11,7 +11,7 @@ import org.aspectj.apache.bcel.classfile.JavaClass; import org.aspectj.apache.bcel.classfile.Method; import org.aspectj.testing.XMLBasedAjcTestCase; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.Test; /** diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java index f2e61c565..5e72d84ce 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java @@ -280,7 +280,7 @@ public final class LazyClassGen { } public String getNewGeneratedNameTag() { - return new Integer(childCounter++).toString(); + return Integer.toString(childCounter++); } // ---- diff --git a/weaver/src/main/java/org/aspectj/weaver/ltw/LTWWorld.java b/weaver/src/main/java/org/aspectj/weaver/ltw/LTWWorld.java index 077a91943..ca4779526 100644 --- a/weaver/src/main/java/org/aspectj/weaver/ltw/LTWWorld.java +++ b/weaver/src/main/java/org/aspectj/weaver/ltw/LTWWorld.java @@ -11,6 +11,7 @@ * ******************************************************************/ package org.aspectj.weaver.ltw; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -179,10 +180,8 @@ public class LTWWorld extends BcelWorld implements IReflectionWorld { private static Map makeConcurrentMap() { if (concurrentMapClass != null) { try { - return (Map) concurrentMapClass.newInstance(); - } catch (InstantiationException ie) { - } catch (IllegalAccessException iae) { - } + return (Map) concurrentMapClass.getDeclaredConstructor().newInstance(); + } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException ignored) {} // fall through if exceptions } return Collections.synchronizedMap(new HashMap()); diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java b/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java index 42c5189a4..cef1f7c90 100644 --- a/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java +++ b/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java @@ -49,7 +49,7 @@ public class ClassLoaderRepositoryTest extends TestCase { private ClassLoaderRepository setupRepository() throws Exception { ClassLoader cl = Thread.currentThread().getContextClassLoader(); - ClassLoader res = new URLClassLoader(new URL[]{f.toURL()},cl); + ClassLoader res = new URLClassLoader(new URL[]{f.toURI().toURL()},cl); ClassLoaderRepository rep = new ClassLoaderRepository(res); return rep; } diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java index 6e4ffa9f6..d3eaaf67e 100644 --- a/weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java +++ b/weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java @@ -21,7 +21,7 @@ import org.aspectj.weaver.patterns.PatternParser; import org.aspectj.weaver.patterns.Pointcut; import org.aspectj.weaver.patterns.PointcutRewriter; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; /** -- cgit v1.2.3 From 1664dbf1fc27e59e0783f8956dae3f09739988ad Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sat, 10 Apr 2021 11:27:33 +0700 Subject: Replace JDiff by regular Maven dependency from GitHub Packages One less SCM-committed binary, one less system-scoped dependency. Signed-off-by: Alexander Kriegisch --- lib/jdiff/jdiff.jar | Bin 22880 -> 0 bytes lib/jdiff/jdiffReadme.txt | 2 -- libx/pom.xml | 57 +++++++++++++++++++++----------------------- run-all-junit-tests/pom.xml | 7 ------ testing-util/pom.xml | 5 ++-- testing/pom.xml | 7 ------ 6 files changed, 29 insertions(+), 49 deletions(-) delete mode 100644 lib/jdiff/jdiff.jar delete mode 100644 lib/jdiff/jdiffReadme.txt (limited to 'testing-util') diff --git a/lib/jdiff/jdiff.jar b/lib/jdiff/jdiff.jar deleted file mode 100644 index 792e2c532..000000000 Binary files a/lib/jdiff/jdiff.jar and /dev/null differ diff --git a/lib/jdiff/jdiffReadme.txt b/lib/jdiff/jdiffReadme.txt deleted file mode 100644 index bca69422f..000000000 --- a/lib/jdiff/jdiffReadme.txt +++ /dev/null @@ -1,2 +0,0 @@ -The jdiff library is a component from the JDiffPlugin by Andre Kaplan -available from http://plugins.jedit.org/plugins/JDiffPlugin under the GPL. diff --git a/libx/pom.xml b/libx/pom.xml index 463f01716..8670f1a08 100644 --- a/libx/pom.xml +++ b/libx/pom.xml @@ -136,28 +136,12 @@ c61a373f6d50ff8fcfba900934f7254d44f9735b + + download-jdiff generate-resources @@ -170,6 +154,7 @@ eba63fd845203c6b245fbcb81c0de8e2c83d16c7 + --> @@ -553,6 +538,24 @@ + + jdiff/JDiffPlugin-1.3.zip/JDiffPlugin.jar jdiff/jdiff.jar @@ -587,10 +586,6 @@ true - jdiff/JDiffPlugin-1.3.zip/JDiffPlugin jdiff/jdiff-src.zip @@ -603,6 +598,7 @@ + --> @@ -625,7 +621,8 @@ asm/** commons/** jarjar/** - jdiff/** + + jdtcore-aj/** junit/** regexp/** diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index f2613d996..a2d8aa604 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -246,13 +246,6 @@ system ${project.basedir}/../lib/ext/jrockit/jrockit.jar - - jdiff - jdiff - 1.0 - system - ${project.basedir}/../lib/jdiff/jdiff.jar - ant diff --git a/testing-util/pom.xml b/testing-util/pom.xml index 8e5262fd6..1b8da6666 100644 --- a/testing-util/pom.xml +++ b/testing-util/pom.xml @@ -37,11 +37,10 @@ 4.13 + jdiff jdiff - 1.0 - system - ${project.basedir}/../lib/jdiff/jdiff.jar + 1.3 diff --git a/testing/pom.xml b/testing/pom.xml index 660dec41f..0f1089e1f 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -84,13 +84,6 @@ loadtime ${project.version} - - jdiff - jdiff - 1.0 - system - ${project.basedir}/../lib/jdiff/jdiff.jar - ant -- cgit v1.2.3 From f00f547d7b37647880e7f8fc030f9f96dbad9848 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Mon, 12 Apr 2021 13:16:29 +0700 Subject: Clean up Maven dependencies using 'dependency:analyze' goal Notably, this change involves a partial revert of @4a5660b3, because we are not using JUnit Jupiter yet but still JUnit 4 tests. See discussion under commit at https://github.com/eclipse/org.aspectj/commit/4a5660b3. Many other warnings - concerning both used undeclared and unused declared dependencies - were eliminated by adding or removing the corresponding dependencies from the POMs. Furthermore, I tried to make sure that some clearly test-scoped dependencies are now actually declared as such, so as to avoid unwanted transitivity bleeding into compile scope and maybe unwanted classes ending up in uber JARs via Maven Shade or Maven Assembly. TODO: I am not so sure why modules other than 'run-all-unit-tests' would depend on test JARs. I hope I broke nothing essential there. As of today, the other modules where I found 'test-jar' dependencies are: - ajde - testing - testing-drivers - tests - weaver Signed-off-by: Alexander Kriegisch --- ajbrowser/pom.xml | 22 ---- ajde.core/pom.xml | 10 ++ ajde/pom.xml | 10 ++ ajdoc/pom.xml | 34 +----- .../org/aspectj/tools/ajdoc/CompilerWrapper.java | 22 ++-- build/pom.xml | 6 - loadtime/pom.xml | 52 +-------- org.aspectj.ajdt.core/pom.xml | 11 +- org.aspectj.lib/pom.xml | 1 + org.aspectj.matcher/pom.xml | 1 + pom.xml | 45 +++++-- run-all-junit-tests/pom.xml | 130 +++------------------ runtime/pom.xml | 8 -- taskdefs/pom.xml | 12 +- testing-drivers/pom.xml | 25 +--- testing-util/pom.xml | 3 +- testing/pom.xml | 39 ++----- tests/pom.xml | 37 +----- weaver/pom.xml | 1 + 19 files changed, 117 insertions(+), 352 deletions(-) (limited to 'testing-util') diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml index 009bc2f77..78041e7c3 100644 --- a/ajbrowser/pom.xml +++ b/ajbrowser/pom.xml @@ -34,37 +34,15 @@ asm ${project.version} - - org.aspectj - taskdefs - ${project.version} - - - org.aspectj - ajdoc - ${project.version} - - - org.aspectj - loadtime - ${project.version} - org.aspectj ajde.core ${project.version} - - org.aspectj - weaver - ${project.version} - org.aspectj org.aspectj.ajdt.core ${project.version} - test-jar - test diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml index 8ed061954..22ec19759 100644 --- a/ajde.core/pom.xml +++ b/ajde.core/pom.xml @@ -38,5 +38,15 @@ org.aspectj org.eclipse.jdt.core + + org.aspectj + asm-renamed + + + org.aspectj + testing-util + ${project.version} + test + diff --git a/ajde/pom.xml b/ajde/pom.xml index 42c9e10c4..2c3ad63be 100644 --- a/ajde/pom.xml +++ b/ajde/pom.xml @@ -34,6 +34,10 @@ org.aspectj.ajdt.core ${project.version} + + org.aspectj + asm-renamed + org.aspectj org.aspectj.ajdt.core @@ -50,5 +54,11 @@ ajde.core ${project.version} + + org.aspectj + testing-util + ${project.version} + test + diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml index f7ae7ab00..dee6a59ca 100644 --- a/ajdoc/pom.xml +++ b/ajdoc/pom.xml @@ -34,41 +34,9 @@ org.aspectj.ajdt.core ${project.version} - - - com.github.olivergondza - maven-jdk-tools-wrapper - 0.1 - - - - - org.aspectj - org.eclipse.jdt.core - org.aspectj - org.aspectj.matcher - ${project.version} - test - - - org.aspectj - weaver - ${project.version} - test - - - org.aspectj - bcel-builder - ${project.version} - test - - - org.aspectj - runtime - ${project.version} - test + asm-renamed org.aspectj diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java index f27d3b166..5af5610a9 100644 --- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java +++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java @@ -1,25 +1,25 @@ /* ******************************************************************* * Copyright (c) 2003 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Mik Kersten initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mik Kersten initial implementation * ******************************************************************/ package org.aspectj.tools.ajdoc; import org.aspectj.asm.AsmManager; import org.aspectj.bridge.IMessage; - +import org.aspectj.tools.ajc.Main; /** * Wrapper for ajdoc's use of the AspectJ compiler. - * + * * @author Mik Kersten */ -public class CompilerWrapper extends org.aspectj.tools.ajc.Main { +public class CompilerWrapper extends Main { private static CompilerWrapper INSTANCE = null; diff --git a/build/pom.xml b/build/pom.xml index 6fa02a049..0592f41c1 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -14,12 +14,6 @@ build - - org.aspectj - testing-util - ${project.version} - - ant diff --git a/loadtime/pom.xml b/loadtime/pom.xml index 7c03455e5..f7aae7160 100644 --- a/loadtime/pom.xml +++ b/loadtime/pom.xml @@ -14,11 +14,6 @@ loadtime - - org.aspectj - asm - ${project.version} - org.aspectj bridge @@ -44,58 +39,21 @@ org.aspectj.matcher ${project.version} + + org.aspectj + asm-renamed + org.aspectj testing-util ${project.version} + test org.aspectj bcel-builder ${project.version} - - - xerces - xmlParserAPIs - ${lib.ant.xerces.version} - - - - xerces - xercesImpl - ${lib.ant.xerces.version} - - - - ant - ant - ${lib.ant.version} - - diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml index 165d81505..5e9664987 100644 --- a/org.aspectj.ajdt.core/pom.xml +++ b/org.aspectj.ajdt.core/pom.xml @@ -48,11 +48,7 @@ org.aspectj testing-util ${project.version} - - - org.aspectj - testing-client - ${project.version} + test org.aspectj @@ -60,13 +56,12 @@ org.aspectj - loadtime + org.aspectj.matcher ${project.version} org.aspectj - org.aspectj.matcher - ${project.version} + asm-renamed diff --git a/org.aspectj.lib/pom.xml b/org.aspectj.lib/pom.xml index 2589f1e65..0fa2d2e2c 100644 --- a/org.aspectj.lib/pom.xml +++ b/org.aspectj.lib/pom.xml @@ -18,6 +18,7 @@ org.aspectj testing-util ${project.version} + test diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml index 650dfa3ed..89deb5abf 100644 --- a/org.aspectj.matcher/pom.xml +++ b/org.aspectj.matcher/pom.xml @@ -28,6 +28,7 @@ org.aspectj testing-util ${project.version} + test commons-logging diff --git a/pom.xml b/pom.xml index e94ede8c5..81b26d744 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,11 @@ maven-clean-plugin 3.1.0 + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.2 + @@ -247,6 +252,22 @@ maven-help-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.2 + + + + junit:junit:jar + + + + org.apache.maven.plugins maven-enforcer-plugin @@ -302,6 +323,12 @@ pom import + + junit + junit + 4.13.2 + test + org.aspectj org.eclipse.jdt.core @@ -327,19 +354,13 @@ + - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.vintage - junit-vintage-engine + junit + junit test diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index 1b159f47e..7d7c2959f 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -16,225 +16,133 @@ org.aspectj - bcel-builder - ${project.version} - - - org.aspectj - util - ${project.version} + asm-renamed org.aspectj util ${project.version} test-jar + test org.aspectj ajde ${project.version} test-jar + test org.aspectj ajde.core ${project.version} test-jar + test org.aspectj asm ${project.version} test-jar + test org.aspectj bridge ${project.version} test-jar + test org.aspectj loadtime ${project.version} test-jar + test org.aspectj runtime ${project.version} test-jar + test org.aspectj ajdoc ${project.version} test-jar + test org.aspectj weaver ${project.version} test-jar + test org.aspectj taskdefs ${project.version} test-jar + test org.aspectj testing-client ${project.version} test-jar + test org.aspectj testing-drivers ${project.version} test-jar + test org.aspectj testing-util ${project.version} test-jar + test org.aspectj org.aspectj.matcher ${project.version} test-jar - - - org.aspectj - build - ${project.version} + test org.aspectj build ${project.version} test-jar - - - - - org.aspectj - bridge - ${project.version} - - - org.aspectj - asm - ${project.version} - - - org.aspectj - runtime - ${project.version} - - - org.aspectj - taskdefs - ${project.version} - - - org.aspectj - testing - ${project.version} - - - org.aspectj - testing-client - ${project.version} - - - org.aspectj - testing-drivers - ${project.version} - - - org.aspectj - testing-util - ${project.version} - - - org.aspectj - weaver - ${project.version} + test org.aspectj tests ${project.version} test-jar - - - org.aspectj - org.aspectj.ajdt.core - ${project.version} + test org.aspectj org.aspectj.ajdt.core ${project.version} test-jar + test - - org.aspectj - org.eclipse.jdt.core - - - org.aspectj - ajdoc - ${project.version} - - - org.aspectj - loadtime - ${project.version} - - - org.aspectj - ajde.core - ${project.version} - - - org.aspectj - org.aspectj.matcher - ${project.version} - - - org.aspectj - ajde - ${project.version} - - - org.aspectj - ajbrowser - ${project.version} - - org.aspectj testing ${project.version} test-jar - - - - ant - ant - ${lib.ant.version} - - - - ant - ant-launcher - ${lib.ant.version} + test diff --git a/runtime/pom.xml b/runtime/pom.xml index 554f74a62..4f3230c2f 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -13,14 +13,6 @@ jar runtime - - - org.aspectj - testing-util - ${project.version} - - - diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml index 74abf20a6..f5f35b2d9 100644 --- a/taskdefs/pom.xml +++ b/taskdefs/pom.xml @@ -35,16 +35,8 @@ ${project.version} - - xerces - xmlParserAPIs - ${lib.ant.xerces.version} - - - - xerces - xercesImpl - ${lib.ant.xerces.version} + org.aspectj + asm-renamed diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml index 5ab5f35ec..0132a4441 100644 --- a/testing-drivers/pom.xml +++ b/testing-drivers/pom.xml @@ -19,27 +19,13 @@ bridge ${project.version} - - org.aspectj - weaver - ${project.version} - org.aspectj testing ${project.version} - - - org.aspectj - testing-util - ${project.version} + test-jar test - - org.aspectj - testing-client - ${project.version} - org.aspectj util @@ -52,14 +38,7 @@ org.aspectj - asm - ${project.version} - - - org.aspectj - testing - ${project.version} - test-jar + asm-renamed diff --git a/testing-util/pom.xml b/testing-util/pom.xml index 1b8da6666..34e821665 100644 --- a/testing-util/pom.xml +++ b/testing-util/pom.xml @@ -34,7 +34,8 @@ junit junit - 4.13 + + compile diff --git a/testing/pom.xml b/testing/pom.xml index 0f1089e1f..89877c9e9 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -24,16 +24,6 @@ bridge ${project.version} - - org.aspectj - ajde - ${project.version} - - - org.aspectj - runtime - ${project.version} - org.aspectj asm @@ -54,6 +44,10 @@ bcel-builder ${project.version} + + org.aspectj + asm-renamed + org.aspectj testing-client @@ -90,12 +84,6 @@ ant ${lib.ant.version} - - - regexp - regexp - ${lib.regexp.version} - org.aspectj ajde.core @@ -114,17 +102,6 @@ xmlParserAPIs ${lib.ant.xerces.version} - - - xerces - xercesImpl - ${lib.ant.xerces.version} - - - junit - junit - 4.13 - commons-digester commons-digester @@ -132,7 +109,13 @@ org.aspectj - org.eclipse.jdt.core + ajdoc + ${project.version} + + + commons-logging + commons-logging + ${lib.commons.logging.version} diff --git a/tests/pom.xml b/tests/pom.xml index cc0e602a6..a8d5b27aa 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -36,8 +36,7 @@ org.aspectj - runtime - ${project.version} + asm-renamed org.aspectj @@ -49,68 +48,42 @@ org.aspectj.matcher ${project.version} - - org.aspectj - asm-renamed - org.aspectj org.aspectj.ajdt.core ${project.version} - - org.aspectj - org.eclipse.jdt.core - org.aspectj org.aspectj.ajdt.core ${project.version} test-jar - - - - ant - ant - ${lib.ant.version} + test org.aspectj ajde.core ${project.version} test-jar + test org.aspectj bcel-builder ${project.version} - - org.aspectj - testing - ${project.version} - org.aspectj testing ${project.version} test-jar - - - org.aspectj - testing-drivers - ${project.version} + test org.aspectj testing-util ${project.version} - - - - ant - ant-launcher - ${lib.ant.version} + test diff --git a/weaver/pom.xml b/weaver/pom.xml index 9eaf8f3d1..16f2ccfd9 100644 --- a/weaver/pom.xml +++ b/weaver/pom.xml @@ -28,6 +28,7 @@ org.aspectj testing-util ${project.version} + test org.aspectj -- cgit v1.2.3 From 0be7475fac44a1cbf30e5e719bc4dbd7b4df32c4 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Thu, 15 Apr 2021 18:52:14 +0700 Subject: Remove redundant 'name' and 'packaging' tags from POMs If 'name' is identical to 'artifactId' and 'packaging' has the default value 'jar', we can just remove those tags from the POM. Signed-off-by: Alexander Kriegisch --- ajbrowser/pom.xml | 2 -- ajde.core/pom.xml | 2 -- ajde/pom.xml | 2 -- ajdoc/pom.xml | 2 -- asm/pom.xml | 2 -- bcel-builder/pom.xml | 16 ++++++---------- bridge/pom.xml | 2 -- build/pom.xml | 2 -- docs/pom.xml | 2 -- loadtime/pom.xml | 2 -- org.aspectj.ajdt.core/pom.xml | 2 -- org.aspectj.lib/pom.xml | 2 -- org.aspectj.matcher/pom.xml | 2 -- run-all-junit-tests/pom.xml | 2 -- runtime/pom.xml | 2 -- taskdefs/pom.xml | 2 -- testing-client/pom.xml | 2 -- testing-drivers/pom.xml | 2 -- testing-util/pom.xml | 9 --------- testing/pom.xml | 2 -- tests/bugs1612/pr328099/pom.xml | 1 - tests/pom.xml | 2 -- util/pom.xml | 2 -- weaver/pom.xml | 2 -- 24 files changed, 6 insertions(+), 62 deletions(-) (limited to 'testing-util') diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml index 78041e7c3..a8c63fa32 100644 --- a/ajbrowser/pom.xml +++ b/ajbrowser/pom.xml @@ -10,8 +10,6 @@ ajbrowser - jar - ajbrowser diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml index 22ec19759..59b588f69 100644 --- a/ajde.core/pom.xml +++ b/ajde.core/pom.xml @@ -10,8 +10,6 @@ ajde.core - jar - ajde.core diff --git a/ajde/pom.xml b/ajde/pom.xml index 2c3ad63be..e48254e59 100644 --- a/ajde/pom.xml +++ b/ajde/pom.xml @@ -10,8 +10,6 @@ ajde - jar - ajde diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml index 28076699d..22252b570 100644 --- a/ajdoc/pom.xml +++ b/ajdoc/pom.xml @@ -10,8 +10,6 @@ ajdoc - jar - ajdoc diff --git a/asm/pom.xml b/asm/pom.xml index 9032d6b1f..254832933 100644 --- a/asm/pom.xml +++ b/asm/pom.xml @@ -10,8 +10,6 @@ asm - jar - asm diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml index fde8b9f05..b1c8038bb 100644 --- a/bcel-builder/pom.xml +++ b/bcel-builder/pom.xml @@ -1,18 +1,14 @@ - 4.0.0 - - org.aspectj - bcel-builder - jar - bcel-builder - http://maven.apache.org + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.BUILD-SNAPSHOT + bcel-builder + diff --git a/bridge/pom.xml b/bridge/pom.xml index 2ea3932fa..f85ffa4d9 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -10,8 +10,6 @@ bridge - jar - bridge diff --git a/build/pom.xml b/build/pom.xml index 0592f41c1..477689b27 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -10,8 +10,6 @@ build - jar - build diff --git a/docs/pom.xml b/docs/pom.xml index 9f731bbad..bc20408d8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -9,8 +9,6 @@ docs - jar - docs diff --git a/loadtime/pom.xml b/loadtime/pom.xml index f7aae7160..ae0645a92 100644 --- a/loadtime/pom.xml +++ b/loadtime/pom.xml @@ -10,8 +10,6 @@ loadtime - jar - loadtime diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml index 5e9664987..f77796cb2 100644 --- a/org.aspectj.ajdt.core/pom.xml +++ b/org.aspectj.ajdt.core/pom.xml @@ -10,8 +10,6 @@ org.aspectj.ajdt.core - jar - org.aspectj.ajdt.core diff --git a/org.aspectj.lib/pom.xml b/org.aspectj.lib/pom.xml index 0fa2d2e2c..72d61766d 100644 --- a/org.aspectj.lib/pom.xml +++ b/org.aspectj.lib/pom.xml @@ -10,8 +10,6 @@ runtime - jar - runtime diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml index 89deb5abf..4588c40cd 100644 --- a/org.aspectj.matcher/pom.xml +++ b/org.aspectj.matcher/pom.xml @@ -10,8 +10,6 @@ org.aspectj.matcher - jar - org.aspectj.matcher diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index 7d7c2959f..fe7d15dfb 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -10,8 +10,6 @@ run-all-junit-tests - jar - run-all-junit-tests diff --git a/runtime/pom.xml b/runtime/pom.xml index 4f3230c2f..7607e2823 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -10,8 +10,6 @@ runtime - jar - runtime diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml index f5f35b2d9..db1c8a3cc 100644 --- a/taskdefs/pom.xml +++ b/taskdefs/pom.xml @@ -10,8 +10,6 @@ taskdefs - jar - taskdefs diff --git a/testing-client/pom.xml b/testing-client/pom.xml index 0409be08b..4d1f602ec 100644 --- a/testing-client/pom.xml +++ b/testing-client/pom.xml @@ -10,8 +10,6 @@ testing-client - jar - testing-client diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml index 0132a4441..d15888cef 100644 --- a/testing-drivers/pom.xml +++ b/testing-drivers/pom.xml @@ -10,8 +10,6 @@ testing-drivers - jar - testing-drivers diff --git a/testing-util/pom.xml b/testing-util/pom.xml index 34e821665..384852893 100644 --- a/testing-util/pom.xml +++ b/testing-util/pom.xml @@ -10,17 +10,8 @@ testing-util - jar - testing-util - org.aspectj util diff --git a/testing/pom.xml b/testing/pom.xml index 89877c9e9..eeb45de81 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -10,8 +10,6 @@ testing - jar - testing diff --git a/tests/bugs1612/pr328099/pom.xml b/tests/bugs1612/pr328099/pom.xml index 7cfbfaf5f..ab7a5f1b6 100755 --- a/tests/bugs1612/pr328099/pom.xml +++ b/tests/bugs1612/pr328099/pom.xml @@ -5,7 +5,6 @@ foo.bar aspectj-certificate-problem 1.0-SNAPSHOT - jar UTF-8 diff --git a/tests/pom.xml b/tests/pom.xml index d276169f7..353945550 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -10,8 +10,6 @@ tests - jar - tests diff --git a/util/pom.xml b/util/pom.xml index 1b92b298b..fd34a7700 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -10,7 +10,5 @@ util - jar - util diff --git a/weaver/pom.xml b/weaver/pom.xml index 16f2ccfd9..acac5dfde 100644 --- a/weaver/pom.xml +++ b/weaver/pom.xml @@ -10,8 +10,6 @@ weaver - jar - weaver -- cgit v1.2.3