You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/13 23:31:13 UTC
svn commit: r1325962 - in /archiva/redback/redback-components/trunk:
redback-components-parent/pom.xml spring-utils/pom.xml
Author: olamy
Date: Fri Apr 13 21:31:12 2012
New Revision: 1325962
URL: http://svn.apache.org/viewvc?rev=1325962&view=rev
Log:
spring-utils is now a bundle
Modified:
archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
archiva/redback/redback-components/trunk/spring-utils/pom.xml
Modified: archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/redback-components-parent/pom.xml?rev=1325962&r1=1325961&r2=1325962&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/redback-components-parent/pom.xml (original)
+++ archiva/redback/redback-components/trunk/redback-components-parent/pom.xml Fri Apr 13 21:31:12 2012
@@ -159,57 +159,71 @@
</repositories>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <tagBase>https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags</tagBase>
+ <arguments>-Prelease</arguments>
+ <goals>clean deploy</goals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <tagBase>https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags</tagBase>
- <arguments>-Prelease</arguments>
- <goals>clean deploy</goals>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>2.2</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
</build>
<reporting>
<plugins>
Modified: archiva/redback/redback-components/trunk/spring-utils/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-utils/pom.xml?rev=1325962&r1=1325961&r2=1325962&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-utils/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-utils/pom.xml Fri Apr 13 21:31:12 2012
@@ -29,6 +29,7 @@
<version>2.0-SNAPSHOT</version>
<name>Spring Utils Goodies</name>
<description>Contains some spring goodies.</description>
+ <packaging>bundle</packaging>
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
@@ -121,12 +122,37 @@
</dependencies>
- <developers>
- <developer>
- <email>olamy@apache.org</email>
- <name>Olivier Lamy</name>
- </developer>
- </developers>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.archiva.common.plexusbridge</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Export-Package>
+ org.apache.archiva.redback.components.springutils;;version=${project.version},
+ org.apache.archiva.redback.components.springutils.plexusshim;version=${project.version}
+ </Export-Package>
+ <Import-Package>
+ javax.inject,
+ org.codehaus.plexus,
+ org.codehaus.plexus.classworlds,
+ org.codehaus.plexus.classworlds.realm,
+ org.codehaus.plexus.component.repository.exception,
+ org.springframework.stereotype,
+ org.apache.commons.lang,
+ org.springframework.beans.factory.support,
+ org.springframework.context,
+ org.springframework.web.context.support,
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<reporting>
<plugins>