Skip to content
This repository
Browse code

Merge commit '72f020cd66c482dfae782cffe97a0df0823abf7e' into HEAD

  • Loading branch information...
commit 1f806a98649442129420a4da61f10871943ae317 2 parents 4894a84 + 72f020c
John Ferguson Smart authored

Showing 2 changed files with 139 additions and 133 deletions. Show diff stats Hide diff stats

  1. +8 2 gameoflife-web/pom.xml
  2. +131 131 pom.xml
10 gameoflife-web/pom.xml
@@ -216,8 +216,14 @@
216 216 <dependency>
217 217 <groupId>org.seleniumhq.selenium</groupId>
218 218 <artifactId>selenium</artifactId>
219   - <version>2.0a2</version>
220   - <type>jar</type>
  219 + <version>2.0rc2</version>
  220 + <type>pom</type>
  221 + <exclusions>
  222 + <exclusion>
  223 + <artifactId>testng</artifactId>
  224 + <groupId>org.testng</groupId>
  225 + </exclusion>
  226 + </exclusions>
221 227 <scope>test</scope>
222 228 </dependency>
223 229 <dependency>
262 pom.xml
@@ -23,138 +23,138 @@
23 23 <developerConnection>scm:git:git@github.com:${github.account}/game-of-life.git</developerConnection>
24 24 <url>scm:git:git@github.com:${github.account}/game-of-life.git</url>
25 25 </scm>
  26 +
  27 + <build>
  28 + <plugins>
  29 + <plugin>
  30 + <groupId>org.apache.maven.plugins</groupId>
  31 + <artifactId>maven-compiler-plugin</artifactId>
  32 + <version>2.3.2</version>
  33 + <configuration>
  34 + <source>1.5</source>
  35 + <target>1.5</target>
  36 + </configuration>
  37 + </plugin>
  38 + <plugin>
  39 + <artifactId>maven-deploy-plugin</artifactId>
  40 + <version>2.5</version>
  41 + </plugin>
  42 + <plugin>
  43 + <groupId>org.apache.maven.plugins</groupId>
  44 + <artifactId>maven-surefire-plugin</artifactId>
  45 + <version>2.9</version>
  46 + <configuration>
  47 + <includes>
  48 + <include>**/Copy*.java</include>
  49 + <include>**/When*.java</include>
  50 + <include>**/*Test.java</include>
  51 + </includes>
  52 + <parallel>classes</parallel>
  53 + <threadCount>4</threadCount>
  54 + <perCoreThreadCount>true</perCoreThreadCount>
  55 + </configuration>
  56 + </plugin>
  57 + <plugin>
  58 + <groupId>org.codehaus.mojo</groupId>
  59 + <artifactId>cobertura-maven-plugin</artifactId>
  60 + <version>${cobertura.version}</version>
  61 + <configuration>
  62 + <formats>
  63 + <format>html</format>
  64 + <format>xml</format>
  65 + </formats>
  66 + </configuration>
  67 + </plugin>
  68 + <plugin>
  69 + <groupId>org.apache.maven.plugins</groupId>
  70 + <artifactId>maven-checkstyle-plugin</artifactId>
  71 + <version>2.6</version>
  72 + <dependencies>
  73 + <dependency>
  74 + <groupId>com.wakaleo.gameoflife</groupId>
  75 + <artifactId>gameoflife-build</artifactId>
  76 + <version>${project.version}</version>
  77 + </dependency>
  78 + </dependencies>
  79 + </plugin>
  80 + <plugin>
  81 + <artifactId>maven-release-plugin</artifactId>
  82 + <version>2.2</version>
  83 + <configuration>
  84 + <preparationGoals>clean install</preparationGoals>
  85 + </configuration>
  86 + </plugin>
  87 + <plugin>
  88 + <groupId>org.codehaus.mojo</groupId>
  89 + <artifactId>sonar-maven-plugin</artifactId>
  90 + <version>1.0-beta-2</version>
  91 + </plugin>
  92 + <plugin>
  93 + <groupId>org.codehaus.mojo</groupId>
  94 + <artifactId>findbugs-maven-plugin</artifactId>
  95 + <version>2.3.2</version>
  96 + <configuration>
  97 + <effort>Max</effort>
  98 + <xmlOutput>true</xmlOutput>
  99 + </configuration>
  100 + </plugin>
  101 + </plugins>
  102 + <pluginManagement>
  103 + <plugins>
  104 + <plugin>
  105 + <groupId>org.easyb</groupId>
  106 + <artifactId>maven-easyb-plugin</artifactId>
  107 + <version>1.2</version>
  108 + <executions>
  109 + <execution>
  110 + <goals>
  111 + <goal>test</goal>
  112 + </goals>
  113 + </execution>
  114 + </executions>
  115 + <configuration>
  116 + <storyType>html</storyType>
  117 + <storyReport>${basedir}/target/easyb/easyb-report.html
  118 + </storyReport>
  119 + </configuration>
  120 + </plugin>
  121 + </plugins>
  122 + </pluginManagement>
  123 + </build>
  124 + <dependencyManagement>
  125 + <dependencies>
  126 + <dependency>
  127 + <groupId>org.easyb</groupId>
  128 + <artifactId>easyb-core</artifactId>
  129 + <version>1.2</version>
  130 + <scope>test</scope>
  131 + </dependency>
  132 + </dependencies>
  133 + </dependencyManagement>
  134 + <dependencies>
  135 + <dependency>
  136 + <groupId>junit</groupId>
  137 + <artifactId>junit</artifactId>
  138 + <version>4.8.2</version>
  139 + <type>jar</type>
  140 + <scope>test</scope>
  141 + </dependency>
  142 + <dependency>
  143 + <groupId>org.hamcrest</groupId>
  144 + <artifactId>hamcrest-all</artifactId>
  145 + <version>1.1</version>
  146 + <type>jar</type>
  147 + <scope>test</scope>
  148 + </dependency>
  149 + </dependencies>
26 150
27   - <build>
28   - <plugins>
29   - <plugin>
30   - <groupId>org.apache.maven.plugins</groupId>
31   - <artifactId>maven-compiler-plugin</artifactId>
32   - <version>2.3.1</version>
33   - <configuration>
34   - <source>1.5</source>
35   - <target>1.5</target>
36   - </configuration>
37   - </plugin>
38   - <plugin>
39   - <artifactId>maven-deploy-plugin</artifactId>
40   - <version>2.5</version>
41   - </plugin>
42   - <plugin>
43   - <groupId>org.apache.maven.plugins</groupId>
44   - <artifactId>maven-surefire-plugin</artifactId>
45   - <version>2.5</version>
46   - <configuration>
47   - <includes>
48   - <include>**/Copy*.java</include>
49   - <include>**/When*.java</include>
50   - <include>**/*Test.java</include>
51   - </includes>
52   - <parallel>classes</parallel>
53   - <threadCount>4</threadCount>
54   - <perCoreThreadCount>true</perCoreThreadCount>
55   - </configuration>
56   - </plugin>
57   - <plugin>
58   - <groupId>org.codehaus.mojo</groupId>
59   - <artifactId>cobertura-maven-plugin</artifactId>
60   - <version>${cobertura.version}</version>
61   - <configuration>
62   - <formats>
63   - <format>html</format>
64   - <format>xml</format>
65   - </formats>
66   - </configuration>
67   - </plugin>
68   - <plugin>
69   - <groupId>org.apache.maven.plugins</groupId>
70   - <artifactId>maven-checkstyle-plugin</artifactId>
71   - <version>2.6</version>
72   - <dependencies>
73   - <dependency>
74   - <groupId>com.wakaleo.gameoflife</groupId>
75   - <artifactId>gameoflife-build</artifactId>
76   - <version>${project.version}</version>
77   - </dependency>
78   - </dependencies>
79   - </plugin>
80   - <plugin>
81   - <artifactId>maven-release-plugin</artifactId>
82   - <version>2.1</version>
83   - <configuration>
84   - <preparationGoals>clean install</preparationGoals>
85   - </configuration>
86   - </plugin>
87   - <plugin>
88   - <groupId>org.codehaus.mojo</groupId>
89   - <artifactId>sonar-maven-plugin</artifactId>
90   - <version>1.0-beta-2</version>
91   - </plugin>
92   - <plugin>
93   - <groupId>org.codehaus.mojo</groupId>
94   - <artifactId>findbugs-maven-plugin</artifactId>
95   - <version>2.3.2</version>
96   - <configuration>
97   - <effort>Max</effort>
98   - <xmlOutput>true</xmlOutput>
99   - </configuration>
100   - </plugin>
101   - </plugins>
102   - <pluginManagement>
103   - <plugins>
104   - <plugin>
105   - <groupId>org.easyb</groupId>
106   - <artifactId>maven-easyb-plugin</artifactId>
107   - <version>1.2</version>
108   - <executions>
109   - <execution>
110   - <goals>
111   - <goal>test</goal>
112   - </goals>
113   - </execution>
114   - </executions>
115   - <configuration>
116   - <storyType>html</storyType>
117   - <storyReport>${basedir}/target/easyb/easyb-report.html
118   - </storyReport>
119   - </configuration>
120   - </plugin>
121   - </plugins>
122   - </pluginManagement>
123   - </build>
124   - <dependencyManagement>
125   - <dependencies>
126   - <dependency>
127   - <groupId>org.easyb</groupId>
128   - <artifactId>easyb-core</artifactId>
129   - <version>1.2</version>
130   - <scope>test</scope>
131   - </dependency>
132   - </dependencies>
133   - </dependencyManagement>
134   - <dependencies>
135   - <dependency>
136   - <groupId>junit</groupId>
137   - <artifactId>junit</artifactId>
138   - <version>4.8.2</version>
139   - <type>jar</type>
140   - <scope>test</scope>
141   - </dependency>
142   - <dependency>
143   - <groupId>org.hamcrest</groupId>
144   - <artifactId>hamcrest-all</artifactId>
145   - <version>1.1</version>
146   - <type>jar</type>
147   - <scope>test</scope>
148   - </dependency>
149   - </dependencies>
150   -
151   - <modules>
152   - <module>gameoflife-build</module>
153   - <module>gameoflife-core</module>
154   - <module>gameoflife-web</module>
155   - <module>gameoflife-webservice</module>
156   - <module>gameoflife-cli</module>
157   - </modules>
  151 + <modules>
  152 + <module>gameoflife-build</module>
  153 + <module>gameoflife-core</module>
  154 + <module>gameoflife-web</module>
  155 + <module>gameoflife-webservice</module>
  156 + <module>gameoflife-cli</module>
  157 + </modules>
158 158 <distributionManagement>
159 159 <repository>
160 160 <id>releases</id>

0 comments on commit 1f806a9

Please sign in to comment.
Something went wrong with that request. Please try again.