Use Maven OSGi plugin v1.1.3

git-svn-id: https://svn.argeo.org/commons/trunk@7506 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.util/pom.xml b/org.argeo.util/pom.xml
index 9077e7fc50d541501a5c9f9ab6f7fb78b340eb8e..d1c52d195ce8c9afc8e2f0a706f5f8d91aa84000 100644 (file)
--- a/org.argeo.util/pom.xml
+++ b/org.argeo.util/pom.xml
@@ -8,21 +8,6 @@
        </parent>
        <artifactId>org.argeo.util</artifactId>
        <name>Commons Util (no third party dependencies)</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
-                                                       org.argeo.*
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
        <dependencies>
                <dependency>
                        <groupId>org.argeo.tp</groupId>

diff --git a/pom.xml b/pom.xml
index f2c914d3db960d4b59c23b7e1bcc7bfaf415dac8..b974816e065d15bbbfaa7cbf310f27acb637351d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -221,9 +221,9 @@ limitations under the License.
                                                        <Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                                                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                                                       <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
                                                        <!-- SLC specific instructions -->
                                                        <SLC-Category>${project.groupId}</SLC-Category>
-                                                       <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
                                                </instructions>
                                        </configuration>
                                        <executions>
@@ -237,11 +237,6 @@ limitations under the License.
                                        </executions>
                                </plugin>
                                <!-- Codehaus -->
-                               <!-- <plugin> -->
-                               <!-- <groupId>org.codehaus.mojo</groupId> -->
-                               <!-- <artifactId>buildnumber-maven-plugin</artifactId> -->
-                               <!-- <version>1.0</version> -->
-                               <!-- </plugin> -->
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>rpm-maven-plugin</artifactId>
@@ -249,12 +244,8 @@ limitations under the License.
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
-                                               <release>r${timestamp}.el${rpm.release}</release>
-                                               <distribution>argeo${rpm.release}</distribution>
-                                               <packager>mbaudier@argeo.org</packager>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
-                                               <copyright>2012 Argeo GmbH and others</copyright>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -266,19 +257,8 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.3-SNAPSHOT</version>
+                                       <version>1.1.3</version>
                                </plugin>
-                               <!-- Others -->
-                               <!-- <plugin> -->
-                               <!-- <groupId>com.mycila.maven-license-plugin</groupId> -->
-                               <!-- <artifactId>maven-license-plugin</artifactId> -->
-                               <!-- <version>1.9.0</version> -->
-                               <!-- </plugin> -->
-                               <!-- <plugin> -->
-                               <!-- <groupId>com.agilejava.docbkx</groupId> -->
-                               <!-- <artifactId>docbkx-maven-plugin</artifactId> -->
-                               <!-- <version>2.0.14</version> -->
-                               <!-- </plugin> -->
                                <!-- Site -->
                                <plugin>
                                        <artifactId>maven-site-plugin</artifactId>
@@ -352,52 +332,12 @@ limitations under the License.
                                                                        </reportSet>
                                                                </reportSets>
                                                        </plugin>
-                                                       <!-- <plugin> -->
-                                                       <!-- <groupId>org.codehaus.mojo</groupId> -->
-                                                       <!-- <artifactId>taglist-maven-plugin</artifactId> -->
-                                                       <!-- <version>2.4</version> -->
-                                                       <!-- <configuration> -->
-                                                       <!-- <aggregate>true</aggregate> -->
-                                                       <!-- <tags> -->
-                                                       <!-- <tag>TODO</tag> -->
-                                                       <!-- <tag>FIXME</tag> -->
-                                                       <!-- </tags> -->
-                                                       <!-- </configuration> -->
-                                                       <!-- </plugin> -->
-                                                       <!-- <plugin> -->
-                                                       <!-- <artifactId>maven-changelog-plugin</artifactId> -->
-                                                       <!-- <version>2.2</version> -->
-                                                       <!-- <configuration> -->
-                                                       <!-- <type>date</type> -->
-                                                       <!-- <dates> -->
-                                                       <!-- <date>${developmentCycle.argeo-commons.startDate}</date> -->
-                                                       <!-- </dates> -->
-                                                       <!-- <dateFormat>yyyy-MM-dd</dateFormat> -->
-                                                       <!-- </configuration> -->
-                                                       <!-- </plugin> -->
                                                </reportPlugins>
                                        </configuration>
                                </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>
-                       <!-- <plugin> -->
-                       <!-- <groupId>org.codehaus.mojo</groupId> -->
-                       <!-- <artifactId>buildnumber-maven-plugin</artifactId> -->
-                       <!-- <executions> -->
-                       <!-- <execution> -->
-                       <!-- <phase>generate-resources</phase> -->
-                       <!-- <goals> -->
-                       <!-- <goal>create-timestamp</goal> -->
-                       <!-- </goals> -->
-                       <!-- </execution> -->
-                       <!-- </executions> -->
-                       <!-- <configuration> -->
-                       <!-- <doCheck>false</doCheck> -->
-                       <!-- <doUpdate>false</doUpdate> -->
-                       <!-- <timestampFormat>yyMMdd_HHmm</timestampFormat> -->
-                       <!-- </configuration> -->
-                       <!-- </plugin> -->
                        <plugin>
                                <artifactId>maven-clean-plugin</artifactId>
                                <configuration>
@@ -437,56 +377,10 @@ limitations under the License.
                                        <releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
                                </configuration>
                        </plugin>
-                       <!-- <plugin> -->
-                       <!-- <groupId>com.mycila.maven-license-plugin</groupId> -->
-                       <!-- <artifactId>maven-license-plugin</artifactId> -->
-                       <!-- <configuration> -->
-                       <!-- <header>license-apache2-header.txt</header> -->
-                       <!-- <failIfMissing>true</failIfMissing> -->
-                       <!-- <aggregate>true</aggregate> -->
-                       <!-- <includes> -->
-                       <!-- <include>src/**/*.java</include> -->
-                       <!-- <include>src/**/*.xml</include> -->
-                       <!-- </includes> -->
-                       <!-- <excludes> -->
-                       <!-- <exclude>**/springutil/**</exclude> -->
-                       <!-- <exclude>**/qooxdoo-sdk/**</exclude> -->
-                       <!-- </excludes> -->
-                       <!-- <useDefaultExcludes>true</useDefaultExcludes> -->
-                       <!-- <mapping> -->
-                       <!-- <java>SLASHSTAR_STYLE</java> -->
-                       <!-- <xml>XML_STYLE</xml> -->
-                       <!-- </mapping> -->
-                       <!-- </configuration> -->
-                       <!-- </plugin> -->
-                       <!-- <plugin> -->
-                       <!-- <groupId>com.agilejava.docbkx</groupId> -->
-                       <!-- <artifactId>docbkx-maven-plugin</artifactId> -->
-                       <!-- <configuration> -->
-                       <!-- <sourceDirectory>doc/reference</sourceDirectory> -->
-                       <!-- <targetDirectory>target/site/reference</targetDirectory> -->
-                       <!-- <htmlStylesheet>css/style.css</htmlStylesheet> -->
-                       <!-- <postProcess> -->
-                       <!-- <copy todir="target/site/reference"> -->
-                       <!-- <fileset dir="doc/reference"> -->
-                       <!-- <include name="*/*.css" /> -->
-                       <!-- </fileset> -->
-                       <!-- <fileset dir="doc/reference"> -->
-                       <!-- <include name="img/**" /> -->
-                       <!-- </fileset> -->
-                       <!-- </copy> -->
-                       <!-- </postProcess> -->
-                       <!-- </configuration> -->
-                       <!-- <executions> -->
-                       <!-- <execution> -->
-                       <!-- <goals> -->
-                       <!-- <goal>generate-html</goal> -->
-                       <!-- <goal>generate-pdf</goal> -->
-                       <!-- </goals> -->
-                       <!-- <phase>pre-site</phase> -->
-                       <!-- </execution> -->
-                       <!-- </executions> -->
-                       <!-- </plugin> -->
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                       </plugin>
                </plugins>
        </build>
        <dependencyManagement>
@@ -541,9 +435,6 @@ limitations under the License.
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
-               <!--<repository> <id>argeo-tp-rap</id> <url>http://localhost:9070/data/public/java/eclipse-rap-2.2</url> 
-                       <releases> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> <checksumPolicy>warn</checksumPolicy> 
-                       </releases> </repository> -->
        </repositories>
        <pluginRepositories>
                <pluginRepository>
@@ -576,28 +467,4 @@ limitations under the License.
                        <url>dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
                </site>
        </distributionManagement>
-       <!-- <profiles> -->
-       <!-- <profile> -->
-       <!-- <id>localrepo</id> -->
-       <!-- <distributionManagement> -->
-       <!-- <repository> -->
-       <!-- <id>localrepo</id> -->
-       <!-- <name>Internal Release Repository</name> -->
-       <!-- <url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url> -->
-       <!-- </repository> -->
-       <!-- <site> -->
-       <!-- <id>site</id> -->
-       <!-- <name>Argeo Commons Site</name> -->
-       <!-- <url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url> -->
-       <!-- </site> -->
-       <!-- </distributionManagement> -->
-       <!-- </profile> -->
-       <!-- <profile> -->
-       <!-- <id>el5</id> -->
-       <!-- <properties> -->
-       <!-- <rpm.release>5</rpm.release> -->
-       <!-- <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64</rpm.stagingRepository> -->
-       <!-- </properties> -->
-       <!-- </profile> -->
-       <!-- </profiles> -->
 </project>