Skip to content

Commit d0424cf

Browse files
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # extra/angularjs/pom.xml
2 parents e665949 + 25e01f0 commit d0424cf

2 files changed

Lines changed: 62 additions & 0 deletions

File tree

‎extra/angularjs/build.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
output.. = bin/
2+
source.. = src/
3+
src.includes = *
4+
src.excludes = src
5+
bin.includes = .,\
6+
./src/main/resources/META-INF/persistence.xml

‎extra/angularjs/pom.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.javaee7.extra</groupId>
6+
<artifactId>extra-samples</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
<relativePath>../pom.xml</relativePath>
9+
</parent>
10+
11+
<groupId>org.javaee7.extra</groupId>
12+
<artifactId>jaxrs-angularjs</artifactId>
13+
<packaging>war</packaging>
14+
<name>Java EE 7 Sample: jaxrs - angularjs</name>
15+
<description>Angular JS consuming REST services</description>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.jboss.arquillian.extension</groupId>
20+
<artifactId>arquillian-persistence-impl</artifactId>
21+
<version>1.0.0.Alpha6</version>
22+
<scope>test</scope>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.jboss.arquillian.extension</groupId>
26+
<artifactId>arquillian-rest-client-api</artifactId>
27+
<version>1.0.0.Alpha1</version>
28+
<scope>test</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.jboss.arquillian.extension</groupId>
32+
<artifactId>arquillian-rest-client-impl-3x</artifactId>
33+
<version>1.0.0.Alpha1</version>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.jboss.arquillian.graphene</groupId>
38+
<artifactId>graphene-webdriver</artifactId>
39+
<version>2.0.0.Final</version>
40+
<type>pom</type>
41+
<scope>test</scope>
42+
</dependency>
43+
</dependencies>
44+
45+
<profiles>
46+
<profile>
47+
<id>wildfly-swarm</id>
48+
<dependencies>
49+
<dependency>
50+
<groupId>com.h2database</groupId>
51+
<artifactId>h2</artifactId>
52+
</dependency>
53+
</dependencies>
54+
</profile>
55+
</profiles>
56+
</project>

0 commit comments

Comments
 (0)