Import all JCR packages so that thread bound session can be proxied for AOP

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b14f90a6e177e3f601d144213ff4f10fe62f6fa5..d1d922b3dfb87ccac980d6d36825536bc6f00da4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
        <packaging>pom</packaging>
        <properties>
                <developmentCycle>0.3</developmentCycle>
-               <version.argeo-distribution>1.1.7-SNAPSHOT</version.argeo-distribution>
+               <version.argeo-distribution>1.1.7</version.argeo-distribution>
                <version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
                <version.equinox>3.6.2</version.equinox>
                <!-- maven -->
@@ -23,7 +23,10 @@
                <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+               <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
+               <!-- encoding, see http://is.gd/mvn_source_encoding -->
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
        <modules>
                <module>basic</module>
@@ -36,7 +39,8 @@
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
                <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
+               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk
+               </developerConnection>
                <url>https://svn.argeo.org/commons/trunk</url>
        </scm>
        <licenses>
@@ -77,8 +81,20 @@ limitations under the License.
                                <role>QA</role>
                        </roles>
                </developer>
+               <developer>
+                       <id>bsinou</id>
+                       <name>Bruno Sinou</name>
+                       <email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
+                       <organization>Argeo</organization>
+                       <organizationUrl>http://www.argeo.org</organizationUrl>
+                       <roles>
+                               <role>developer</role>
+                       </roles>
+               </developer>
        </developers>
        <build>
+               <!-- NOTE: This is just a vision for the future, it's not yet implemented: 
+                       see MNG-2216 <sourceEncoding>UTF-8</sourceEncoding> -->
                <extensions>
                        <extension>
                                <groupId>org.apache.maven.wagon</groupId>
@@ -147,15 +163,14 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>2.2.0</version>
+                                       <version>2.3.7</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <manifestLocation>META-INF</manifestLocation>
                                                <instructions>
-                                                       <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+                                                       <Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                                                        <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-                                                       <_removeheaders>Bnd-LastModified</_removeheaders>
                                                </instructions>
                                        </configuration>
                                        <executions>
@@ -172,7 +187,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>buildnumber-maven-plugin</artifactId>
-                                       <version>1.0-beta-4</version>
+                                       <version>1.0</version>
                                </plugin>
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
@@ -181,8 +196,8 @@ limitations under the License.
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
-                                               <release>r${buildNumber}.el6</release>
-                                               <distribution>argeo6</distribution>
+                                               <release>r${timestamp}.el${rpm.release}</release>
+                                               <distribution>argeo${rpm.release}</distribution>
                                                <packager>mbaudier@argeo.org</packager>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
@@ -215,22 +230,27 @@ limitations under the License.
                                        <execution>
                                                <phase>generate-resources</phase>
                                                <goals>
-                                                       <goal>create</goal>
+                                                       <goal>create-timestamp</goal>
                                                </goals>
                                        </execution>
                                </executions>
                                <configuration>
                                        <doCheck>false</doCheck>
                                        <doUpdate>false</doUpdate>
-                                       <format>{0,date,yyyyMMdd_HHmmss}</format>
-                                       <items>
-                                               <item>timestamp</item>
-                                       </items>
-                                       <revisionOnScmFailure>git</revisionOnScmFailure>
-                                       <providerImplementations>
-                                               <git>svn</git>
-                                       </providerImplementations>
+                                       <timestampFormat>yyMMdd_HHmm</timestampFormat>
                                </configuration>
+                               <!-- <configuration> -->
+                               <!-- <doCheck>false</doCheck> -->
+                               <!-- <doUpdate>false</doUpdate> -->
+                               <!-- <format>{0,date,yyyyMMdd_HHmmss}</format> -->
+                               <!-- <items> -->
+                               <!-- <item>timestamp</item> -->
+                               <!-- </items> -->
+                               <!-- <revisionOnScmFailure>git</revisionOnScmFailure> -->
+                               <!-- <providerImplementations> -->
+                               <!-- <git>svn</git> -->
+                               <!-- </providerImplementations> -->
+                               <!-- </configuration> -->
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -424,12 +444,14 @@ limitations under the License.
                                <repository>
                                        <id>localrepo</id>
                                        <name>Internal Release Repository</name>
-                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo</url>
+                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
+                                       </url>
                                </repository>
                                <snapshotRepository>
                                        <id>localrepo.snapshots</id>
                                        <name>Internal Snapshot Repository</name>
-                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo</url>
+                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
+                                       </url>
                                </snapshotRepository>
                        </distributionManagement>
                </profile>
@@ -440,5 +462,13 @@ limitations under the License.
                                <module>sandbox</module>
                        </modules>
                </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>
\ No newline at end of file