You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/10/31 20:52:38 UTC
svn commit: r590803 - in /maven/components/trunk: build.xml
maven-core/pom.xml
maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj
maven-embedder/pom.xml
Author: jdcasey
Date: Wed Oct 31 12:52:38 2007
New Revision: 590803
URL: http://svn.apache.org/viewvc?rev=590803&view=rev
Log:
Bake compat-aspect weaving into the build for all profiles, to alleviate problems with the non-standard embedder creation.
Modified:
maven/components/trunk/build.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj
maven/components/trunk/maven-embedder/pom.xml
Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=590803&r1=590802&r2=590803&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Wed Oct 31 12:52:38 2007
@@ -268,7 +268,6 @@
<classpath refid="maven.classpath"/>
<arg value="-e"/>
<arg value="-B"/>
- <arg value="-P compat,standard"/>
<arg value="clean"/>
<arg value="install"/>
</java>
Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=590803&r1=590802&r2=590803&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Wed Oct 31 12:52:38 2007
@@ -120,6 +120,13 @@
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
+
+ <!-- Needed for backward compat aspect. -->
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.5.3</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -139,23 +146,6 @@
</excludes>
</configuration>
</plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>compat</id>
-
- <dependencies>
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.5.3</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
@@ -169,8 +159,6 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </plugins>
+ </build>
</project>
Modified: maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj?rev=590803&r1=590802&r2=590803&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj (original)
+++ maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj Wed Oct 31 12:52:38 2007
@@ -66,6 +66,7 @@
&& this( session )
&& notHere();
+ // capture the session instance in play.
after( MavenSession session ): sessionCreation( session )
{
this.session = session;
@@ -76,6 +77,7 @@
&& args( request )
&& notHere();
+ // capture the request instance in play.
before( MavenExecutionRequest request ): methodsTakingRequest( request )
{
this.request = request;
@@ -88,6 +90,7 @@
&& target( manager )
&& notHere();
+ // redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.
PluginDescriptor around( Plugin plugin,
MavenProject project,
PluginManager manager )
@@ -147,6 +150,7 @@
&& target( builder )
&& notHere();
+ // redirect old buildSettings() call to the new one, using the request captured above.
Settings around( MavenSettingsBuilder builder )
throws IOException, XmlPullParserException:
buildSettings( builder )
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=590803&r1=590802&r2=590803&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Wed Oct 31 12:52:38 2007
@@ -68,6 +68,13 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
</dependency>
+
+ <!-- Needed for backward compat aspect. -->
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.5.3</version>
+ </dependency>
</dependencies>
<distributionManagement>
<site>
@@ -77,16 +84,14 @@
</distributionManagement>
<profiles>
<profile>
- <id>compat</id>
-
- <dependencies>
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.5.3</version>
- </dependency>
- </dependencies>
-
+ <!--
+ |
+ | This profile is specifically for creating an embedder that can be used for IntelliJ integration. We need to
+ | remove the JDOM JAR because IntelliJ include its own version, and the JTidy JAR includes org.xml.* classes
+ | which causes a loader constraint issues while loading the embedder.
+ |
+ -->
+ <id>idea</id>
<build>
<plugins>
<plugin>
@@ -110,21 +115,6 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <!--
- |
- | This profile is specifically for creating an embedder that can be used for IntelliJ integration. We need to
- | remove the JDOM JAR because IntelliJ include its own version, and the JTidy JAR includes org.xml.* classes
- | which causes a loader constraint issues while loading the embedder.
- |
- -->
- <id>idea</id>
- <build>
- <plugins>
<plugin>
<artifactId>shade-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>