You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/12/01 07:46:18 UTC
svn commit: r885679 - in /geronimo/server/trunk:
framework/bundles/aspectjrt/pom.xml framework/bundles/aspectjweaver/pom.xml
plugins/aspectj/aspectj/src/main/history/dependencies.xml
Author: gawor
Date: Tue Dec 1 06:46:17 2009
New Revision: 885679
URL: http://svn.apache.org/viewvc?rev=885679&view=rev
Log:
do not include non-bundlelized jars
Modified:
geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml
geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml
geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml?rev=885679&r1=885678&r2=885679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml Tue Dec 1 06:46:17 2009
@@ -44,9 +44,10 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.6.2</version>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -55,7 +56,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!--<version>2.0.1-SNAPSHOT</version>-->
<configuration>
<instructions>
<Export-Package>org.aspectj*;version="1.6.2"</Export-Package>
Modified: geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml?rev=885679&r1=885678&r2=885679&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml Tue Dec 1 06:46:17 2009
@@ -44,9 +44,10 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.6.2</version>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -55,7 +56,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!--<version>2.0.1-SNAPSHOT</version>-->
<configuration>
<instructions>
<Export-Package>org.aspectj.weaver*;version="1.6.2"</Export-Package>
Modified: geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml?rev=885679&r1=885678&r2=885679&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml Tue Dec 1 06:46:17 2009
@@ -26,14 +26,4 @@
<artifactId>geronimo-aspectj</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>