[maven-release-plugin] prepare for next development iteration

[gpl/argeo-slc.git] / server / org.argeo.slc.ria / pom.xml

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 21255e43abdb7d8d9f502d33d9a20d9532dab037..662fc1afb4413800dcbf3be7014412c49dbbce01 100644 (file)
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -1,26 +1,33 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>server</artifactId>
-               <version>0.11.4-SNAPSHOT</version>
+               <version>0.12.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.server</groupId>
        <artifactId>org.argeo.slc.ria</artifactId>
        <packaging>jar</packaging>
-       <name>Argeo SLC RIA</name>
+       <name>SLC RIA</name>
        <build>
+               <resources>
+                       <resource>
+                               <directory>src</directory>
+                               <includes>
+                                       <include>index.jsp</include>
+                                       <include>WEB-INF/*</include>
+                               </includes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.argeo.slc.maven</groupId>
+                               <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-                               <version>0.8.1.6</version>
+                               <version>${version.maven-argeo-qooxdoo}</version>
+                               <configuration>
+                                       <sdkVersion>0.8.2.argeo.1</sdkVersion>
+                               </configuration>
                                <executions>
                                        <execution>
                                                <id>env</id>
@@ -30,7 +37,7 @@
                                                </goals>
                                        </execution>
                                        <execution>
-                                               <id>env</id>
+                                               <id>env-site</id>
                                                <phase>pre-site</phase>
                                                <goals>
                                                        <goal>env</goal>
@@ -82,33 +89,77 @@
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>
                                        <archive>
-                                               <compress>false</compress>
-                                               <manifestFile>src/META-INF/MANIFEST.MF</manifestFile>
+                                               <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
                                        </archive>
-                                       <classesDirectory>src/</classesDirectory>
-                                       <includes>
-                                               <include>index.jsp</include>
-                                               <include>argeo-ria/**</include>
-                                               <include>WEB-INF/*</include>
-                                       </includes>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                                               <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+                                               <Export-Package />
+                                               <Import-Package>
+                                                       javax.servlet,
+                                                       javax.servlet.http,
+                                                       javax.servlet.jsp,
+                                                       javax.servlet.jsp.jstl.core,
+                                                       javax.servlet.jsp.jstl.fmt,
+                                                       javax.servlet.jsp.jstl.tlv,
+                                                       javax.servlet.resources,
+                                                       org.springframework.security.ui.webapp,
+                                                       org.springframework.security.userdetails.memory,
+                                                       org.springframework.web.context,
+                                                       org.springframework.osgi.web.context.support,
+                                                       org.springframework.web.filter,
+                                                       org.springframework.security.context
+                                               </Import-Package>
+                                               <Web-ContextPath>org.argeo.slc.ria</Web-ContextPath>
+                                       </instructions>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>bundle-manifest</id>
+                                               <phase>process-classes</phase>
+                                               <goals>
+                                                       <goal>manifest</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-assembly-plugin</artifactId>
+                               <artifactId>maven-dependency-plugin</artifactId>
                                <executions>
                                        <execution>
-                                               <id>assembly-ria</id>
-                                               <phase>package</phase>
+                                               <id>unpack-argeo-ria-sdk</id>
+                                               <phase>initialize</phase>
                                                <goals>
-                                                       <goal>single</goal>
+                                                       <goal>unpack</goal>
                                                </goals>
                                                <configuration>
-                                                       <descriptors>
-                                                               <descriptor>assembly/ria.xml</descriptor>
-                                                       </descriptors>
+                                                       <artifactItems>
+                                                               <artifactItem>
+                                                                       <groupId>org.argeo.ria</groupId>
+                                                                       <artifactId>org.argeo.ria.core</artifactId>
+                                                                       <classifier>ria</classifier>
+                                                                       <type>zip</type>
+                                                                       <outputDirectory>src/argeo-ria-src</outputDirectory>
+                                                               </artifactItem>
+                                                       </artifactItems>
+                                                       <overWriteReleases>false</overWriteReleases>
+                                                       <overWriteSnapshots>true</overWriteSnapshots>
                                                </configuration>
                                        </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <executions>
                                        <execution>
                                                <id>assembly-ria-slc</id>
                                                <phase>package</phase>