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 <Alexander@Kriegisch.name>

diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml
index 78041e7c36cd7ce590ef46a9250424e4cf76f824..a8c63fa32258eefe05d8a9b33a13d7c89d3ca29e 100644 (file)
--- a/ajbrowser/pom.xml
+++ b/ajbrowser/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>ajbrowser</artifactId>
-  <packaging>jar</packaging>
-  <name>ajbrowser</name>
 
   <dependencies>
     <dependency>

diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml
index 22ec19759866acbbb45bd03440b45ebea0e1828d..59b588f699de4e7d4a8d13214e9e4e01658d8f1d 100644 (file)
--- a/ajde.core/pom.xml
+++ b/ajde.core/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>ajde.core</artifactId>
-  <packaging>jar</packaging>
-  <name>ajde.core</name>
 
   <dependencies>
     <dependency>

diff --git a/ajde/pom.xml b/ajde/pom.xml
index 2c3ad63beee86cf453822835b12429395df0cc96..e48254e59775b9288e658bd7e01e9ae2b8aa1a05 100644 (file)
--- a/ajde/pom.xml
+++ b/ajde/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>ajde</artifactId>
-  <packaging>jar</packaging>
-  <name>ajde</name>
 
   <dependencies>
     <dependency>

diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml
index 28076699dccba1a3fdfe3c464d57227d819f7e41..22252b570d9afa61a16da3bf97aa92f0fbb39c0f 100644 (file)
--- a/ajdoc/pom.xml
+++ b/ajdoc/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>ajdoc</artifactId>
-  <packaging>jar</packaging>
-  <name>ajdoc</name>
 
   <build>
     <plugins>

diff --git a/asm/pom.xml b/asm/pom.xml
index 9032d6b1fc5665f02ed2f93c6eada57e98a03cf8..254832933f02820bccfe5213ac07ddec3c964daf 100644 (file)
--- a/asm/pom.xml
+++ b/asm/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>asm</artifactId>
-  <packaging>jar</packaging>
-  <name>asm</name>
 
   <dependencies>
     <dependency>

diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml
index fde8b9f05d057b47eaa21cc26401fd2963e5bf9f..b1c8038bbd5163951e33da3b7bc8b575f6cb0b9b 100644 (file)
--- a/bcel-builder/pom.xml
+++ b/bcel-builder/pom.xml
@@ -1,18 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.aspectj</groupId>
-  <artifactId>bcel-builder</artifactId>
-  <packaging>jar</packaging>
-  <name>bcel-builder</name>
-  <url>http://maven.apache.org</url>
+       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">
+       <modelVersion>4.0.0</modelVersion>
 
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.BUILD-SNAPSHOT</version>
        </parent>
 
+       <artifactId>bcel-builder</artifactId>
+
 </project>

diff --git a/bridge/pom.xml b/bridge/pom.xml
index 2ea3932fac9ec16d9bc29367637df3313f56be9d..f85ffa4d9890c0e322460598b621607d9ec37c06 100644 (file)
--- a/bridge/pom.xml
+++ b/bridge/pom.xml
@@ -10,8 +10,6 @@
        </parent>
 
        <artifactId>bridge</artifactId>
-       <packaging>jar</packaging>
-       <name>bridge</name>
 
        <dependencies>
                <dependency>

diff --git a/build/pom.xml b/build/pom.xml
index 0592f41c1f482e77835ecd9e1ff4317215bba5ec..477689b27f278d0657f3670a5b31eca05d515bf3 100644 (file)
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -10,8 +10,6 @@
        </parent>
 
        <artifactId>build</artifactId>
-       <packaging>jar</packaging>
-       <name>build</name>
 
        <dependencies>
                <dependency>

diff --git a/docs/pom.xml b/docs/pom.xml
index 9f731bbadf366896475da33d7f2d04e399d5fcef..bc20408d825d35aea1536742e5dcad3f8a2fa03b 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -9,8 +9,6 @@
   </parent>
 
   <artifactId>docs</artifactId>
-  <packaging>jar</packaging>
-  <name>docs</name>
 
   <profiles>
     <profile>

diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index f7aae71607a34d05b447bed607084c06bf7a77c7..ae0645a92a44aac3d6147a79b36e40279d096659 100644 (file)
--- a/loadtime/pom.xml
+++ b/loadtime/pom.xml
@@ -10,8 +10,6 @@
        </parent>
 
        <artifactId>loadtime</artifactId>
-       <packaging>jar</packaging>
-       <name>loadtime</name>
 
        <dependencies>
                <dependency>

diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml
index 5e966498734c94972135952d51d5a93b8a16bc74..f77796cb2628d199966a8f2bf5ceb620412b07ec 100644 (file)
--- a/org.aspectj.ajdt.core/pom.xml
+++ b/org.aspectj.ajdt.core/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>org.aspectj.ajdt.core</artifactId>
-  <packaging>jar</packaging>
-  <name>org.aspectj.ajdt.core</name>
 
   <dependencies>
     <dependency>

diff --git a/org.aspectj.lib/pom.xml b/org.aspectj.lib/pom.xml
index 0fa2d2e2c336490a6505d0aa1a7d793ec2411ef3..72d61766d3c82d5e9f703e1547fede6f3cf27d70 100644 (file)
--- a/org.aspectj.lib/pom.xml
+++ b/org.aspectj.lib/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>runtime</artifactId>
-  <packaging>jar</packaging>
-  <name>runtime</name>
 
   <dependencies>
     <dependency>

diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml
index 89deb5abf2eb5d9df965d5a669afd6c66a862fe8..4588c40cdebab6671559d80ee14a3c73e771b580 100644 (file)
--- a/org.aspectj.matcher/pom.xml
+++ b/org.aspectj.matcher/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>org.aspectj.matcher</artifactId>
-  <packaging>jar</packaging>
-  <name>org.aspectj.matcher</name>
 
   <dependencies>
     <dependency>

diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index 7d7c2959f5a6fec440b064603c53e542a88eee97..fe7d15dfbd5b299c88e5c2aa17956e2803139cf7 100644 (file)
--- a/run-all-junit-tests/pom.xml
+++ b/run-all-junit-tests/pom.xml
@@ -10,8 +10,6 @@
        </parent>
 
        <artifactId>run-all-junit-tests</artifactId>
-       <packaging>jar</packaging>
-       <name>run-all-junit-tests</name>
 
        <dependencies>
                <dependency>

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 4f3230c2f809b7f7ee1e78a422f81777536fd452..7607e2823e73fdda8869af4e95f7c38b03f0853e 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -10,8 +10,6 @@
        </parent>
 
        <artifactId>runtime</artifactId>
-       <packaging>jar</packaging>
-       <name>runtime</name>
 
        <build>
                <plugins>

diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml
index f5f35b2d956c8ba3a60badacf9d5f2183e606ad4..db1c8a3cc7eece9de85da4e1f23ab6ee72165a91 100644 (file)
--- a/taskdefs/pom.xml
+++ b/taskdefs/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>taskdefs</artifactId>
-  <packaging>jar</packaging>
-  <name>taskdefs</name>
 
   <dependencies>
     <dependency>

diff --git a/testing-client/pom.xml b/testing-client/pom.xml
index 0409be08bf4d068064dd8cacc0a61cc138a817a2..4d1f602ecf7a93f07c0b8791ff01ca237f0d7f26 100644 (file)
--- a/testing-client/pom.xml
+++ b/testing-client/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>testing-client</artifactId>
-  <packaging>jar</packaging>
-  <name>testing-client</name>
 
   <dependencies>
     <dependency>

diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml
index 0132a4441d5213160f6e4643f864f22a447238e2..d15888cefc915d428cbce48ae12b8c1f71ea46ee 100644 (file)
--- a/testing-drivers/pom.xml
+++ b/testing-drivers/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>testing-drivers</artifactId>
-  <packaging>jar</packaging>
-  <name>testing-drivers</name>
 
   <dependencies>
     <dependency>

diff --git a/testing-util/pom.xml b/testing-util/pom.xml
index 34e821665ebf5cff7314a84bfdbda00c2a8f8e11..384852893e5118e1dab1094278a084accf9d56da 100644 (file)
--- a/testing-util/pom.xml
+++ b/testing-util/pom.xml
@@ -10,17 +10,8 @@
   </parent>
 
   <artifactId>testing-util</artifactId>
-  <packaging>jar</packaging>
-  <name>testing-util</name>
 
   <dependencies>
-<!--
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>asm</artifactId>
-      <version>${project.version}</version>
-    </dependency>
--->
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>util</artifactId>

diff --git a/testing/pom.xml b/testing/pom.xml
index 89877c9e97d88c2efff4be626c2ee44242c3cae7..eeb45de81f08c05b4c9665214eddea391d7590ac 100644 (file)
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>testing</artifactId>
-  <packaging>jar</packaging>
-  <name>testing</name>
 
   <dependencies>
     <dependency>

diff --git a/tests/bugs1612/pr328099/pom.xml b/tests/bugs1612/pr328099/pom.xml
index 7cfbfaf5fc6fdcf2e6553a5cd7eab6bc1d0352dd..ab7a5f1b6fadaef14f1fe35ffaa32cc0f907afe9 100755 (executable)
--- a/tests/bugs1612/pr328099/pom.xml
+++ b/tests/bugs1612/pr328099/pom.xml
@@ -5,7 +5,6 @@
   <groupId>foo.bar</groupId>
   <artifactId>aspectj-certificate-problem</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/tests/pom.xml b/tests/pom.xml
index d276169f76027064413a32efaad2c1aeb0079f51..3539455509f62762c9735648428c9a5cd553f4f9 100644 (file)
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -10,8 +10,6 @@
        </parent>
 
        <artifactId>tests</artifactId>
-       <packaging>jar</packaging>
-       <name>tests</name>
 
        <dependencies>
                <dependency>

diff --git a/util/pom.xml b/util/pom.xml
index 1b92b298b25cc1deae4b1f92c6b43ed3787d0f97..fd34a7700ef0825b5e689aa0744bb4d5de795a79 100644 (file)
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -10,7 +10,5 @@
   </parent>
 
   <artifactId>util</artifactId>
-  <packaging>jar</packaging>
-  <name>util</name>
 
 </project>

diff --git a/weaver/pom.xml b/weaver/pom.xml
index 16f2ccfd9c9e6180e23d002da1e9cdfd3aab8fd7..acac5dfdea5b85926a8c36bbeaf22807a8a99241 100644 (file)
--- a/weaver/pom.xml
+++ b/weaver/pom.xml
@@ -10,8 +10,6 @@
   </parent>
 
   <artifactId>weaver</artifactId>
-  <packaging>jar</packaging>
-  <name>weaver</name>
 
   <dependencies>
     <dependency>