Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge commit '72f020cd66c482dfae782cffe97a0df0823abf7e' into HEAD

  • Loading branch information...
commit 1f806a98649442129420a4da61f10871943ae317 2 parents 4894a84 + 72f020c
@wakaleo authored
Showing with 139 additions and 133 deletions.
  1. +8 −2 gameoflife-web/pom.xml
  2. +131 −131 pom.xml
View
10 gameoflife-web/pom.xml
@@ -216,8 +216,14 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium</artifactId>
- <version>2.0a2</version>
- <type>jar</type>
+ <version>2.0rc2</version>
+ <type>pom</type>
+ <exclusions>
+ <exclusion>
+ <artifactId>testng</artifactId>
+ <groupId>org.testng</groupId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
<dependency>
View
262 pom.xml
@@ -23,138 +23,138 @@
<developerConnection>scm:git:git@github.com:${github.account}/game-of-life.git</developerConnection>
<url>scm:git:git@github.com:${github.account}/game-of-life.git</url>
</scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <includes>
+ <include>**/Copy*.java</include>
+ <include>**/When*.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ <parallel>classes</parallel>
+ <threadCount>4</threadCount>
+ <perCoreThreadCount>true</perCoreThreadCount>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura.version}</version>
+ <configuration>
+ <formats>
+ <format>html</format>
+ <format>xml</format>
+ </formats>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.6</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.wakaleo.gameoflife</groupId>
+ <artifactId>gameoflife-build</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <preparationGoals>clean install</preparationGoals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <effort>Max</effort>
+ <xmlOutput>true</xmlOutput>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.easyb</groupId>
+ <artifactId>maven-easyb-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <storyType>html</storyType>
+ <storyReport>${basedir}/target/easyb/easyb-report.html
+ </storyReport>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.easyb</groupId>
+ <artifactId>easyb-core</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <includes>
- <include>**/Copy*.java</include>
- <include>**/When*.java</include>
- <include>**/*Test.java</include>
- </includes>
- <parallel>classes</parallel>
- <threadCount>4</threadCount>
- <perCoreThreadCount>true</perCoreThreadCount>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.version}</version>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
- <dependencies>
- <dependency>
- <groupId>com.wakaleo.gameoflife</groupId>
- <artifactId>gameoflife-build</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <preparationGoals>clean install</preparationGoals>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>1.0-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <effort>Max</effort>
- <xmlOutput>true</xmlOutput>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.easyb</groupId>
- <artifactId>maven-easyb-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <storyType>html</storyType>
- <storyReport>${basedir}/target/easyb/easyb-report.html
- </storyReport>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.easyb</groupId>
- <artifactId>easyb-core</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>gameoflife-build</module>
- <module>gameoflife-core</module>
- <module>gameoflife-web</module>
- <module>gameoflife-webservice</module>
- <module>gameoflife-cli</module>
- </modules>
+ <modules>
+ <module>gameoflife-build</module>
+ <module>gameoflife-core</module>
+ <module>gameoflife-web</module>
+ <module>gameoflife-webservice</module>
+ <module>gameoflife-cli</module>
+ </modules>
<distributionManagement>
<repository>
<id>releases</id>
Please sign in to comment.
Something went wrong with that request. Please try again.