January 2014 - Wlo-commits - mailman.cloud.codelutin.com

r15 - trunk
by tchemit＠users.forge.codelutin.com 22 Jan '14

22 Jan '14

Author: tchemit Date: 2014-01-22 17:04:03 +0100 (Wed, 22 Jan 2014) New Revision: 15 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/15 Log: introduce a sdk version property Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-22 15:54:29 UTC (rev 14) +++ trunk/pom.xml 2014-01-22 16:04:03 UTC (rev 15) @@ -83,7 +83,6 @@ <platform>forge.codelutin.com</platform> <projectId>wlo</projectId> <maven.test.skip>true</maven.test.skip> - <gsonVersion>2.2.4</gsonVersion>  <locales>fr</locales> @@ -96,6 +95,10 @@  <skipPostRelease>false</skipPostRelease> + + <gsonVersion>2.2.4</gsonVersion> + <sdkVersion>19.0.1</sdkVersion> + </properties> @@ -134,21 +137,21 @@ <dependency> <groupId>android.support</groupId> <artifactId>compatibility-v7-appcompat</artifactId> - <version>19</version> + <version>${sdkVersion}</version> <type>apklib</type> </dependency> <dependency> <groupId>android.support</groupId> <artifactId>compatibility-v7-appcompat</artifactId> - <version>19</version> + <version>${sdkVersion}</version> <type>jar</type> </dependency> <dependency> <groupId>android.support</groupId> <artifactId>compatibility-v4</artifactId> - <version>19</version> + <version>${sdkVersion}</version> </dependency>

1 0

r14 - trunk
by tchemit＠users.forge.codelutin.com 22 Jan '14

22 Jan '14

Author: tchemit Date: 2014-01-22 16:54:29 +0100 (Wed, 22 Jan 2014) New Revision: 14 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/14 Log: use wlo group + clean pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-10 10:29:12 UTC (rev 13) +++ trunk/pom.xml 2014-01-22 15:54:29 UTC (rev 14) @@ -4,24 +4,16 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.13</version> + <version>4.5</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>wlo</artifactId> <version>0.1-SNAPSHOT</version> -  -  -  - <name>WLO</name> <description> Application pour les missions de recueil d'information sur les stockes pour l'observation en criée et en mer. @@ -63,12 +55,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/wlo/trunk</url> + <url>https://forge.codelutin.com/svn/wlo/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wlo/trunk + scm:svn:https://svn.forge.codelutin.com/svn/wlo/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wlo/trunk + scm:svn:https://svn.forge.codelutin.com/svn/wlo/trunk </developerConnection> </scm> <distributionManagement> @@ -76,23 +68,17 @@ <id>${platform}</id> <url>${our.site.repository}/${projectId}</url> </site> - <snapshotRepository> - <id>nuiton-nexus-deploy</id> - <url> - http://nexus.nuiton.org/nexus/content/repositories/wlo-snapshot - </url> - </snapshotRepository> </distributionManagement> -  -  -  - <packaging>apk</packaging> <properties> - <javaVersion>1.7</javaVersion> +  + <maven.compiler.source>1.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> <platform>forge.codelutin.com</platform> <projectId>wlo</projectId> @@ -107,6 +93,9 @@  <license.organizationName>Ifremer</license.organizationName> <license.licenseName>gpl_v3</license.licenseName> + +  + <skipPostRelease>false</skipPostRelease> </properties> @@ -127,19 +116,19 @@ </dependency>  -  -  -  -  -  +  +  +  +  +    -  -  -  -  -  +  +  +  +  +   <dependency> @@ -163,10 +152,10 @@ </dependency>  -  -  -  -  +  +  +  +   <dependency> @@ -192,7 +181,7 @@ <repositories> <repository> - <id>amers-public-group</id> + <id>wlo-group</id> <url>http://nexus.nuiton.org/nexus/content/groups/wlo-group/</url> <snapshots> <enabled>true</enabled> @@ -204,25 +193,19 @@ </releases> </repository> - <repository> - <id>achartengine</id> - <name>Public AChartEngine repository</name> - <url>https://repository-achartengine.forge.cloudbees.com/snapshot/</url> - </repository> -  -  -  -  -  -  -  +  +  +  +  +  +   </repositories> <pluginRepositories> <pluginRepository> - <id>amers-public-group</id> + <id>wlo-group</id> <url>http://nexus.nuiton.org/nexus/content/groups/wlo-group/</url> <snapshots> <enabled>true</enabled> @@ -283,37 +266,37 @@   -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +    -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +   </plugins> @@ -416,56 +399,56 @@ <build> <plugins>  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +    -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +   </plugins> @@ -510,20 +493,20 @@ </plugin>  -  -  -  -  -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +  +  +  +  +   </plugins> @@ -531,61 +514,6 @@ </profile> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  <profile> <id>update-file-header</id> @@ -632,4 +560,3 @@ </profiles> </project> -

1 0

r13 - trunk/res/values-fr
by kmorin＠users.forge.codelutin.com 10 Jan '14

10 Jan '14

Author: kmorin Date: 2014-01-10 11:29:12 +0100 (Fri, 10 Jan 2014) New Revision: 13 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/13 Log: translation Modified: trunk/res/values-fr/strings.xml Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-01-10 10:22:22 UTC (rev 12) +++ trunk/res/values-fr/strings.xml 2014-01-10 10:29:12 UTC (rev 13) @@ -23,7 +23,7 @@ <string name="bt_not_enabled_leaving">Bluetooth was not enabled. Leaving Bluetooth Chat.</string> <string name="title_connecting">connecting...</string> <string name="title_connected_to">connected to <xliff:g id="device_name">%1$s</xliff:g></string> - <string name="title_not_connected">not connected</string> + <string name="title_not_connected">Non connecté</string>  <string name="scanning">scanning for devices...</string>

1 0