Commit 8ab842998e9b811b40a5dd46d15eff9f8adc4e15
1 parent
cc68b35d
Exists in
master
Remoção da dependência cíclica
Showing
3 changed files
with
4 additions
and
19 deletions
Show diff stats
archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml
| @@ -42,6 +42,7 @@ | @@ -42,6 +42,7 @@ | ||
| 42 | <dependency> | 42 | <dependency> |
| 43 | <groupId>br.gov.frameworkdemoiselle.component</groupId> | 43 | <groupId>br.gov.frameworkdemoiselle.component</groupId> |
| 44 | <artifactId>demoiselle-junit</artifactId> | 44 | <artifactId>demoiselle-junit</artifactId> |
| 45 | + <version>2.3.0-RC1</version> | ||
| 45 | <scope>test</scope> | 46 | <scope>test</scope> |
| 46 | </dependency> | 47 | </dependency> |
| 47 | <dependency> | 48 | <dependency> |
archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/demoiselle.properties
| 1 | -#Enables JPA transaction strategy, automatically detected in most cases, use only if you need to overwrite the default behaviour | 1 | +#Enables JPA transaction strategy, automatically detected if demoiselle-jpa component is detected. Use only if you need to overwrite the default behaviour |
| 2 | #frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JPATransaction | 2 | #frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JPATransaction |
| 3 | 3 | ||
| 4 | -#Enables JTA transaction strategy, automatically detected if demoiselle-jta component is detected, use only if you need to overwrite the default behaviour | ||
| 5 | -#frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JTATransaction | ||
| 6 | \ No newline at end of file | 4 | \ No newline at end of file |
| 5 | +#Enables JTA transaction strategy, automatically detected if demoiselle-jta component is detected. Use only if you need to overwrite the default behaviour | ||
| 6 | +#frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JTATransaction |
parent/bom/pom.xml
| @@ -294,18 +294,6 @@ | @@ -294,18 +294,6 @@ | ||
| 294 | <artifactId>easymock</artifactId> | 294 | <artifactId>easymock</artifactId> |
| 295 | <version>${easymock.version}</version> | 295 | <version>${easymock.version}</version> |
| 296 | </dependency> | 296 | </dependency> |
| 297 | - | ||
| 298 | - <!-- Demoiselle Components --> | ||
| 299 | - <dependency> | ||
| 300 | - <groupId>br.gov.frameworkdemoiselle.component</groupId> | ||
| 301 | - <artifactId>demoiselle-junit</artifactId> | ||
| 302 | - <version>${demoiselle.junit.version}</version> | ||
| 303 | - </dependency> | ||
| 304 | - <dependency> | ||
| 305 | - <groupId>br.gov.frameworkdemoiselle.component</groupId> | ||
| 306 | - <artifactId>demoiselle-authorization</artifactId> | ||
| 307 | - <version>${demoiselle.authorization.version}</version> | ||
| 308 | - </dependency> | ||
| 309 | </dependencies> | 297 | </dependencies> |
| 310 | </dependencyManagement> | 298 | </dependencyManagement> |
| 311 | 299 | ||
| @@ -341,10 +329,6 @@ | @@ -341,10 +329,6 @@ | ||
| 341 | <hsqldb.version>1.8.0.10</hsqldb.version> | 329 | <hsqldb.version>1.8.0.10</hsqldb.version> |
| 342 | <jasperreports.version>4.0.1</jasperreports.version> | 330 | <jasperreports.version>4.0.1</jasperreports.version> |
| 343 | <mail.version>1.4.4</mail.version> | 331 | <mail.version>1.4.4</mail.version> |
| 344 | - <mockjavamail.version>1.9</mockjavamail.version> | ||
| 345 | <javassist.version>3.14.0-GA</javassist.version> | 332 | <javassist.version>3.14.0-GA</javassist.version> |
| 346 | - | ||
| 347 | - <demoiselle.junit.version>2.3.0-RC2-SNAPSHOT</demoiselle.junit.version> | ||
| 348 | - <demoiselle.authorization.version>2.0.2</demoiselle.authorization.version> | ||
| 349 | </properties> | 333 | </properties> |
| 350 | </project> | 334 | </project> |