Download as
Browse Code »

Commit 6fe931869adb7f61f770ef7441b3dfe062d11fe5

Authored by Ednara Oliveira
2 parents 9ec2f92b f8168bf5
Exists in master

Merge remote-tracking branch 'origin/master' 

Conflicts:
	impl/extension/jpa/pom.xml
Showing 6 changed files with 6 additions and 83 deletions   Show diff stats
documentation/quickstart/pom.xml
  Diff comments   View file @6fe9318
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <parent> 45 <parent>
46 <groupId>br.gov.frameworkdemoiselle</groupId> 46 <groupId>br.gov.frameworkdemoiselle</groupId>
47 <artifactId>demoiselle-documentation-parent</artifactId> 47 <artifactId>demoiselle-documentation-parent</artifactId>
48 - <version>5-SNAPSHOT</version> 48 + <version>8-SNAPSHOT</version>
49 <relativePath>../../../internal/parent/documentation</relativePath> 49 <relativePath>../../../internal/parent/documentation</relativePath>
50 </parent> 50 </parent>
51 51
documentation/reference/pom.xml
  Diff comments   View file @6fe9318
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <parent> 45 <parent>
46 <groupId>br.gov.frameworkdemoiselle</groupId> 46 <groupId>br.gov.frameworkdemoiselle</groupId>
47 <artifactId>demoiselle-documentation-parent</artifactId> 47 <artifactId>demoiselle-documentation-parent</artifactId>
48 - <version>5-SNAPSHOT</version> 48 + <version>8-SNAPSHOT</version>
49 <relativePath>../../../internal/parent/documentation</relativePath> 49 <relativePath>../../../internal/parent/documentation</relativePath>
50 </parent> 50 </parent>
51 51
impl/extension/jpa/pom.xml
  Diff comments   View file @6fe9318
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
36 --> 36 -->
37 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 37 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
38 38
  39 +
39 <modelVersion>4.0.0</modelVersion> 40 <modelVersion>4.0.0</modelVersion>
40 41
41 <artifactId>demoiselle-jpa</artifactId> 42 <artifactId>demoiselle-jpa</artifactId>
@@ -113,4 +114,4 @@ @@ -113,4 +114,4 @@
113 </releases> 114 </releases>
114 </repository> 115 </repository>
115 </repositories> 116 </repositories>
116 -</project>  
117 \ No newline at end of file 117 \ No newline at end of file
  118 +</project>
parent/jsf/pom.xml
  Diff comments   View file @6fe9318
@@ -108,26 +108,6 @@ @@ -108,26 +108,6 @@
108 </dependencies> 108 </dependencies>
109 </profile> 109 </profile>
110 <profile> 110 <profile>
111 - <id>gae</id>  
112 - <dependencies>  
113 - <dependency>  
114 - <groupId>com.sun.faces</groupId>  
115 - <artifactId>jsf-api</artifactId>  
116 - <scope>compile</scope>  
117 - </dependency>  
118 - <dependency>  
119 - <groupId>com.sun.faces</groupId>  
120 - <artifactId>jsf-impl</artifactId>  
121 - <scope>runtime</scope>  
122 - </dependency>  
123 - <dependency>  
124 - <groupId>org.glassfish.web</groupId>  
125 - <artifactId>el-impl</artifactId>  
126 - <scope>runtime</scope>  
127 - </dependency>  
128 - </dependencies>  
129 - </profile>  
130 - <profile>  
131 <id>glassfish3</id> 111 <id>glassfish3</id>
132 <dependencies> 112 <dependencies>
133 <dependency> 113 <dependency>
parent/servlet/pom.xml
  Diff comments   View file @6fe9318
@@ -190,63 +190,6 @@ @@ -190,63 +190,6 @@
190 </dependencies> 190 </dependencies>
191 </profile> 191 </profile>
192 <profile> 192 <profile>
193 - <id>gae</id>  
194 - <build>  
195 - <plugins>  
196 - <plugin>  
197 - <groupId>net.kindleit</groupId>  
198 - <artifactId>maven-gae-plugin</artifactId>  
199 - <version>${kindleit.plugin.version}</version>  
200 - <configuration>  
201 - <serverId>appengine.google.com</serverId>  
202 - </configuration>  
203 - </plugin>  
204 - </plugins>  
205 - </build>  
206 - <dependencies>  
207 - <dependency>  
208 - <groupId>javax.servlet</groupId>  
209 - <artifactId>servlet-api</artifactId>  
210 - <scope>provided</scope>  
211 - </dependency>  
212 - <dependency>  
213 - <groupId>org.jboss.weld</groupId>  
214 - <artifactId>weld-core</artifactId>  
215 - <scope>runtime</scope>  
216 - </dependency>  
217 - <dependency>  
218 - <groupId>org.jboss.weld.servlet</groupId>  
219 - <artifactId>weld-servlet-core</artifactId>  
220 - <scope>runtime</scope>  
221 - </dependency>  
222 - <dependency>  
223 - <groupId>org.hibernate</groupId>  
224 - <artifactId>hibernate-validator</artifactId>  
225 - <scope>runtime</scope>  
226 - </dependency>  
227 - <dependency>  
228 - <groupId>org.slf4j</groupId>  
229 - <artifactId>slf4j-log4j12</artifactId>  
230 - <scope>runtime</scope>  
231 - </dependency>  
232 - <dependency>  
233 - <groupId>com.google.appengine</groupId>  
234 - <artifactId>appengine-api-1.0-sdk</artifactId>  
235 - <version>${gae.version}</version>  
236 - </dependency>  
237 - </dependencies>  
238 - <repositories>  
239 - <repository>  
240 - <id>objectify-appengine</id>  
241 - <url>http://objectify-appengine.googlecode.com/svn/maven</url>  
242 - </repository>  
243 - </repositories>  
244 - <properties>  
245 - <gae.version>1.7.0</gae.version>  
246 - <kindleit.plugin.version>0.9.4</kindleit.plugin.version>  
247 - </properties>  
248 - </profile>  
249 - <profile>  
250 <id>glassfish3</id> 193 <id>glassfish3</id>
251 <dependencies> 194 <dependencies>
252 <dependency> 195 <dependency>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <parent> 45 <parent>
46 <groupId>br.gov.frameworkdemoiselle</groupId> 46 <groupId>br.gov.frameworkdemoiselle</groupId>
47 <artifactId>demoiselle-build-parent</artifactId> 47 <artifactId>demoiselle-build-parent</artifactId>
48 - <version>5-SNAPSHOT</version> 48 + <version>8-SNAPSHOT</version>
49 <relativePath>../internal/parent/build/demoiselle</relativePath> 49 <relativePath>../internal/parent/build/demoiselle</relativePath>
50 </parent> 50 </parent>
51 51
@@ -96,8 +96,7 @@ @@ -96,8 +96,7 @@
96 <connection>scm:git:git@github.com:demoiselle/${project.alias}.git</connection> 96 <connection>scm:git:git@github.com:demoiselle/${project.alias}.git</connection>
97 <developerConnection>scm:git:git@github.com:demoiselle/${project.alias}.git</developerConnection> 97 <developerConnection>scm:git:git@github.com:demoiselle/${project.alias}.git</developerConnection>
98 <url>http://github.com/demoiselle/${project.alias}</url> 98 <url>http://github.com/demoiselle/${project.alias}</url>
99 - <tag>HEAD</tag>  
100 - </scm> 99 + </scm>
101 100
102 <repositories> 101 <repositories>
103 <repository> 102 <repository>