Download as
Browse Code »

Commit 63d4356ad28ecc097707530a46146687f2b815bc

Authored by PauloGladson
2 parents c1a53f13 2ba655f5

Segurança

Showing 7 changed files with 32 additions and 5 deletions   Show diff stats
demoiselle-archetype-full/pom.xml
View file @c1a53f1
... ... @@ -1 +0,0 @@
1   -placeholder
demoiselle-archetype-rest-jpa/pom.xml
View file @c1a53f1
... ... @@ -1 +0,0 @@
1   -placeholder
demoiselle-configuration/.gitignore
  Diff comments   View file @63d4356
... ... @@ -2,3 +2,4 @@ target/
2 2 .project
3 3 .settings/
4 4 .classpath
  5 +/bin/
... ...
demoiselle-core/.gitignore
  Diff comments   View file @63d4356
1   -.settings
2   -.classpath
3   -.project
4 1 /target/
5 2 /bin/
  3 +/.settings/
  4 +/.classpath
  5 +/.project
... ...
demoiselle-core/src/main/resources/META-INF/beans.xml 0 → 100644
  Diff comments   View file @63d4356
... ... @@ -0,0 +1,6 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<beans xmlns="http://java.sun.com/xml/ns/javaee"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
  5 +
  6 +</beans>
... ...
demoiselle-parent/pom.xml
  Diff comments   View file @63d4356
... ... @@ -175,25 +175,41 @@
175 175 <dependency>
176 176 <groupId>org.demoiselle.jee</groupId>
177 177 <artifactId>demoiselle-core</artifactId>
  178 +<<<<<<< HEAD
178 179 <version>${version}</version>
  180 +=======
  181 + <version>3.0.0-BETA1-SNAPSHOT</version>
  182 +>>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
179 183 </dependency>
180 184  
181 185 <dependency>
182 186 <groupId>org.demoiselle.jee</groupId>
183 187 <artifactId>demoiselle-security</artifactId>
  188 +<<<<<<< HEAD
184 189 <version>${demoiselle.version}</version>
  190 +=======
  191 + <version>3.0.0-BETA1-SNAPSHOT</version>
  192 +>>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
185 193 </dependency>
186 194  
187 195 <dependency>
188 196 <groupId>org.demoiselle.jee</groupId>
189 197 <artifactId>demoiselle-rest</artifactId>
  198 +<<<<<<< HEAD
190 199 <version>${demoiselle.version}</version>
  200 +=======
  201 + <version>3.0.0-BETA1-SNAPSHOT</version>
  202 +>>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
191 203 </dependency>
192 204  
193 205 <dependency>
194 206 <groupId>org.demoiselle.jee</groupId>
195 207 <artifactId>demoiselle-persistence-jpa</artifactId>
  208 +<<<<<<< HEAD
196 209 <version>${demoiselle.version}</version>
  210 +=======
  211 + <version>3.0.0-BETA1-SNAPSHOT</version>
  212 +>>>>>>> 2ba655f539984934e462df007e4c17b6a109c4bd
197 213 </dependency>
198 214  
199 215 </dependencies>
... ...
demoiselle-persistence-jpa/src/main/resources/META-INF/beans.xml 0 → 100644
  Diff comments   View file @63d4356
... ... @@ -0,0 +1,6 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<beans xmlns="http://java.sun.com/xml/ns/javaee"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
  5 +
  6 +</beans>
... ...