From 0be7475fac44a1cbf30e5e719bc4dbd7b4df32c4 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Thu, 15 Apr 2021 18:52:14 +0700 Subject: [PATCH] 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(-) 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 -- 2.39.5