Author: tchemit Date: 2012-10-04 16:10:14 +0200 (Thu, 04 Oct 2012) New Revision: 350 Url: http://nuiton.org/repositories/revision/jredmine/350 Log: fixes #2332: Add current jredmine version in rails plugin Modified: branches/jredmine-1.x/jredmine-client/pom.xml branches/jredmine-1.x/jredmine-client/src/main/assembly/jredmine_rails-1.x.xml branches/jredmine-1.x/jredmine-client/src/main/assembly/jredmine_rails-2.x.xml branches/jredmine-1.x/jredmine-client/src/main/redmine/jredmine-1.x/init.rb branches/jredmine-1.x/jredmine-client/src/main/redmine/jredmine-2.x/init.rb Modified: branches/jredmine-1.x/jredmine-client/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/pom.xml 2012-10-04 13:06:45 UTC (rev 349) +++ branches/jredmine-1.x/jredmine-client/pom.xml 2012-10-04 14:10:14 UTC (rev 350) @@ -186,7 +186,7 @@ </profile> <profile> - <id>release-assembly-profile</id> + <id>assembly-profile</id> <activation> <property> <name>performRelease</name> Modified: branches/jredmine-1.x/jredmine-client/src/main/assembly/jredmine_rails-1.x.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/assembly/jredmine_rails-1.x.xml 2012-10-04 13:06:45 UTC (rev 349) +++ branches/jredmine-1.x/jredmine-client/src/main/assembly/jredmine_rails-1.x.xml 2012-10-04 14:10:14 UTC (rev 350) @@ -22,19 +22,23 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<assembly> - <id>jredmine_rails-1.x</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>src/main/redmine/jredmine-1.x</directory> - <outputDirectory>jredmine</outputDirectory> - <includes> - <include>**/*</include> - </includes> - </fileSet> - </fileSets> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>jredmine_rails-1.x</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <filtered>true</filtered> + <directory>src/main/redmine/jredmine-1.x</directory> + <outputDirectory>jredmine</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + </fileSets> </assembly> \ No newline at end of file Modified: branches/jredmine-1.x/jredmine-client/src/main/assembly/jredmine_rails-2.x.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/assembly/jredmine_rails-2.x.xml 2012-10-04 13:06:45 UTC (rev 349) +++ branches/jredmine-1.x/jredmine-client/src/main/assembly/jredmine_rails-2.x.xml 2012-10-04 14:10:14 UTC (rev 350) @@ -22,19 +22,23 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<assembly> - <id>jredmine_rails-2.x</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>src/main/redmine/jredmine-2.x</directory> - <outputDirectory>jredmine</outputDirectory> - <includes> - <include>**/*</include> - </includes> - </fileSet> - </fileSets> +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>jredmine_rails-2.x</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <filtered>true</filtered> + <directory>src/main/redmine/jredmine-2.x</directory> + <outputDirectory>jredmine</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + </fileSets> </assembly> \ No newline at end of file Modified: branches/jredmine-1.x/jredmine-client/src/main/redmine/jredmine-1.x/init.rb =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/redmine/jredmine-1.x/init.rb 2012-10-04 13:06:45 UTC (rev 349) +++ branches/jredmine-1.x/jredmine-client/src/main/redmine/jredmine-1.x/init.rb 2012-10-04 14:10:14 UTC (rev 350) @@ -27,8 +27,9 @@ Redmine::Plugin.register :jredmine do name 'JRedmine Rails plugin' author 'Tony Chemit' + author_url 'http://nuiton.org/users/7' description 'A plugin to expose projects in REST protocol' - version '0.0.1' + version '${project.version}' project_module :jredmine do permission :allow_jredmine, :jredmine => :allow_jredmine end Modified: branches/jredmine-1.x/jredmine-client/src/main/redmine/jredmine-2.x/init.rb =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/redmine/jredmine-2.x/init.rb 2012-10-04 13:06:45 UTC (rev 349) +++ branches/jredmine-1.x/jredmine-client/src/main/redmine/jredmine-2.x/init.rb 2012-10-04 14:10:14 UTC (rev 350) @@ -27,8 +27,9 @@ Redmine::Plugin.register :jredmine do name 'JRedmine Rails plugin' author 'Tony Chemit' + author_url 'http://nuiton.org/users/7' description 'A plugin to expose projects in REST protocol' - version '0.0.1' + version '${project.version}' project_module :jredmine do permission :allow_jredmine, :jredmine => :allow_jredmine end