Commit 38b4bea9 by Liv Haapala

masteriin kääntökelpoinen versio

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