June 2015 - Sammoa-commits - mailman.cloud.codelutin.com

r740 - branches/sammoa-1.0.4.x
by sbavencoff＠users.forge.codelutin.com June 2, 2015

June 2, 2015

Author: sbavencoff Date: 2015-06-02 14:46:21 +0000 (Tue, 02 Jun 2015) New Revision: 740 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/740 Log: fix url logo Modified: branches/sammoa-1.0.4.x/pom.xml Modified: branches/sammoa-1.0.4.x/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/pom.xml 2015-06-02 13:42:55 UTC (rev 739) +++ branches/sammoa-1.0.4.x/pom.xml 2015-06-02 14:46:21 UTC (rev 740) @@ -122,6 +122,8 @@  <relativizeDecorationLinks>false</relativizeDecorationLinks> + <siteCommonResourcesUrl>http://doc.nuiton.org/common/0.3</siteCommonResourcesUrl> +  <license.organizationName> UMS 3462, Code Lutin

1 0

r739 - branches/sammoa-1.0.4.x/src/site
by sbavencoff＠users.forge.codelutin.com June 2, 2015

June 2, 2015

Author: sbavencoff Date: 2015-06-02 13:42:55 +0000 (Tue, 02 Jun 2015) New Revision: 739 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/739 Log: fix url logo Modified: branches/sammoa-1.0.4.x/src/site/site.xml Modified: branches/sammoa-1.0.4.x/src/site/site.xml =================================================================== --- branches/sammoa-1.0.4.x/src/site/site.xml 2015-06-02 12:57:48 UTC (rev 738) +++ branches/sammoa-1.0.4.x/src/site/site.xml 2015-06-02 13:42:55 UTC (rev 739) @@ -60,19 +60,19 @@ <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + <logo href="https://jrst.nuiton.org" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> + <logo href="https://topia.nuiton.org" name="ToPIA" + img="${mavenpomSiteCommonResourcesUrl}/images/logos/topia-logo.png"/> - <logo href="http://maven-site.nuiton.org/jaxx" name="JAXX" - img="http://maven-site.nuiton.org/public/images/logos/jaxx-logo.png"/> + <logo href="https://jaxx.nuiton.org" name="JAXX" + img="${siteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> @@ -80,11 +80,11 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="${siteCommonResourcesUrl}/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="${siteCommonResourcesUrl}/css/mavenpom-site.css"/> </head> <links>

1 0

r738 - in branches/sammoa-1.0.4.x: . sammoa-application
by sbavencoff＠users.forge.codelutin.com June 2, 2015

June 2, 2015

Author: sbavencoff Date: 2015-06-02 12:57:48 +0000 (Tue, 02 Jun 2015) New Revision: 738 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/738 Log: fix pom dependecies Modified: branches/sammoa-1.0.4.x/pom.xml branches/sammoa-1.0.4.x/sammoa-application/pom.xml Modified: branches/sammoa-1.0.4.x/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/pom.xml 2015-06-02 12:43:44 UTC (rev 737) +++ branches/sammoa-1.0.4.x/pom.xml 2015-06-02 12:57:48 UTC (rev 738) @@ -163,12 +163,6 @@ <dependencies> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commonsLoggingVersion}</version> - </dependency> - - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>${commonsCollectionsVersion}</version> Modified: branches/sammoa-1.0.4.x/sammoa-application/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/sammoa-application/pom.xml 2015-06-02 12:43:44 UTC (rev 737) +++ branches/sammoa-1.0.4.x/sammoa-application/pom.xml 2015-06-02 12:57:48 UTC (rev 738) @@ -140,10 +140,6 @@ <artifactId>h2</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> </dependencies>

1 0

r737 - branches/sammoa-1.0.4.x
by sbavencoff＠users.forge.codelutin.com June 2, 2015

June 2, 2015

Author: sbavencoff Date: 2015-06-02 12:43:44 +0000 (Tue, 02 Jun 2015) New Revision: 737 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/737 Log: update parent pom Modified: branches/sammoa-1.0.4.x/pom.xml Modified: branches/sammoa-1.0.4.x/pom.xml =================================================================== --- branches/sammoa-1.0.4.x/pom.xml 2014-10-20 09:57:56 UTC (rev 736) +++ branches/sammoa-1.0.4.x/pom.xml 2015-06-02 12:43:44 UTC (rev 737) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7</version> + <version>6.1</version> </parent> <groupId>fr.ulr</groupId> @@ -74,8 +74,8 @@ </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${siteDeployId}</id> + <url>${siteDeployUrl}</url> </site> </distributionManagement> @@ -112,6 +112,13 @@ <i18n.bundles>en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> + <guavaVersion>17.0</guavaVersion> + <commonsLang3Version>3.3.2</commonsLang3Version> + <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> + <junitVersion>4.11</junitVersion> + <commonsIoVersion>2.4</commonsIoVersion> + <commonsLoggingVersion>1.1.3</commonsLoggingVersion> +  <relativizeDecorationLinks>false</relativizeDecorationLinks> @@ -156,6 +163,43 @@ <dependencies> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commonsLoggingVersion}</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commonsCollectionsVersion}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commonsLang3Version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junitVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commonsIoVersion}</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commonsLoggingVersion}</version> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version>

1 0