[jboss-cvs] JBossAS SVN: r69502 - in projects/aop/trunk/maven-jbossaop-plugin: src/main/java/org/jboss/maven/plugins and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 31 10:46:31 EST 2008
Author: stalep
Date: 2008-01-31 10:46:31 -0500 (Thu, 31 Jan 2008)
New Revision: 69502
Modified:
projects/aop/trunk/maven-jbossaop-plugin/pom.xml
projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java
projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java
Log:
[JBAOP-453] Updated/cleaned dependencies and added dependencies option.
Modified: projects/aop/trunk/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/pom.xml 2008-01-31 14:49:05 UTC (rev 69501)
+++ projects/aop/trunk/maven-jbossaop-plugin/pom.xml 2008-01-31 15:46:31 UTC (rev 69502)
@@ -9,59 +9,109 @@
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jbossaop-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.CR1</version>
<name>JBoss AOP Maven Plugin</name>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>2.0.8</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.2</version>
+ <version>2.0.8</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.2</version>
+ <version>1.4.9</version>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
- <version>2.0.0.alpha2</version>
+ <version>2.0.0.CR3</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <!-- included in jboss-container -->
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <!-- end included in jboss-container -->
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <!-- this is needed by aopc
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ -->
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-jdk</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ </dependencies>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.ga</version>
- </dependency>
-
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.1-beta-5</version>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
-
- </dependencies>
<repositories>
<repository>
<id>repository.jboss.org</id>
Modified: projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java 2008-01-31 14:49:05 UTC (rev 69501)
+++ projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java 2008-01-31 15:46:31 UTC (rev 69502)
@@ -44,16 +44,12 @@
* Use it by running: mvn jbossaop:compile
*
* Supported options:
- * - aoppath (default src/main/resources/jboss-aop.xml)
+ * - aoppaths[] (default src/main/resources/jboss-aop.xml)
* - verbose (default true)
* - suppress (default false)
* - noopt (default false)
* - report (default false)
- * - includes
- *
- * TODO: multiple jboss-aop.xml files are supported as in ant. eg, they are provided in
- * the same element, and separated with File.pathSeparator. this is not portable and will
- * be looked into.
+ * - includeProjectDependency (default false)
*
* @author <a href="mailto:stale.pedersen at jboss.org">Stale W. Pedersen</a>
* @goal compile
@@ -99,7 +95,15 @@
private boolean failOnError;
/**
+ * If it is set to true all project dependencies will also be included to the aop classpath
*
+ * @parameter expression="${includeProjectDependency}" default-value="false"
+ */
+ private boolean includeProjectDependency;
+
+
+ /**
+ *
* @parameter expression="${classPath}" default-value="${project.build.outputDirectory}"
*/
private String classPath;
@@ -170,10 +174,13 @@
sb.append(a.getFile().toString()).append(File.pathSeparator);
}
-// for(Object o : project.getDependencyArtifacts())
-// {
-// sb.append(((Artifact) o).getFile().toString()).append(File.pathSeparator);
-// }
+ if(includeProjectDependency)
+ {
+ for(Object o : project.getDependencyArtifacts())
+ {
+ sb.append(((Artifact) o).getFile().toString()).append(File.pathSeparator);
+ }
+ }
if(isTest())
sb.append(project.getBuild().getTestOutputDirectory());
Modified: projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java 2008-01-31 14:49:05 UTC (rev 69501)
+++ projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java 2008-01-31 15:46:31 UTC (rev 69502)
@@ -41,7 +41,7 @@
* @author <a href="mailto:stale.pedersen at jboss.org">Stale W. Pedersen</a>
* @goal compile-test
* @phase process-test-classes
- * @requiresDependencyResolution
+ * @requiresDependencyResolution compile-test
*/
public class JBossTestAOPCMojo extends JBossAOPCMojo
{
More information about the jboss-cvs-commits
mailing list