Author: tchemit Date: 2012-07-14 18:58:29 +0200 (Sat, 14 Jul 2012) New Revision: 295 Url: http://nuiton.org/repositories/revision/jredmine/295 Log: fixes #2187: Updates to mavenpom 3.3.4 Modified: branches/jredmine-1.x/jredmine-client/pom.xml branches/jredmine-1.x/jredmine-client/src/site/site_fr.xml branches/jredmine-1.x/jredmine-maven-plugin/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/site/site_fr.xml branches/jredmine-1.x/pom.xml branches/jredmine-1.x/src/site/site_fr.xml Modified: branches/jredmine-1.x/jredmine-client/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/pom.xml 2012-07-14 12:33:53 UTC (rev 294) +++ branches/jredmine-1.x/jredmine-client/pom.xml 2012-07-14 16:58:29 UTC (rev 295) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> @@ -71,6 +71,11 @@ </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> @@ -124,18 +129,6 @@ </execution> </executions> </plugin> - <!-- expose tests --> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> @@ -152,49 +145,7 @@ <!-- Maven Environment : profiles --> <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <!-- always compute tests-sources jar --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <!--<goal>jar</goal>--> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- always compute test-javadoc jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <!--<goal>jar</goal>--> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - </build> - </profile> - <profile> <id>reporting</id> <activation> Modified: branches/jredmine-1.x/jredmine-client/src/site/site_fr.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/site/site_fr.xml 2012-07-14 12:33:53 UTC (rev 294) +++ branches/jredmine-1.x/jredmine-client/src/site/site_fr.xml 2012-07-14 16:58:29 UTC (rev 295) @@ -26,43 +26,62 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <body> + <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu ref="parent"/> + <menu ref="parent"/> - <menu name="Utilisateur"> - <item name="Introduction" href="index.html"/> - <item name="JRedmine rails API" href="rails_api.html"/> - <item name="JRedmine java service" href="redmine_service.html"/> - </menu> + <menu name="Utilisateur"> + <item name="Introduction" href="index.html"/> + <item name="JRedmine rails API" href="rails_api.html"/> + <item name="JRedmine java service" href="redmine_service.html"/> + </menu> - <menu name="Téléchargement"> - <item href="http://nuiton.org/projects/list_files/jredmine" name="Sources bundles"/> + <menu name="Téléchargement"> + <item href="http://nuiton.org/projects/list_files/jredmine" name="Sources bundles"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-tests.jar" - name="Test Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-javadoc.jar" - name="Test Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-sources.jar" - name="Test Sources (jar)"/> - </menu> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-tests.jar" + name="Test Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-javadoc.jar" + name="Test Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-client/${project.version}/${project.build.finalName}-test-sources.jar" + name="Test Sources (jar)"/> + </menu> - <menu ref="reports"/> + <menu ref="reports"/> - </body> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: branches/jredmine-1.x/jredmine-maven-plugin/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/pom.xml 2012-07-14 12:33:53 UTC (rev 294) +++ branches/jredmine-1.x/jredmine-maven-plugin/pom.xml 2012-07-14 16:58:29 UTC (rev 295) @@ -23,7 +23,9 @@ #L% --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> @@ -33,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> @@ -47,13 +49,13 @@ <version>${project.version}</version> </dependency> - <dependency> + <!--dependency> <groupId>${project.groupId}</groupId> <artifactId>jredmine-client</artifactId> <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> - </dependency> + </dependency--> <dependency> <groupId>org.nuiton</groupId> @@ -101,7 +103,6 @@ <artifactId>maven-core</artifactId> </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> @@ -112,16 +113,17 @@ <artifactId>maven-artifact</artifactId> </dependency> + <!-- dependencies to mojo annotations --> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> + + <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> </dependency> - <!--dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - </dependency--> - <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> @@ -203,21 +205,28 @@ <build> - <plugins> + <pluginManagement> + <plugins> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> + </plugins> + </pluginManagement> + </build> <!-- ************************************************************* --> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/site/site_fr.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/site/site_fr.xml 2012-07-14 12:33:53 UTC (rev 294) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/site/site_fr.xml 2012-07-14 16:58:29 UTC (rev 295) @@ -26,55 +26,74 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <body> + <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu ref="parent"/> + <menu ref="parent"/> - <menu name="Utilisateur"> - <item name="Introduction" href="index.html"/> - <item name="Usage" href="usage.html"/> - <item name="Goals" href="plugin-info.html"> - <item name="generate-changes" href="generate-changes-mojo.html"/> - <item name="display-data" href="display-data-mojo.html"/> - <item name="generate-email-announcement" href="generate-email-announcement-mojo.html"/> - <item name="generate-news-announcement" href="generate-news-announcement-mojo.html"/> - <item name="update-version" href="update-version-mojo.html"/> - <item name="next-version" href="next-version-mojo.html"/> - <item name="publish-news" href="publish-news-mojo.html"/> - <item name="publish-attachments" href="publish-attachments-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - <item name="Reports" href="plugin-info.html"> - <item name="issues-report" href="issues-report-mojo.html"/> - <item name="issues-report-by-assignee" href="issues-report-by-assignee-mojo.html"/> - <item name="issues-report-by-category" href="issues-report-by-category-mojo.html"/> - <item name="issues-report-by-priority" href="issues-report-by-priority-mojo.html"/> - <item name="issues-report-by-reporter" href="issues-report-by-reporter-mojo.html"/> - <item name="issues-report-by-status" href="issues-report-by-status-mojo.html"/> - <item name="issues-report-by-tracker" href="issues-report-by-tracker-mojo.html"/> - <item name="issues-report-by-version" href="issues-report-by-version-mojo.html"/> - </item> - </menu> + <menu name="Utilisateur"> + <item name="Introduction" href="index.html"/> + <item name="Usage" href="usage.html"/> + <item name="Goals" href="plugin-info.html"> + <item name="generate-changes" href="generate-changes-mojo.html"/> + <item name="display-data" href="display-data-mojo.html"/> + <item name="generate-email-announcement" href="generate-email-announcement-mojo.html"/> + <item name="generate-news-announcement" href="generate-news-announcement-mojo.html"/> + <item name="update-version" href="update-version-mojo.html"/> + <item name="next-version" href="next-version-mojo.html"/> + <item name="publish-news" href="publish-news-mojo.html"/> + <item name="publish-attachments" href="publish-attachments-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + <item name="Reports" href="plugin-info.html"> + <item name="issues-report" href="issues-report-mojo.html"/> + <item name="issues-report-by-assignee" href="issues-report-by-assignee-mojo.html"/> + <item name="issues-report-by-category" href="issues-report-by-category-mojo.html"/> + <item name="issues-report-by-priority" href="issues-report-by-priority-mojo.html"/> + <item name="issues-report-by-reporter" href="issues-report-by-reporter-mojo.html"/> + <item name="issues-report-by-status" href="issues-report-by-status-mojo.html"/> + <item name="issues-report-by-tracker" href="issues-report-by-tracker-mojo.html"/> + <item name="issues-report-by-version" href="issues-report-by-version-mojo.html"/> + </item> + </menu> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> - <menu ref="reports"/> + <menu ref="reports"/> - </body> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: branches/jredmine-1.x/pom.xml =================================================================== --- branches/jredmine-1.x/pom.xml 2012-07-14 12:33:53 UTC (rev 294) +++ branches/jredmine-1.x/pom.xml 2012-07-14 16:58:29 UTC (rev 295) @@ -33,11 +33,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.3.4</version> </parent> <artifactId>jredmine</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> <modules> <module>jredmine-client</module> @@ -229,7 +229,15 @@ <scope>provided</scope> </dependency> + <!-- dependencies to mojo annotations --> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> <version>${mavenVersion}</version> @@ -524,21 +532,16 @@ <projectId>jredmine</projectId> + <helperPluginVersion>1.5-SNAPSHOT</helperPluginVersion> + <!-- must be on a fixed version, not on the snapshot to make possible release --> - <jredminePluginVersion>1.2.2</jredminePluginVersion> + <jredminePluginVersion>1.3</jredminePluginVersion> <doxiaVersion>1.2</doxiaVersion> <!-- documentation is in apt --> <siteSourcesType>apt</siteSourcesType> - <!-- test config --> - <test.redmineUrl>http://www.mynuiton.org</test.redmineUrl> - <test.redmineUsername>chemit</test.redmineUsername> - <test.redminePassword>azer</test.redminePassword> - <test.verbose>false</test.verbose> - <test.encoding>UTF-8</test.encoding> - </properties> <build> @@ -551,11 +554,15 @@ <configuration> <environmentVariables> <test.redmineUrl>${test.redmineUrl}</test.redmineUrl> - <test.redmineUsername>${test.redmineUsername} - </test.redmineUsername> - <test.redminePassword>${test.redminePassword} - </test.redminePassword> - <test.verbose>${test.verbose}</test.verbose> + <jredmine-test.login> + ${jredmine-test.login} + </jredmine-test.login> + <jredmine-test.password> + ${jredmine-test.password} + </jredmine-test.password> + <jredmine-test.verbose> + ${jredmine-test.verbose} + </jredmine-test.verbose> </environmentVariables> </configuration> </plugin> @@ -586,7 +593,7 @@ <plugin> <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> + <artifactId>jredmine-maven-plugin</artifactId> <version>${jredminePluginVersion}</version> <!-- TC-20100106 Due to cyclic dependency problem between modules, we do not propagate jredmine-maven-plugin to child modules --> @@ -618,7 +625,7 @@ <!-- generate the changes.xml from redmine --> <plugin> <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> + <artifactId>jredmine-maven-plugin</artifactId> <!-- TC-20100106 Due to cyclic dependency problem between modules, we do not propagate jredmine-maven-plugin to child modules --> <inherited>false</inherited> @@ -640,8 +647,7 @@ </activation> <properties> <!-- always use this version to perform the profile (to use last improvements) --> - <!-- TODO Uncomment this after release 1.3 --> - <!--jredminePluginVersion>${project.version}</jredminePluginVersion--> + <jredminePluginVersion>${project.version}</jredminePluginVersion> </properties> @@ -659,9 +665,7 @@ <properties> <!-- always use this version to perform the profile (to use last improvements) --> - <!-- TODO Uncomment this after release 1.3 --> - <!--jredminePluginVersion>${project.version}</jredminePluginVersion--> - + <jredminePluginVersion>${project.version}</jredminePluginVersion> </properties> </profile> Modified: branches/jredmine-1.x/src/site/site_fr.xml =================================================================== --- branches/jredmine-1.x/src/site/site_fr.xml 2012-07-14 12:33:53 UTC (rev 294) +++ branches/jredmine-1.x/src/site/site_fr.xml 2012-07-14 16:58:29 UTC (rev 295) @@ -32,6 +32,30 @@ <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.2</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> @@ -43,6 +67,12 @@ <item name="${project.name}" href="index.html"/> </breadcrumbs> + <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> + <menu name="Utilisateur"> <item name="Introduction" href="index.html"/> </menu> @@ -51,5 +81,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>