Commit bcbf3560 by fudahua

Merge remote-tracking branch 'origin/developer' into developer

parents 99037a74 491f99cd
...@@ -259,17 +259,13 @@ ...@@ -259,17 +259,13 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>9.4.12.RC2</version> <version>2.2</version>
<configuration> <configuration>
<stopKey>gic-mall</stopKey> <path>/haoban-manage3-operation-web</path>
<httpConnector> <port>9908</port>
<port>802</port> <uriEncoding>UTF-8</uriEncoding>
</httpConnector>
<webApp>
<contextPath>/</contextPath>
</webApp>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
......
...@@ -275,22 +275,8 @@ ...@@ -275,22 +275,8 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.12.RC2</version>
<configuration>
<stopKey>gic-mall</stopKey>
<httpConnector>
<port>802</port>
</httpConnector>
<webApp>
<contextPath>/</contextPath>
</webApp>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version> <version>2.2</version>
<configuration> <configuration>
<path>/haoban-manage3-web</path> <path>/haoban-manage3-web</path>
......
...@@ -268,19 +268,14 @@ ...@@ -268,19 +268,14 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>9.4.12.RC2</version> <version>2.2</version>
<configuration> <configuration>
<stopKey>gic-mall</stopKey> <path>/haoban-manage3-wx</path>
<httpConnector> <port>9909</port>
<port>802</port> <uriEncoding>UTF-8</uriEncoding>
</httpConnector>
<webApp>
<contextPath>/</contextPath>
</webApp>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment