Commit 38b4bea9 by Liv Haapala

masteriin kääntökelpoinen versio

1 parent 8ba089a6
......@@ -7,6 +7,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>2.10.1</version>
<configuration>
......@@ -29,16 +30,6 @@
</webModule>
<webModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-mgmt</artifactId>
<contextRoot>/mgmt</contextRoot>
</webModule>
<webModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-angular</artifactId>
<contextRoot>/MoyaNG</contextRoot>
</webModule>
<webModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-terminal-web</artifactId>
<contextRoot>/terminal</contextRoot>
</webModule>
......@@ -62,19 +53,6 @@
<version>1.2-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-mgmt</artifactId>
<version>1.2-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-angular</artifactId>
<version>1.2-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
......
......@@ -6,6 +6,7 @@
<artifactId>moya-parent</artifactId>
<packaging>pom</packaging>
<modules>
<module>../moya-utils</module>
<module>../moya-authmodule-client</module>
......@@ -14,10 +15,11 @@
<module>../moya-beans-client</module>
<module>../moya-beans</module>
<module>../moya-web</module>
<module>../moya-mgmt</module>
<module>../moya-terminal-web</module>
<module>../moya-ear</module>
<module>../../docker</module>
<!-- <module>../moya-angular</module> -->
<!-- <module>../moya-vue</module> -->
</modules>
<dependencies>
......
......@@ -7,6 +7,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${war-plugin-version}</version>
<configuration>
......
......@@ -5,8 +5,8 @@
<packaging>war</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${war-plugin-version}</version>
<configuration>
......
......@@ -68,6 +68,7 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!