Commit b20dad3a47afe46d817494f5aaa664c9a9347ddb
1 parent
63d4356a
Fix parent pom
Showing
1 changed file
with
0 additions
and
16 deletions
Show diff stats
demoiselle-parent/pom.xml
| @@ -175,41 +175,25 @@ | @@ -175,41 +175,25 @@ | ||
| 175 | <dependency> | 175 | <dependency> |
| 176 | <groupId>org.demoiselle.jee</groupId> | 176 | <groupId>org.demoiselle.jee</groupId> |
| 177 | <artifactId>demoiselle-core</artifactId> | 177 | <artifactId>demoiselle-core</artifactId> |
| 178 | -<<<<<<< HEAD | ||
| 179 | - <version>${version}</version> | ||
| 180 | -======= | ||
| 181 | <version>3.0.0-BETA1-SNAPSHOT</version> | 178 | <version>3.0.0-BETA1-SNAPSHOT</version> |
| 182 | ->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd | ||
| 183 | </dependency> | 179 | </dependency> |
| 184 | 180 | ||
| 185 | <dependency> | 181 | <dependency> |
| 186 | <groupId>org.demoiselle.jee</groupId> | 182 | <groupId>org.demoiselle.jee</groupId> |
| 187 | <artifactId>demoiselle-security</artifactId> | 183 | <artifactId>demoiselle-security</artifactId> |
| 188 | -<<<<<<< HEAD | ||
| 189 | <version>${demoiselle.version}</version> | 184 | <version>${demoiselle.version}</version> |
| 190 | -======= | ||
| 191 | - <version>3.0.0-BETA1-SNAPSHOT</version> | ||
| 192 | ->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd | ||
| 193 | </dependency> | 185 | </dependency> |
| 194 | 186 | ||
| 195 | <dependency> | 187 | <dependency> |
| 196 | <groupId>org.demoiselle.jee</groupId> | 188 | <groupId>org.demoiselle.jee</groupId> |
| 197 | <artifactId>demoiselle-rest</artifactId> | 189 | <artifactId>demoiselle-rest</artifactId> |
| 198 | -<<<<<<< HEAD | ||
| 199 | <version>${demoiselle.version}</version> | 190 | <version>${demoiselle.version}</version> |
| 200 | -======= | ||
| 201 | - <version>3.0.0-BETA1-SNAPSHOT</version> | ||
| 202 | ->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd | ||
| 203 | </dependency> | 191 | </dependency> |
| 204 | 192 | ||
| 205 | <dependency> | 193 | <dependency> |
| 206 | <groupId>org.demoiselle.jee</groupId> | 194 | <groupId>org.demoiselle.jee</groupId> |
| 207 | <artifactId>demoiselle-persistence-jpa</artifactId> | 195 | <artifactId>demoiselle-persistence-jpa</artifactId> |
| 208 | -<<<<<<< HEAD | ||
| 209 | <version>${demoiselle.version}</version> | 196 | <version>${demoiselle.version}</version> |
| 210 | -======= | ||
| 211 | - <version>3.0.0-BETA1-SNAPSHOT</version> | ||
| 212 | ->>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd | ||
| 213 | </dependency> | 197 | </dependency> |
| 214 | 198 | ||
| 215 | </dependencies> | 199 | </dependencies> |