You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/09 23:53:07 UTC
svn commit: r665908 - /servicemix/components/components-pom/trunk/pom.xml
Author: gnodet
Date: Mon Jun 9 14:53:07 2008
New Revision: 665908
URL: http://svn.apache.org/viewvc?rev=665908&view=rev
Log:
Fix components pom legal stuff, SM-1387: make components, OSGi friendly
Modified:
servicemix/components/components-pom/trunk/pom.xml
Modified: servicemix/components/components-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/components-pom/trunk/pom.xml?rev=665908&r1=665907&r2=665908&view=diff
==============================================================================
--- servicemix/components/components-pom/trunk/pom.xml (original)
+++ servicemix/components/components-pom/trunk/pom.xml Mon Jun 9 14:53:07 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.apache.servicemix</groupId>
@@ -56,10 +56,11 @@
<snapshots-repo-name>Apache Snapshots Repository</snapshots-repo-name>
<snapshots-repo-url>http://people.apache.org/repo/m2-snapshot-repository</snapshots-repo-url>
<servicemix-version>3.2.1</servicemix-version>
+ <servicemix-legal-version>1.0</servicemix-legal-version>
<xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
<xfire-version>1.2.5</xfire-version>
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
- <xbean-version>3.2</xbean-version>
+ <xbean-version>3.4.1</xbean-version>
<spring-version>2.0.6</spring-version>
<activemq-version>5.1.0</activemq-version>
<activeio-version>3.1.0</activeio-version>
@@ -82,6 +83,10 @@
<jaxb.xjc.version>2.1.6</jaxb.xjc.version>
<derby-version>10.2.2.0</derby-version>
<saxon-version>8.9</saxon-version>
+ <felix-plugin-version>1.4.1</felix-plugin-version>
+
+ <servicemix.osgi.export>org.apache.servicemix*</servicemix.osgi.export>
+ <servicemix.osgi.import>*</servicemix.osgi.import>
</properties>
<build>
@@ -139,12 +144,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.1</version>
<configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</configuration>
</plugin>
<plugin>
@@ -192,37 +192,97 @@
</execution>
</executions>
</plugin>
-<!-- disable for now.. causing: Error loading supplemental data models: Could not find resource 'notice-supplements.xml'.
<plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>build</artifactId>
- <version>${servicemix-version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <supplementalModels>
- <supplementalModel>notice-supplements.xml</supplementalModel>
- </supplementalModels>
- <properties>
- <projectName>Apache ServiceMix</projectName>
- </properties>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>copy-legal</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.legal</groupId>
+ <artifactId>legal</artifactId>
+ <version>${servicemix-legal-version}</version>
+ <type>xml</type>
+ <outputDirectory>target/legal/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.legal</groupId>
+ <artifactId>legal</artifactId>
+ <version>${servicemix-legal-version}</version>
+ <type>xml</type>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>build</artifactId>
+ <version>${servicemix-version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <supplementalModels>
+ <supplementalModel>target/legal/legal.xml</supplementalModel>
+ </supplementalModels>
+ <properties>
+ <addLicense>true</addLicense>
+ <addArtifact>true</addArtifact>
+ <projectName>Apache ServiceMix</projectName>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${felix-plugin-version}</version>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Export-Package>${servicemix.osgi.export}</Export-Package>
+ <Import-Package>${servicemix.osgi.import}</Import-Package>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ </instructions>
+ <supportedProjectTypes>
+ <supportedProjectType>jbi-component</supportedProjectType>
+ </supportedProjectTypes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
--->
</plugins>
</build>
<reporting>