Log Message
Add OSGi information to manifests (XSTR-729).
Modified Paths
- trunk/pom.xml
- trunk/xstream/pom.xml
- trunk/xstream-benchmark/pom.xml
- trunk/xstream-distribution/pom.xml
- trunk/xstream-distribution/src/content/changes.html
- trunk/xstream-hibernate/pom.xml
Diff
Modified: trunk/pom.xml (2043 => 2044)
--- trunk/pom.xml 2013-03-14 17:42:56 UTC (rev 2043)
+++ trunk/pom.xml 2013-03-16 00:57:30 UTC (rev 2044)
@@ -35,6 +35,23 @@
<activation>
<jdk>[1.5,)</jdk>
</activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<modules>
<!--module>xstream-builder</module-->
</modules>
@@ -477,6 +494,24 @@
<artifactId>xsite-maven-plugin</artifactId>
<version>${version.plugin.codehaus.xsite}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${version.plugin.felix.bundle}</version>
+ <configuration>
+ <manifestLocation>${project.build.directory}/OSGi</manifestLocation>
+ <instructions>
+ <_nouses>true</_nouses>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Specification-Version>${project.info.majorVersion}.${project.info.minorVersion}</Specification-Version><!-- FELIX-3392 -->
+ </instructions>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries><!-- FELIX-3392 -->
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -538,6 +573,7 @@
<version.java.target>1.5</version.java.target>
<version.plugin.codehaus.xsite>1.2.1</version.plugin.codehaus.xsite>
+ <version.plugin.felix.bundle>2.3.7</version.plugin.felix.bundle>
<version.plugin.maven.antrun>1.1</version.plugin.maven.antrun>
<version.plugin.maven.assembly>2.1</version.plugin.maven.assembly>
<version.plugin.maven.clean>2.2</version.plugin.maven.clean>
Modified: trunk/xstream/pom.xml (2043 => 2044)
--- trunk/xstream/pom.xml 2013-03-14 17:42:56 UTC (rev 2043)
+++ trunk/xstream/pom.xml 2013-03-16 00:57:30 UTC (rev 2044)
@@ -226,8 +226,26 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive combine.children="append">
+ <manifestFile>${project.build.directory}/OSGi/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions combine.children="append">
+ <Export-Package>!com.thoughtworks.xstream.core.util,com.thoughtworks.xstream.*;-noimport:=true</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/xstream-benchmark/pom.xml (2043 => 2044)
--- trunk/xstream-benchmark/pom.xml 2013-03-14 17:42:56 UTC (rev 2043)
+++ trunk/xstream-benchmark/pom.xml 2013-03-16 00:57:30 UTC (rev 2044)
@@ -41,6 +41,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive combine.children="append">
+ <manifestFile>${project.build.directory}/OSGi/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions combine.children="append">
+ <Export-Package>!com.thoughtworks.xstream.tools.benchmark.model,com.thoughtworks.xstream.tools.benchmark.*;-noimport:=true</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
@@ -59,16 +81,12 @@
<link>${link.javadoc.javase}</link>
</links>
</configuration>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
@@ -97,9 +115,9 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.kxml</groupId>
Modified: trunk/xstream-distribution/pom.xml (2043 => 2044)
--- trunk/xstream-distribution/pom.xml 2013-03-14 17:42:56 UTC (rev 2043)
+++ trunk/xstream-distribution/pom.xml 2013-03-16 00:57:30 UTC (rev 2044)
@@ -22,30 +22,30 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream-hibernate</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream-benchmark</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<profiles>
<profile>
- <id>jdk15-ge</id>
+ <id>jdk16-ge</id>
<activation>
- <jdk>[1.5,)</jdk>
+ <jdk>[1.6,)</jdk>
</activation>
<build>
<plugins>
@@ -103,23 +103,23 @@
</build>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream-hibernate</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream-benchmark</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
Modified: trunk/xstream-distribution/src/content/changes.html (2043 => 2044)
--- trunk/xstream-distribution/src/content/changes.html 2013-03-14 17:42:56 UTC (rev 2043)
+++ trunk/xstream-distribution/src/content/changes.html 2013-03-16 00:57:30 UTC (rev 2044)
@@ -57,6 +57,7 @@
<ul>
<li>Fix missing manifest information.</li>
+ <li>JIRA:XSTR-729: Add OSGi information to manifests.</li>
<li>JIRA:XSTR-719: Support replacement of default converter in any case.</li>
<li>JIRA:XSTR-725: processAnnotation performance improvement in concurrent situation.</li>
<li>JIRA:XSTR-721: EnumConverter is more lenient while parsing constants.</li>
Modified: trunk/xstream-hibernate/pom.xml (2043 => 2044)
--- trunk/xstream-hibernate/pom.xml 2013-03-14 17:42:56 UTC (rev 2043)
+++ trunk/xstream-hibernate/pom.xml 2013-03-16 00:57:30 UTC (rev 2044)
@@ -40,6 +40,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive combine.children="append">
+ <manifestFile>${project.build.directory}/OSGi/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions combine.children="append">
+ <Export-Package>!com.thoughtworks.xstream.hibernate.util,com.thoughtworks.xstream.hibernate.*;-noimport:=true</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
@@ -52,14 +74,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
<source>${version.java.source}</source>
<links>
<link>${link.javadoc.javase}</link>
</links>
</configuration>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</pluginManagement>
<plugins>
<plugin>
@@ -119,17 +140,17 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
<classifier>tests</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${project.version}</version>
+ <version>1.4.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
To unsubscribe from this list please visit:
