aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Clement <aclement@pivotal.io>2019-01-31 12:03:30 -0800
committerAndy Clement <aclement@pivotal.io>2019-01-31 12:03:30 -0800
commitb5a9f23c80222f8d68985173c50016ab66c69115 (patch)
tree1cdc0ceb98c7ac92be2e6fbea668081d1390832f
parent1f66dac4c201c23c624cff7cf0751c2aa811e27b (diff)
downloadaspectj-b5a9f23c80222f8d68985173c50016ab66c69115.tar.gz
aspectj-b5a9f23c80222f8d68985173c50016ab66c69115.zip
various polish to previously mavenized projects to support newer ones
-rw-r--r--ajde.core/pom.xml17
-rw-r--r--org.eclipse.jdt.core/pom.xml12
-rw-r--r--testing-util/pom.xml7
-rw-r--r--testing/pom.xml17
-rw-r--r--util/pom.xml9
5 files changed, 53 insertions, 9 deletions
diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml
index d6315cf5b..6f3cae974 100644
--- a/ajde.core/pom.xml
+++ b/ajde.core/pom.xml
@@ -41,4 +41,21 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/org.eclipse.jdt.core/pom.xml b/org.eclipse.jdt.core/pom.xml
index bdb23ccb5..02dd01604 100644
--- a/org.eclipse.jdt.core/pom.xml
+++ b/org.eclipse.jdt.core/pom.xml
@@ -20,15 +20,19 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
+<execution>
+<id>default-install</id>
+<phase>none</phase>
+</execution>
<execution>
- <id>org.aspectj:jdtcore</id>
+ <id>org.aspectj:org.eclipse.jdt.core</id>
<phase>verify</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.aspectj</groupId>
- <artifactId>jdtcore</artifactId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
<version>1.9.3.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<file>${basedir}/jdtcore-for-aspectj.jar</file>
@@ -37,14 +41,14 @@
</configuration>
</execution>
<execution>
- <id>org.aspectj:jdtcore:sources</id>
+ <id>org.aspectj:org.eclipse.jdt.core:sources</id>
<phase>verify</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.aspectj</groupId>
- <artifactId>jdtcore</artifactId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
<version>1.9.3.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<file>${basedir}/jdtcore-for-aspectj-src.zip</file>
diff --git a/testing-util/pom.xml b/testing-util/pom.xml
index 402266f02..9135028f0 100644
--- a/testing-util/pom.xml
+++ b/testing-util/pom.xml
@@ -15,6 +15,13 @@
<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 310d20acf..d998c7d7d 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -140,4 +140,21 @@
<systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/util/pom.xml b/util/pom.xml
index c66446a32..d01d1fa14 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -3,15 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>util</artifactId>
- <packaging>jar</packaging>
- <name>util</name>
-
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
<version>1.9.3.BUILD-SNAPSHOT</version>
- <relativePath>..</relativePath>
</parent>
+ <artifactId>util</artifactId>
+ <packaging>jar</packaging>
+ <name>util</name>
+
</project>