Java 1.5 not supported anymore

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

diff --git a/pom.xml b/pom.xml
index 9aefbfd00b790cf631b0273b21c60df55d3dbcc6..aa4bbc607ea8341bd01224119b55b7a5a7bb0d7f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,19 +14,15 @@
        <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 -->
-               <version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
-               <version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
                <!-- 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>
+               <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>
@@ -81,13 +77,23 @@ 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>
                <extensions>
                        <extension>
                                <groupId>org.apache.maven.wagon</groupId>
-                               <artifactId>wagon-webdav</artifactId>
-                               <version>1.0-beta-2</version>
+                               <artifactId>wagon-webdav-jackrabbit</artifactId>
+                               <version>2.2</version>
                        </extension>
                </extensions>
                <pluginManagement>
@@ -97,8 +103,8 @@ limitations under the License.
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>2.3.2</version>
                                        <configuration>
-                                               <source>1.5</source>
-                                               <target>1.5</target>
+                                               <source>1.6</source>
+                                               <target>1.6</target>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -151,17 +157,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>
+                                                       <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
                                                </instructions>
                                        </configuration>
                                        <executions>
@@ -178,7 +181,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>
@@ -187,7 +190,7 @@ limitations under the License.
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
-                                               <release>r${buildNumber}.el${rpm.release}</release>
+                                               <release>r${timestamp}.el${rpm.release}</release>
                                                <distribution>argeo${rpm.release}</distribution>
                                                <packager>mbaudier@argeo.org</packager>
                                                <group>Applications/System</group>
@@ -203,7 +206,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>${version.maven-argeo-osgi}</version>
+                                       <version>1.0.33</version>
                                </plugin>
                                <!-- Others -->
                                <plugin>
@@ -221,21 +224,14 @@ 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>
                        </plugin>
                        <plugin>
@@ -284,6 +280,9 @@ limitations under the License.
                                </configuration>
                        </plugin>
                </plugins>
+               <!-- NOTE: This is just a vision for the future, it's not yet implemented: 
+                       see MNG-2216 -->
+               <!-- <sourceEncoding>UTF-8</sourceEncoding> -->
        </build>
        <dependencyManagement>
                <dependencies>