Commit 8202c0f8 authored by renjie's avatar renjie

Merge branch 'master' of http://120.77.149.83/zhangrj91/browser-backend

 Conflicts:
	pom.xml
parents a24a3e23 7e1b9322
...@@ -160,22 +160,17 @@ ...@@ -160,22 +160,17 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> <version>2.0.1.RELEASE</version>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>
<archive> <mainClass>com.edgec.browserbackend.BrowserBackendApplication</mainClass>
<manifest>
<mainClass>com.mimaxueyuan.cloud.eureka.EurekaHAApplication</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>
jar-with-dependencies
</descriptorRef>
</descriptorRefs>
</configuration> </configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
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