Merge branch 'swag' into 'master'

Swag dependencies

Swagger dependencies do not get included from web project because of strict package filterin.
Move dependecies to ear.

See merge request !213

code/moya-parent/pom.xml

@@ -131,6 +131,22 @@
 			<artifactId>jvm-breakglass</artifactId>
 			<artifactId>jvm-breakglass</artifactId>
 			<version>0.0.7</version>
 			<version>0.0.7</version>
 		</dependency>
 		</dependency>
+
+		<dependency>
+			<groupId>com.wordnik</groupId>
+			<artifactId>swagger-annotations</artifactId>
+			<version>${swagger.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.wordnik</groupId>
+			<artifactId>swagger-jaxrs_2.11</artifactId>
+			<version>${swagger.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.wordnik</groupId>
+			<artifactId>swagger-servlet_2.11</artifactId>
+			<version>${swagger.version}</version>
+		</dependency>
 	</dependencies>
 	</dependencies>
 
 
 	<parent>
 	<parent>

code/moya-web/pom.xml

@@ -12,7 +12,7 @@
 				<configuration>
 				<configuration>
 					<warSourceDirectory>WebContent</warSourceDirectory>
 					<warSourceDirectory>WebContent</warSourceDirectory>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<packagingIncludes>WEB-INF/lib/swagger*,WEB-INF/lib/moya-restpojo*,WEB-INF/lib/javamelody-core*,WEB-INF/lib/primefaces*,WEB-INF/lib/*-1.0.8.jar,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
+					<packagingIncludes>WEB-INF/lib/moya-restpojo*,WEB-INF/lib/javamelody-core*,WEB-INF/lib/primefaces*,WEB-INF/lib/*-1.0.8.jar,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
 		</plugins>
 		</plugins>
@@ -41,31 +41,20 @@
 			<version>1.0.8</version>
 			<version>1.0.8</version>
 			<type>pom</type>
 			<type>pom</type>
 		</dependency>
 		</dependency>
+
 		<dependency>
 		<dependency>
 			<groupId>fi.codecrew.moya</groupId>
 			<groupId>fi.codecrew.moya</groupId>
 			<artifactId>moya-restpojo</artifactId>
 			<artifactId>moya-restpojo</artifactId>
 			<version>1.0.2</version>
 			<version>1.0.2</version>
 		</dependency>
 		</dependency>
-		<dependency>
-			<groupId>com.wordnik</groupId>
-			<artifactId>swagger-servlet_2.11</artifactId>
-			<version>${swagger.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.wordnik</groupId>
-			<artifactId>swagger-annotations</artifactId>
-			<version>${swagger.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.wordnik</groupId>
-			<artifactId>swagger-jaxrs_2.11</artifactId>
-			<version>${swagger.version}</version>
-		</dependency>
+
 	</dependencies>
 	</dependencies>
+
 	<parent>
 	<parent>
 		<groupId>fi.codecrew.moya</groupId>
 		<groupId>fi.codecrew.moya</groupId>
 		<artifactId>moya-parent</artifactId>
 		<artifactId>moya-parent</artifactId>
 		<version>1.0</version>
 		<version>1.0</version>
 		<relativePath>../moya-parent/pom.xml</relativePath>
 		<relativePath>../moya-parent/pom.xml</relativePath>
 	</parent>
 	</parent>
+
 </project>
 </project>