Author: echatellier Date: 2014-05-07 12:05:32 +0200 (Wed, 07 May 2014) New Revision: 407 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/407 Log: Update version to 1.11.1 Modified: nuiton-js-jquery/trunk/pom.xml Modified: nuiton-js-jquery/trunk/pom.xml =================================================================== --- nuiton-js-jquery/trunk/pom.xml 2014-04-09 08:45:27 UTC (rev 406) +++ nuiton-js-jquery/trunk/pom.xml 2014-05-07 10:05:32 UTC (rev 407) @@ -14,7 +14,11 @@ </parent> <artifactId>nuiton-js-jquery</artifactId> +<<<<<<< .mine + <version>1.11.1-1-SNAPSHOT</version> +======= <version>2.1.0-2-SNAPSHOT</version> +>>>>>>> .r406 <name>Nuiton JS :: JQuery</name> <description>JQuery jar packaging</description> @@ -37,7 +41,7 @@ <properties> <license.licenseName>mit</license.licenseName> - <upstreamVersion>2.1.0</upstreamVersion> + <upstreamVersion>1.11.1</upstreamVersion> <upstreamUrl>http://code.jquery.com/</upstreamUrl> <upstreamFile>jquery-${upstreamVersion}.js</upstreamFile> <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir>