Skip to content

Commit

Permalink
[ant-gitflow] updated pom on master with new release version
Browse files Browse the repository at this point in the history
  • Loading branch information
Sylvain Marty committed Feb 23, 2018
1 parent 703aed0 commit a5ac109
Showing 1 changed file with 1 addition and 256 deletions.
257 changes: 1 addition & 256 deletions pom.xml
View file
@@ -1,4 +1,3 @@
<<<<<<< HEAD
<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">
<parent>
<artifactId>cls-project-config</artifactId>
Expand All @@ -8,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cls.atoll.motu.client</groupId>
<artifactId>motu-client-python</artifactId>
<version>1.5.00-SNAPSHOT</version>
<version>1.5.00</version>
<packaging>pom</packaging>

<name>Motu Client Python</name>
Expand Down Expand Up @@ -248,259 +247,5 @@
<timezone>+1</timezone>
<properties />
</contributor>
</contributors>

=======
<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">
<parent>
<artifactId>cls-project-config</artifactId>
<groupId>cls.commons</groupId>
<version>1.2.00</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cls.atoll.motu.client</groupId>
<artifactId>motu-client-python</artifactId>
<version>1.5.00-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Motu Client Python</name>
<description>This package holds the python scripts used to address Motu servers for ordering, extracting and
downloading oceanographic data.
</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
<scriptSourceDirectory>${basedir}/src</scriptSourceDirectory>
<testSourceDirectory>${basedir}/bin</testSourceDirectory>
<outputDirectory>${basedir}/bin</outputDirectory>
<testOutputDirectory>${basedir}/bin</testOutputDirectory>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-beta-6</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
<finalName>${project.artifactId}-${project.version}-${build-timestamp}</finalName>
<descriptors>
<descriptor>${basedir}/assembly/bin.xml</descriptor>
<descriptor>${basedir}/assembly/src.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.0</version>
<configuration>
<goals>deploy</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
</plugin>

<!-- Used to build a "build-timestamp" property, this property could be overridden by ANT calls from /motu-distribution/build.xml -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<configuration>
<revisionOnScmFailure>no.scm.config.in.pom</revisionOnScmFailure>
</configuration>
<executions>
<execution>
<id>create-timestamp-id</id>
<phase>validate</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
<configuration>
<timestampFormat>yyyyMMddHHmmssSSS</timestampFormat>
<timestampPropertyName>build-timestamp</timestampPropertyName>
<!-- formats the timestamp all together like 2016-04-04 14:17:05.123
and puts it in the ${myBuildNumberVariable} buildProperty -->
</configuration>
</execution>
</executions>
</plugin>


<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<configuration>
<!--
Task for generating documentation of the script.
Process is based on text2tags (see http://txt2tags.org/) that must be downloaded into {basedir}/target
Generation can be started by invoking the following command line when necessary :
mvn antrun:run
-->
<tasks>
<property name="compile_classpath" refid="maven.plugin.classpath" />
<taskdef name="propertyregex" classname="net.sf.antcontrib.property.RegexTask" classpathref="maven.runtime.classpath" />

<echo message="Generating documentation" />
<echo message="Preparing source" />
<propertyregex property="motu_client_python_version" input="${project.version}" regexp="(.*)-SNAPSHOT" select="\1" global="true" />
<echo message="Version is ${motu_client_python_version}" />
<delete file="${basedir}/target/readme-motu-client.t2t" quiet="true" />
<copy file="${basedir}/src/doc/readme-motu-client.t2t" tofile="${basedir}/target/readme-motu-client.t2t">
<filterchain>
<replacetokens>
<token key="motu-client-python-version" value="${motu_client_python_version}" />
</replacetokens>
</filterchain>
</copy>
<echo message="- Format : man" />
<exec executable="python">
<arg value="${basedir}/txt2tags.py" />
<arg value="-t" />
<arg value="man" />
<arg value="-o" />
<arg value="${basedir}/src/doc/readme-motu-client.man" />
<arg value="${basedir}/target/readme-motu-client.t2t" />
</exec>
<echo message="- Format : txt" />
<exec executable="python">
<arg value="${basedir}/txt2tags.py" />
<arg value="-t" />
<arg value="art" />
<arg value="-o" />
<arg value="${basedir}/src/doc/readme-motu-client.txt" />
<arg value="${basedir}/target/readme-motu-client.t2t" />
</exec>
<echo message="- Format : html" />
<exec executable="python">
<arg value="${basedir}/txt2tags.py" />
<arg value="-t" />
<arg value="html" />
<arg value="-o" />
<arg value="${basedir}/src/doc/readme-motu-client.html" />
<arg value="${basedir}/target/readme-motu-client.t2t" />
</exec>
<echo message="- Format : pdf" />
<exec executable="python" dir="${basedir}/target">
<arg value="${basedir}/txt2tags.py" />
<arg value="-t" />
<arg value="tex" />
<arg value="-o" />
<arg value="${basedir}/target/readme-motu-client.tex" />
<arg value="${basedir}/target/readme-motu-client.t2t" />
</exec>
<!--
<exec executable="pdflatex.exe" dir="${basedir}/target">
<arg value="-output-directory" />
<arg value="${basedir}/src/doc" />
<arg value="-aux-directory" />
<arg value="${basedir}/target" />
<arg value="-interaction" />
<arg value="batchmode" />
<arg value="-quiet" />
<arg value="${basedir}/target/readme-motu-client.tex" />
</exec>
-->
</tasks>
</configuration>
</plugin>
</plugins>
</build>

<organization>
<name>CLS (Collecte Localisation Satelite)</name>
<url>http://www.cls.fr</url>
</organization>

<licenses>
<license>
<name>GNU Lesser General Public License (LGPL)</name>
<url>http://www.gnu.org/licenses/lgpl.html</url>
<distribution>repo</distribution>
<comments>A business-friendly Open Source license</comments>
</license>
</licenses>

<developers>
<developer>
<id>mhebert</id>
<name>Mathieu Hebert</name>
<email>mhebert@cls.fr</email>
<organization>Akka Technologies</organization>
<organizationUrl>http://www.akka.eu</organizationUrl>
<roles>
<role>Main Developer</role>
</roles>
<timezone>+1</timezone>
<properties />
</developer>
<developer>
<id>ccamel</id>
<name>Christophe Camel</name>
<email>ccamel@cls.fr</email>
<organization>CLS</organization>
<organizationUrl>http://www.cls.fr</organizationUrl>
<roles>
<role>Architect</role>
</roles>
<timezone>+1</timezone>
<properties />
</developer>
</developers>

<contributors>
<contributor>
<name>Jean-Michel Zigna</name>
<email>jmzigna@cls.fr</email>
<organization>CLS</organization>
<organizationUrl>http://www.cls.fr</organizationUrl>
<roles>
<role>Project Manager</role>
</roles>
<timezone>+1</timezone>
<properties />
</contributor>
</contributors>

>>>>>>> release/1.5.00
</project>

0 comments on commit a5ac109

Please sign in to comment.