|
@@ -344,9 +344,21 @@
|
|
|
|
|
|
</dependencies>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
<build>
|
|
|
+ <finalName>${project.artifactId}</finalName>
|
|
|
+ <plugins>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
+ <configuration>
|
|
|
+ <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 -->
|
|
|
+ <includeSystemScope>true</includeSystemScope>
|
|
|
+ </configuration>
|
|
|
+ </plugin>
|
|
|
+ </plugins>
|
|
|
+ </build>
|
|
|
+
|
|
|
+ <!--<build>
|
|
|
<finalName>${project.artifactId}</finalName>
|
|
|
<extensions>
|
|
|
<extension>
|
|
@@ -363,7 +375,7 @@
|
|
|
<fork>true</fork>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
- <!-- resource插件 -->
|
|
|
+ <!– resource插件 –>
|
|
|
<plugin>
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
<artifactId>maven-resources-plugin</artifactId>
|
|
@@ -372,7 +384,7 @@
|
|
|
<encoding>UTF-8</encoding>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
- <!-- 跳过单元测试 -->
|
|
|
+ <!– 跳过单元测试 –>
|
|
|
<plugin>
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
@@ -388,16 +400,16 @@
|
|
|
<fromFile>target/${pack-name}</fromFile>
|
|
|
<url><![CDATA[scp://${remote-username}:${remote-passwd}@${remote-addr}${service-path}]]></url>
|
|
|
<commands>
|
|
|
- <!-- Kill Old Process -->
|
|
|
+ <!– Kill Old Process –>
|
|
|
<command>kill -9 `ps -ef |grep ${project.artifactId}.jar|grep -v "grep" |awk '{print $2}'`
|
|
|
</command>
|
|
|
- <!-- Restart jar package,write result into renren.log -->
|
|
|
+ <!– Restart jar package,write result into renren.log –>
|
|
|
<command>
|
|
|
- <![CDATA[nohup java -jar ${service-path}/${pack-name} --spring.profiles.active=test > ${service-path}/renren.log 2>&1 & ]]></command>
|
|
|
+ <![CDATA[nohup java -jar ${service-path}/${pack-name} --spring.profiles.active=test > ${service-path}/renren.log 2>&1 & ]]></command>
|
|
|
<command><![CDATA[netstat -nptl]]></command>
|
|
|
<command><![CDATA[ps -ef | grep java | grep -v grep]]></command>
|
|
|
</commands>
|
|
|
- <!-- 运行命令 mvn clean package wagon:upload-single wagon:sshexec-->
|
|
|
+ <!– 运行命令 mvn clean package wagon:upload-single wagon:sshexec–>
|
|
|
<displayCommandOutputs>true</displayCommandOutputs>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
@@ -406,14 +418,14 @@
|
|
|
<groupId>com.spotify</groupId>
|
|
|
<artifactId>docker-maven-plugin</artifactId>
|
|
|
<version>0.4.14</version>
|
|
|
- <!--<executions>-->
|
|
|
- <!--<execution>-->
|
|
|
- <!--<phase>package</phase>-->
|
|
|
- <!--<goals>-->
|
|
|
- <!--<goal>build</goal>-->
|
|
|
- <!--</goals>-->
|
|
|
- <!--</execution>-->
|
|
|
- <!--</executions>-->
|
|
|
+ <!–<executions>–>
|
|
|
+ <!–<execution>–>
|
|
|
+ <!–<phase>package</phase>–>
|
|
|
+ <!–<goals>–>
|
|
|
+ <!–<goal>build</goal>–>
|
|
|
+ <!–</goals>–>
|
|
|
+ <!–</execution>–>
|
|
|
+ <!–</executions>–>
|
|
|
<configuration>
|
|
|
<imageName>renren/fast</imageName>
|
|
|
<dockerDirectory>${project.basedir}</dockerDirectory>
|
|
@@ -425,10 +437,10 @@
|
|
|
</resource>
|
|
|
</resources>
|
|
|
</configuration>
|
|
|
- <!-- 运行命令 mvn clean package docker:build 打包并生成docker镜像 -->
|
|
|
+ <!– 运行命令 mvn clean package docker:build 打包并生成docker镜像 –>
|
|
|
</plugin>
|
|
|
</plugins>
|
|
|
- </build>
|
|
|
+ </build>-->
|
|
|
|
|
|
<repositories>
|
|
|
<repository>
|