You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2012/09/09 13:42:05 UTC
svn commit: r1382463 - in /incubator/sis/trunk: pom.xml sis-app/pom.xml
sis-core/pom.xml sis-metadata/pom.xml
Author: desruisseaux
Date: Sun Sep 9 11:42:04 2012
New Revision: 1382463
URL: http://svn.apache.org/viewvc?rev=1382463&view=rev
Log:
Move OSGi configuration to the root pom.xml (SIS-56).
Modified:
incubator/sis/trunk/pom.xml
incubator/sis/trunk/sis-app/pom.xml
incubator/sis/trunk/sis-core/pom.xml
incubator/sis/trunk/sis-metadata/pom.xml
Modified: incubator/sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sis/trunk/pom.xml?rev=1382463&r1=1382462&r2=1382463&view=diff
==============================================================================
--- incubator/sis/trunk/pom.xml (original)
+++ incubator/sis/trunk/pom.xml Sun Sep 9 11:42:04 2012
@@ -45,8 +45,10 @@
<name>Apache SIS</name>
<url>http://incubator.apache.org/sis/</url>
<description>
- Apache SIS is a toolkit for describing location information, including points,
- bounding boxes, polygons, and for computing distances on that information.
+ <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
+ The leading space after the first line is necessary for proper formatting. -->
+Apache SIS is a toolkit for describing location information, including points,
+ bounding boxes, polygons, and for computing distances on that information.
</description>
<inceptionYear>2010</inceptionYear>
@@ -255,6 +257,8 @@
============================================================== -->
<build>
<plugins>
+
+ <!-- Compile -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -262,6 +266,21 @@
<target>${maven.compile.target}</target>
</configuration>
</plugin>
+
+ <!-- Package as OSGi bundle -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ <!-- Create web site -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
</plugin>
Modified: incubator/sis/trunk/sis-app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sis/trunk/sis-app/pom.xml?rev=1382463&r1=1382462&r2=1382463&view=diff
==============================================================================
--- incubator/sis/trunk/sis-app/pom.xml (original)
+++ incubator/sis/trunk/sis-app/pom.xml Sun Sep 9 11:42:04 2012
@@ -47,8 +47,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>
Modified: incubator/sis/trunk/sis-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sis/trunk/sis-core/pom.xml?rev=1382463&r1=1382462&r2=1382463&view=diff
==============================================================================
--- incubator/sis/trunk/sis-core/pom.xml (original)
+++ incubator/sis/trunk/sis-core/pom.xml Sun Sep 9 11:42:04 2012
@@ -46,23 +46,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- *
- </Import-Package>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: incubator/sis/trunk/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sis/trunk/sis-metadata/pom.xml?rev=1382463&r1=1382462&r2=1382463&view=diff
==============================================================================
--- incubator/sis/trunk/sis-metadata/pom.xml (original)
+++ incubator/sis/trunk/sis-metadata/pom.xml Sun Sep 9 11:42:04 2012
@@ -39,10 +39,9 @@
<packaging>bundle</packaging>
<name>Apache SIS metadata</name>
<url>http://incubator.apache.org/sis/</url>
-
+ <description>
<!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
The leading space after the first line is necessary for proper formatting. -->
- <description>
Implementations of metadata derived from ISO 19115. This module provides both an implementation
of the metadata interfaces defined in GeoAPI, and a framework for handling those metadata through
Java reflection.
@@ -111,28 +110,4 @@ Implementations of metadata derived from
</dependency>
</dependencies>
-
-
- <!-- ===========================================================
- Build configuration
- =========================================================== -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- *
- </Import-Package>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>