r321 - in wikengo_core-wikitty: . wikengo_core-wikitty-api wikengo_core-wikitty-jdbc-impl wikengo_core-wikitty-solr-impl
Author: tchemit Date: 2009-11-13 18:54:23 +0100 (Fri, 13 Nov 2009) New Revision: 321 Modified: wikengo_core-wikitty/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml Log: remove all sharengo dependencies : too messy to make a release fo it, moreover we do not have the mavenpom and it is on a SNAPSHOT,... Modified: wikengo_core-wikitty/pom.xml =================================================================== --- wikengo_core-wikitty/pom.xml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/pom.xml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,29 +1,57 @@ <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> - - <modules> - <module>wikengo_core-wikitty-api</module> - <module>wikengo_core-wikitty-jdbc-impl</module> - <module>wikengo_core-wikitty-solr-impl</module> - </modules> - - <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>mavenpom</artifactId> + <artifactId>core-wikitty</artifactId> <version>1.0.0-SNAPSHOT</version> - </parent> - <distributionManagement> + <modules> + <module>wikengo_core-wikitty-api</module> + <module>wikengo_core-wikitty-jdbc-impl</module> + <module>wikengo_core-wikitty-solr-impl</module> + </modules> + + <!--parent> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>mavenpom</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent--> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>compile</scope> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>runtime</scope> + </dependency> + + </dependencies> + </dependencyManagement> + + <distributionManagement> <repository> <id>nuiton</id> <url>scpexe://nuiton.org/var/lib/maven/release</url> @@ -34,53 +62,275 @@ </snapshotRepository> </distributionManagement> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty</name> + <name>org.sharengo.wikengo.core-wikitty</name> - <description>wikitty multi-module project</description> - <inceptionYear>2009</inceptionYear> + <description>wikitty multi-module project</description> + <inceptionYear>2009</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <packaging>pom</packaging> + <packaging>pom</packaging> - <properties> - <!-- pour un muli module on doit fixer le projectId --> - <projectId>core-wikitty</projectId> - </properties> + <properties> + <!-- pour un muli module on doit fixer le projectId --> + <projectId>core-wikitty</projectId> - <build> - </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- java level is 1.6 --> + <maven.compile.source>1.6</maven.compile.source> + <maven.compile.target>1.6</maven.compile.target> - <repositories> + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> + <!-- by default, use maven 2 source base dir --> + <maven.src.dir>${basedir}/src</maven.src.dir> - </repositories> + <!-- to allow bad tests --> + <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> - <profiles> - <!-- perform only on a release stage when using the maven-release-plugin --> + <!-- to skip tests (can use also profile notests) --> + <maven.test.skip>false</maven.test.skip> + + <!-- to control fork mode of tests --> + <maven.test.forkMode>once</maven.test.forkMode> + + <!-- to activate generation of reports and javadoc when doing a site --> + <maven.reports.generate>true</maven.reports.generate> + + <!-- do not use 2.5 version, it is buggy (crazy aggregate mode !) --> + <javadoc.version>2.4</javadoc.version> + + <!-- to avoid generate javadoc --> + <maven.javadoc.skip>false</maven.javadoc.skip> + + <spring.version>2.5.5</spring.version> + <hessian.version>3.1.6</hessian.version> + + </properties> + + <build> + + <pluginManagement> + + <plugins> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.3</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <skip>${maven.test.skip}</skip> + <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> + <forkMode>${maven.test.forkMode}</forkMode> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <warSourceDirectory>${maven.src.dir}/main/webapp</warSourceDirectory> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <inherited>true</inherited> + + <configuration> + <archive> + <!-- + cela fait bugger le chargement des service via + ServiceLoader donc on desactive + --> + <!--index>true</index--> + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + </manifest> + <manifestEntries> + <url>${pom.url}</url> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1</version> + <inherited>true</inherited> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <docencoding>${project.reporting.outputEncoding}</docencoding> + <encoding>${project.reporting.outputEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <quiet>true</quiet> + <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> + <!-- uniquement a partir de javadoc 2.5 --> + <!--skip>${maven.javadoc.skip}</skip--> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.7</version> + <configuration> + <ajdtVersion>none</ajdtVersion> + <sourceIncludes> + <sourceInclude>**/*</sourceInclude> + </sourceIncludes> + <downloadSources>true</downloadSources> + <downloadJavadocs>true</downloadJavadocs> + <addGroupIdToProjectName>true</addGroupIdToProjectName> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + + </build> + + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + + + <repositories> + + <repository> + <id>nuiton-repository</id> + <name>Repo Nuiton</name> + <url>http://maven.nuiton.org/release</url> + </repository> + + <!--repository> + <id>sharengo-ivy-repository</id> + <name>Repo Sharengo</name> + <url>http://repository.sharengo.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository--> + + <!--repository> + <id>sharengo-maven-repository</id> + <name>Repo Sharengo</name> + <url>http://repository.sharengo.org</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository--> + + <!--repository> + <id>sharengo-maven2-repository</id> + <name>Sharengo's repository</name> + <url>http://maven2.sharengo.org</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository--> + + <!--repository> + <id>caucho-repository</id> + <name>Caucho Repo</name> + <url>http://caucho.com/m2</url> + </repository--> + + </repositories> + + <pluginRepositories> + + <pluginRepository> + <id>nuiton-repository</id> + <name>Repo Nuiton</name> + <url>http://maven.nuiton.org/release</url> + </pluginRepository> + + </pluginRepositories> + + <profiles> + <!-- perform only on a release stage when using the maven-release-plugin --> <profile> <id>release-profile</id> <activation> @@ -124,7 +374,7 @@ </build> </profile> - </profiles> + </profiles> </project> Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,224 +1,225 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-api</artifactId> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> - </parent> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>core-wikitty-api</artifactId> - <dependencies> - <!-- TEST --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <parent> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>core-wikitty</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> + <dependencies> - <!-- RUNTIME --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> + <!-- TEST --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <!-- COMPILE --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <!-- RUNTIME --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + + <!-- COMPILE --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-api</name> + <name>org.sharengo.wikengo.core-wikitty-api</name> - <description>public api of wikitty</description> - <inceptionYear>2009</inceptionYear> + <description>public api of wikitty</description> + <inceptionYear>2009</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> - <eugene.version>1.0.0</eugene.version> - <eugengo.version>0.6-SNAPSHOT</eugengo.version> + <properties> + <eugene.version>1.0.0</eugene.version> + <eugengo.version>0.6.0</eugengo.version> - <!-- where to generate sources --> - <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> + <!-- where to generate sources --> + <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> - <!-- where to generate test sources --> - <maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir> + <!-- where to generate test sources --> + <maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir> <maven.test.skip>false</maven.test.skip> <maven.test.failure.ignore>true</maven.test.failure.ignore> - </properties> + </properties> - <build> - <finalName>wikitty-api</finalName> - <resources> - <resource> - <directory>${maven.src.dir}/main/resources/</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </resource> - <resource> - <directory>${maven.src.dir}/main/java/</directory> - <includes> - <include>**/*.java</include> - </includes> - </resource> - <resource> - <directory>${maven.gen.dir}/java/</directory> - <includes> - <include>**/*.java</include> - </includes> - </resource> - </resources> + <build> + <finalName>wikitty-api</finalName> + <resources> + <resource> + <directory>src/main/resources/</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/java/</directory> + <includes> + <include>**/*.java</include> + </includes> + </resource> + <resource> + <directory>${maven.gen.dir}/java/</directory> + <includes> + <include>**/*.java</include> + </includes> + </resource> + </resources> - <pluginManagement> - <plugins> - <!-- Create a jar that includes all tests --> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- eugene plugin --> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> - <dependencies> - <dependency> - <groupId>org.sharengo</groupId> - <artifactId>eugengo</artifactId> - <version>${eugengo.version}</version> - </dependency> - <!-- Meta model uml d'eclipse --> - <dependency> - <groupId>org.eclipse.uml2.uml</groupId> - <artifactId>resources</artifactId> - <version>2.1.0-v200706251652</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.uml2</groupId> - <artifactId>uml</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> + <!-- Create a jar that includes all tests --> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- eugene plugin --> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugene.version}</version> + <dependencies> + <dependency> + <groupId>org.sharengo</groupId> + <artifactId>eugengo</artifactId> + <version>${eugengo.version}</version> + </dependency> + <!-- Meta model uml d'eclipse --> + <dependency> + <groupId>org.eclipse.uml2.uml</groupId> + <artifactId>resources</artifactId> + <version>2.1.0-v200706251652</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.uml2</groupId> + <artifactId>uml</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api generator</id> - <!-- - do not use the phase generate-XXX because it can be excecuted several times... - --> - <phase>process-sources</phase> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api generator</id> + <!-- + do not use the phase generate-XXX because it can be excecuted several times... + --> + <phase>process-sources</phase> - <!--Configuration of model generator--> - <configuration> - <addCompileDirectory>true</addCompileDirectory> - <zargoResources> - <input>${maven.src.dir}/main/uml/wikitty-api</input> - </zargoResources> - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.eugengo.generator.WikittyMetaGenerator</templates> - <defaultPackage>org.sharengo.wikitty</defaultPackage> - <extractedPackages>org.sharengo.wikitty</extractedPackages> - <generatedPackages>org.sharengo.wikitty</generatedPackages> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!--Configuration of model generator--> + <configuration> + <!--<addCompileDirectory>true</addCompileDirectory>--> + <zargoResources> + <input>${maven.src.dir}/main/uml/wikitty-api</input> + </zargoResources> + <includes>**/*.objectmodel</includes> + <templates>org.nuiton.eugengo.generator.WikittyMetaGenerator</templates> + <defaultPackage>org.sharengo.wikitty</defaultPackage> + <extractedPackages>org.sharengo.wikitty</extractedPackages> + <generatedPackages>org.sharengo.wikitty</generatedPackages> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> + <!--repositories> + <repository> + <id>sharengo-maven2-repository</id> + <name>Sharengo's repository</name> + <url>http://maven2.sharengo.org</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories--> </project> Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,6 +1,5 @@ - <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"> + 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.sharengo.wikengo</groupId> @@ -9,17 +8,17 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <dependencies> - <!-- TEST --> + <!-- TEST --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <!-- COMPILE --> + <!-- COMPILE --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>core-wikitty-api</artifactId> @@ -30,30 +29,30 @@ <artifactId>core-wikitty-solr-impl</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <!--dependency> <groupId>${project.groupId}</groupId> <artifactId>core-wikitty-test</artifactId> <version>1.0-SNAPSHOT</version> - </dependency> + </dependency--> - <dependency> + <!--dependency> <groupId>com.caucho</groupId> <artifactId>resin-hessian</artifactId> - </dependency> + </dependency--> - <dependency> + <!--dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <version>6.1.8</version> - </dependency> + </dependency--> - <dependency> + <!--dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> <version>1.1.4c</version> - </dependency> + </dependency--> - <!-- SOLR --> + <!-- SOLR --> <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> @@ -66,37 +65,37 @@ <scope>runtime</scope> </dependency> - <dependency> + <!--dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - </dependency> + </dependency--> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.1.118</version> </dependency> </dependencies> -<!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> <name>org.sharengo.wikengo.core-wikitty-jdbc-impl</name> <description>public api of wikitty</description> <inceptionYear>2009</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> <packaging>jar</packaging> <properties> <maven.test.skip>true</maven.test.skip> </properties> - - <repositories> + <!--repositories> + <repository> <id>sharengo-maven-repository</id> <name>Repo Sharengo</name> @@ -110,7 +109,7 @@ <checksumPolicy>warn</checksumPolicy> </releases> </repository> - </repositories> + </repositories--> </project> Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <output url="file://$MODULE_DIR$/../target/classes" /> + <output-test url="file://$MODULE_DIR$/../target/test-classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,99 +1,99 @@ <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-solr-impl</artifactId> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>core-wikitty-solr-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>core-wikitty</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> - <dependencies> - <!-- COMPILE --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>core-wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> + <!-- COMPILE --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>core-wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <!-- SOLR --> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>runtime</scope> - </dependency> + <!-- SOLR --> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <version>1.3.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-solr-impl</name> + <name>org.sharengo.wikengo.core-wikitty-solr-impl</name> - <description>hbase impl of wikitty</description> - <inceptionYear>2009</inceptionYear> + <description>hbase impl of wikitty</description> + <inceptionYear>2009</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> - <maven.test.skip>true</maven.test.skip> - <maven.test.failure.ignore>true</maven.test.failure.ignore> - </properties> + <properties> + <maven.test.skip>true</maven.test.skip> + <maven.test.failure.ignore>true</maven.test.failure.ignore> + </properties> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> + <!--repositories> + <repository> + <id>sharengo-maven2-repository</id> + <name>Sharengo's repository</name> + <url>http://maven2.sharengo.org</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories--> </project>
participants (1)
-
tchemit＠users.nuiton.org