|
From: <de...@us...> - 2011-11-25 14:16:07
|
Revision: 6710
http://fudaa.svn.sourceforge.net/fudaa/?rev=6710&view=rev
Author: deniger
Date: 2011-11-25 14:15:54 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/pom/business-pom/pom.xml
trunk/pom/soft-pom/pom.xml
trunk/pom/super-pom/pom.xml
Modified: trunk/pom/business-pom/pom.xml
===================================================================
--- trunk/pom/business-pom/pom.xml 2011-11-24 16:17:00 UTC (rev 6709)
+++ trunk/pom/business-pom/pom.xml 2011-11-25 14:15:54 UTC (rev 6710)
@@ -8,7 +8,7 @@
-->
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>0.9</version>
+ <version>1.0</version>
</parent>
<properties>
<businessGroupId>org.fudaa.business</businessGroupId>
@@ -23,6 +23,22 @@
<url>scp://fudaa.fr/cygdrive/c/Inetpub/fudaa/sites/devel/fudaa-business</url>
</site>
</distributionManagement>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>libs-releases</name>
+ <url>http://repository.fudaa.fr/artifactory/libs-releases</url>
+ </repository>
+ <repository>
+ <snapshots />
+ <id>snapshots</id>
+ <name>libs-snapshots</name>
+ <url>http://repository.fudaa.fr/artifactory/libs-snapshots</url>
+ </repository>
+ </repositories>
<scm>
<connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/business/</connection>
<developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/business/</developerConnection>
Modified: trunk/pom/soft-pom/pom.xml
===================================================================
--- trunk/pom/soft-pom/pom.xml 2011-11-24 16:17:00 UTC (rev 6709)
+++ trunk/pom/soft-pom/pom.xml 2011-11-25 14:15:54 UTC (rev 6710)
@@ -3,26 +3,34 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <!--
- le super déclare tous les plugins et les configurations communes
- -->
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>0.9</version>
+ <version>1.0</version>
</parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>soft-pom</artifactId>
+ <packaging>pom</packaging>
+ <name>soft-pom</name>
<properties>
<softGroupId>org.fudaa.soft</softGroupId>
</properties>
- <artifactId>soft-pom</artifactId>
- <packaging>pom</packaging>
- <name>soft-pom</name>
<url>http://www.fudaa.fr/sites/devel/fudaa-soft/</url>
- <distributionManagement>
- <site>
- <id>site-fudaa</id>
- <url>scp://fudaa.fr/cygdrive/c/Inetpub/fudaa/sites/devel/fudaa-soft</url>
- </site>
- </distributionManagement>
+<!-- <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>libs-releases</name>
+ <url>http://repository.fudaa.fr/artifactory/libs-releases</url>
+ </repository>
+ <repository>
+ <snapshots />
+ <id>snapshots</id>
+ <name>libs-snapshots</name>
+ <url>http://repository.fudaa.fr/artifactory/libs-snapshots</url>
+ </repository>
+ </repositories>-->
<scm>
<connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/soft/</connection>
<developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/soft/</developerConnection>
Modified: trunk/pom/super-pom/pom.xml
===================================================================
--- trunk/pom/super-pom/pom.xml 2011-11-24 16:17:00 UTC (rev 6709)
+++ trunk/pom/super-pom/pom.xml 2011-11-25 14:15:54 UTC (rev 6710)
@@ -1,284 +1,245 @@
-<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>super-pom</artifactId>
- <packaging>pom</packaging>
- <version>0.9</version>
- <name>Super Pom</name>
- <url>http://fudaa.fr</url>
- <properties>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>super-pom</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0</version>
+ <name>Super Pom</name>
+ <url>http://fudaa.fr</url>
+ <properties>
<!--
l'encoding pour les projets: a therme il faudrait changer cela en
UTF-8
-->
<!-- Certains projets applicatifs peuvent le faire -->
- <projetEncoding>ISO-8859-15</projetEncoding>
+ <projetEncoding>ISO-8859-15</projetEncoding>
<!-- la version du compiler -->
- <javaCompiler>1.6</javaCompiler>
- <ctuluGroupId>org.fudaa.framework.ctulu</ctuluGroupId>
- <dodicoGroupId>org.fudaa.framework.dodico</dodicoGroupId>
- <ebliGroupId>org.fudaa.framework.ebli</ebliGroupId>
- <fudaaGroupId>org.fudaa.framework.fudaa</fudaaGroupId>
- </properties>
- <mailingLists>
- <mailingList>
- <name>Fudaa Developer List</name>
- <subscribe>dev...@fu...</subscribe>
- <unsubscribe>dev...@fu...</unsubscribe>
- <post>de...@fu...</post>
- </mailingList>
- </mailingLists>
- <distributionManagement>
- <repository>
- <id>artifactory-fudaa</id>
- <name>fudaa-releases</name>
- <!-- on utilise webdav pour éviter les erreurs 401 -->
- <url>dav:http://repository.fudaa.fr/artifactory/libs-releases-local</url>
- </repository>
- <snapshotRepository>
- <id>artifactory-fudaa-snapshot</id>
- <name>fudaa-snapshots</name>
- <!-- on utilise webdav pour éviter les erreurs 401 -->
- <url>dav:http://repository.fudaa.fr/artifactory/libs-snapshots-local
- </url>
- </snapshotRepository>
- <site>
- <id>site-fudaa</id>
- <url>scp://fudaa.fr/cygdrive/c/Inetpub/fudaa/sites/devel</url>
- </site>
-
- </distributionManagement>
- <repositories>
- <repository>
- <id>artifactory-fudaa</id>
- <url>dav:http://repository.fudaa.fr/artifactory/repo</url>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase> process-resources</phase>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.directory}"/>
- <replace dir="${project.build.directory}"
+ <javaCompiler>1.6</javaCompiler>
+ <ctuluGroupId>org.fudaa.framework.ctulu</ctuluGroupId>
+ <dodicoGroupId>org.fudaa.framework.dodico</dodicoGroupId>
+ <ebliGroupId>org.fudaa.framework.ebli</ebliGroupId>
+ <fudaaGroupId>org.fudaa.framework.fudaa</fudaaGroupId>
+ </properties>
+ <mailingLists>
+ <mailingList>
+ <name>Fudaa Developer List</name>
+ <subscribe>dev...@fu...</subscribe>
+ <unsubscribe>dev...@fu...</unsubscribe>
+ <post>de...@fu...</post>
+ </mailingList>
+ </mailingLists>
+ <distributionManagement>
+ <repository>
+ <id>artifactory-fudaa</id>
+ <name>fudaa-releases</name>
+<!-- on utilise webdav pour éviter les erreurs 401 -->
+ <url>dav:http://repository.fudaa.fr/artifactory/libs-releases-local</url>
+ </repository>
+ <snapshotRepository>
+ <id>artifactory-fudaa-snapshot</id>
+ <name>fudaa-snapshots</name>
+<!-- on utilise webdav pour éviter les erreurs 401 -->
+ <url>dav:http://repository.fudaa.fr/artifactory/libs-snapshots-local
+ </url>
+ </snapshotRepository>
+ <site>
+ <id>site-fudaa</id>
+ <url>scp://fudaa.fr/cygdrive/c/Inetpub/fudaa/sites/devel</url>
+ </site>
+ </distributionManagement>
+
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>libs-releases</name>
+ <url>http://repository.fudaa.fr/artifactory/libs-releases</url>
+ </repository>
+ <repository>
+ <snapshots />
+ <id>snapshots</id>
+ <name>libs-snapshots</name>
+ <url>http://repository.fudaa.fr/artifactory/libs-snapshots</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <name>plugins-releases</name>
+ <url>http://repository.fudaa.fr/artifactory/plugins-releases</url>
+ </pluginRepository>
+ <pluginRepository>
+ <snapshots />
+ <id>snapshots</id>
+ <name>plugins-snapshots</name>
+ <url>http://repository.fudaa.fr/artifactory/plugins-snapshots</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase> process-resources</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.directory}"/>
+ <replace dir="${project.build.directory}"
includes="**/*.fr_txt" token=" " value="_" />
- <native2ascii src="${project.build.directory}"
+ <native2ascii src="${project.build.directory}"
dest="${project.build.directory}" includes="**/*.fr_txt"
ext=".txt" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5+</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5+</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.2.1</version>
- <!--
- ce serait la solution pour éviter de télécharger svn mais ne
- fonctionne pas: il semble que l'outiil svnkit ne fonctionne pas
- avec les dernieres versions de SVN
- -->
- <!--
- <dependencies> <dependency> <groupId>${svnjava-groupId}</groupId>
- <artifactId>${svnjava-artifactId}</artifactId>
- <version>${svnjava-version}</version> </dependency>
- </dependencies> <configuration> <providerImplementations>
- <svn>javasvn</svn> </providerImplementations>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>${javaCompiler}</source>
+ <target>${javaCompiler}</target>
+ <encoding>${projetEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <encoding>${projetEncoding}</encoding>
+ </configuration>
+ </plugin>
- <useReleaseProfile>true</useReleaseProfile> <goals>deploy</goals>
- <arguments>-Psign</arguments> </configuration>
- -->
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${javaCompiler}</source>
- <target>${javaCompiler}</target>
- <encoding>${projetEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>${projetEncoding}</encoding>
- </configuration>
- </plugin>
-
<!-- pour que les sources soient livrées avec les jars -->
<!-- http://maven.apache.org/plugins/maven-source-plugin/usage.html -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <configuration>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </pluginManagement>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ftp</artifactId>
- <version>2.0</version>
- </extension>
- </extensions>
- </build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ftp</artifactId>
+ <version>2.0</version>
+ </extension>
+ </extensions>
+ </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.2</version>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <encoding>${projetEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <!-- <plugin>-->
- <!-- <groupId>org.apache.maven.plugins</groupId>-->
- <!-- <artifactId>maven-javadoc-plugin</artifactId>-->
- <!-- <version>2.5</version>-->
- <!-- <configuration>-->
- <!-- <breakiterator>true</breakiterator>-->
- <!-- <aggregate>true</aggregate>-->
- <!-- <links>-->
- <!--
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- -->
- <!-- </links>-->
- <!-- </configuration>-->
- <!-- <reportSets>-->
- <!-- <reportSet>-->
- <!-- <reports>-->
- <!-- <report>javadoc</report>-->
- <!-- </reports>-->
- <!-- </reportSet>-->
- <!-- </reportSets>-->
- <!-- </plugin>-->
- <!-- <plugin>-->
- <!-- <groupId>org.apache.maven.plugins</groupId>-->
- <!-- <artifactId>maven-jxr-plugin</artifactId>-->
- <!-- <version>2.1</version>-->
- <!-- <configuration>-->
- <!-- <aggregate>true</aggregate>-->
- <!-- <inputEncoding>${projetEncoding}</inputEncoding>-->
- <!-- <outputEncoding>${projetEncoding}</outputEncoding>-->
- <!-- </configuration>-->
- <!-- </plugin>-->
- <!-- <plugin>-->
- <!-- <groupId>org.codehaus.mojo</groupId>-->
- <!-- <artifactId>cobertura-maven-plugin</artifactId>-->
- <!-- <version>2.2</version>-->
- <!-- </plugin>-->
- <!-- <plugin>-->
- <!-- <groupId>org.apache.maven.plugins</groupId>-->
- <!-- <artifactId>maven-pmd-plugin</artifactId>-->
- <!-- <version>2.3</version>-->
- <!-- <configuration>-->
- <!-- <rulesets>pmd.xml</rulesets>-->
- <!-- <linkXref>true</linkXref>-->
- <!-- <sourceEncoding>${projetEncoding}</sourceEncoding>-->
- <!-- <minimumTokens>100</minimumTokens>-->
- <!-- <targetJdk>1.5</targetJdk>-->
- <!-- </configuration>-->
-<!---->
- <!-- </plugin>-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <encoding>${projetEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
- </plugins>
- </reporting>
-
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|