Browse Source

修改打包方式

lijie 3 years ago
parent
commit
5fc0ed6aaa
4 changed files with 129 additions and 37 deletions
  1. 34 12
      dmp-dic/pom.xml
  2. 34 11
      dmp-org/pom.xml
  3. 23 0
      dmp-rwd-edit/pom.xml
  4. 38 14
      dmp-rwd/pom.xml

+ 34 - 12
dmp-dic/pom.xml

@@ -117,10 +117,32 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/</directory>
+                                    <includes>
+                                        <include>**/*.yml</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- 按照测试要求打成zip需要的配置 -->
             <!--获取git信息-->
-            <plugin>
+            <!--<plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
                 <executions>
@@ -134,7 +156,7 @@
                     <verbose>true</verbose>
                     <dateFormat>yyyyMMddHHmm</dateFormat>
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                    <!--<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>-->
+                    &lt;!&ndash;<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>&ndash;&gt;
                     <generateGitPropertiesFilename>target/git.properties</generateGitPropertiesFilename>
                 </configuration>
             </plugin>
@@ -150,13 +172,13 @@
                             <goal>rename</goal>
                         </goals>
                         <configuration>
-<!--                            <sourceFile>${project.build.directory}/git.properties</sourceFile>-->
+&lt;!&ndash;                            <sourceFile>${project.build.directory}/git.properties</sourceFile>&ndash;&gt;
                             <destinationFile>${project.build.directory}/version.txt</destinationFile>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <!--拷贝资源文件 copy-resources-->
+            &lt;!&ndash;拷贝资源文件 copy-resources&ndash;&gt;
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
@@ -184,7 +206,7 @@
                             <outputDirectory>${project.build.directory}/config</outputDirectory>
                         </configuration>
                     </execution>
-                    <!--拷贝启动脚本-->
+                    &lt;!&ndash;拷贝启动脚本&ndash;&gt;
                     <execution>
                         <id>copy-version</id>
                         <phase>package</phase>
@@ -203,14 +225,14 @@
                 </executions>
             </plugin>
 
-            <!-- 打包压缩 -->
+            &lt;!&ndash; 打包压缩 &ndash;&gt;
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <!-- 当执行mvn package时才会打包 -->
+                        &lt;!&ndash; 当执行mvn package时才会打包 &ndash;&gt;
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
@@ -219,17 +241,17 @@
                             <finalName>
                                 ${project.artifactId}_${git.commit.time}_git_${git.branch}_${git.commit.id.abbrev}
                             </finalName>
-                            <!--不包含assembly id-->
+                            &lt;!&ndash;不包含assembly id&ndash;&gt;
                             <appendAssemblyId>false</appendAssemblyId>
-                            <!--输出路径-->
-                            <!--<outputDirectory>../target/co_search-${project.version}</outputDirectory>-->
+                            &lt;!&ndash;输出路径&ndash;&gt;
+                            &lt;!&ndash;<outputDirectory>../target/co_search-${project.version}</outputDirectory>&ndash;&gt;
                             <descriptors>
                                 <descriptor>src/script/zip.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 

+ 34 - 11
dmp-org/pom.xml

@@ -119,8 +119,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/</directory>
+                                    <includes>
+                                        <include>**/*.yml</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-            <!--拷贝资源文件 copy-resources-->
+            <!--&lt;!&ndash;拷贝资源文件 copy-resources&ndash;&gt;
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
@@ -148,7 +171,7 @@
                             <outputDirectory>${project.build.directory}/config</outputDirectory>
                         </configuration>
                     </execution>
-                    <!--拷贝启动脚本-->
+                    &lt;!&ndash;拷贝启动脚本&ndash;&gt;
                     <execution>
                         <id>copy-version</id>
                         <phase>package</phase>
@@ -167,8 +190,8 @@
                 </executions>
             </plugin>
 
-            <!-- 按照测试要求打成zip需要的配置 -->
-            <!--获取git信息-->
+            &lt;!&ndash; 按照测试要求打成zip需要的配置 &ndash;&gt;
+            &lt;!&ndash;获取git信息&ndash;&gt;
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
@@ -183,19 +206,19 @@
                     <verbose>true</verbose>
                     <dateFormat>yyyyMMddHHmm</dateFormat>
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                    <!--<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>-->
+                    &lt;!&ndash;<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>&ndash;&gt;
                     <generateGitPropertiesFilename>target/git.properties</generateGitPropertiesFilename>
                 </configuration>
             </plugin>
 
-            <!-- 打包压缩 -->
+            &lt;!&ndash; 打包压缩 &ndash;&gt;
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <!-- 当执行mvn package时才会打包 -->
+                        &lt;!&ndash; 当执行mvn package时才会打包 &ndash;&gt;
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
@@ -204,17 +227,17 @@
                             <finalName>
                                 ${project.artifactId}_${git.commit.time}_git_${git.branch}_${git.commit.id.abbrev}
                             </finalName>
-                            <!--不包含assembly id-->
+                            &lt;!&ndash;不包含assembly id&ndash;&gt;
                             <appendAssemblyId>false</appendAssemblyId>
-                            <!--输出路径-->
-                            <!--<outputDirectory>../target/co_search-${project.version}</outputDirectory>-->
+                            &lt;!&ndash;输出路径&ndash;&gt;
+                            &lt;!&ndash;<outputDirectory>../target/co_search-${project.version}</outputDirectory>&ndash;&gt;
                             <descriptors>
                                 <descriptor>src/script/zip.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 

+ 23 - 0
dmp-rwd-edit/pom.xml

@@ -177,6 +177,29 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/</directory>
+                                    <includes>
+                                        <include>**/*.yml</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <resources>
             <resource>

+ 38 - 14
dmp-rwd/pom.xml

@@ -158,8 +158,32 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/</directory>
+                                    <includes>
+                                        <include>**/*.yml</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
 
-            <!--拷贝资源文件 copy-resources-->
+            <!--拷贝资源文件 copy-resources
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
@@ -187,7 +211,7 @@
                             <outputDirectory>${project.build.directory}/config</outputDirectory>
                         </configuration>
                     </execution>
-                    <!--拷贝启动脚本-->
+                    &lt;!&ndash;&lt;!&ndash;拷贝启动脚本&ndash;&gt;
                     <execution>
                         <id>copy-version</id>
                         <phase>package</phase>
@@ -202,12 +226,12 @@
                             </resources>
                             <outputDirectory>${project.build.directory}</outputDirectory>
                         </configuration>
-                    </execution>
+                    </execution>&ndash;&gt;
                 </executions>
-            </plugin>
+            </plugin>-->
 
-            <!-- 按照测试要求打成zip需要的配置 -->
-            <!--获取git信息-->
+            <!--&lt;!&ndash; 按照测试要求打成zip需要的配置 &ndash;&gt;
+            &lt;!&ndash;获取git信息&ndash;&gt;
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
@@ -222,19 +246,19 @@
                     <verbose>true</verbose>
                     <dateFormat>yyyyMMddHHmm</dateFormat>
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                    <!--<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>-->
+                    &lt;!&ndash;<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>&ndash;&gt;
                     <generateGitPropertiesFilename>target/git.properties</generateGitPropertiesFilename>
                 </configuration>
             </plugin>
 
-            <!-- 打包压缩 -->
+            &lt;!&ndash; 打包压缩 &ndash;&gt;
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
-                        <!-- 当执行mvn package时才会打包 -->
+                        &lt;!&ndash; 当执行mvn package时才会打包 &ndash;&gt;
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
@@ -243,17 +267,17 @@
                             <finalName>
                                 ${project.artifactId}_${git.commit.time}_git_${git.branch}_${git.commit.id.abbrev}
                             </finalName>
-                            <!--不包含assembly id-->
+                            &lt;!&ndash;不包含assembly id&ndash;&gt;
                             <appendAssemblyId>false</appendAssemblyId>
-                            <!--输出路径-->
-                            <!--<outputDirectory>../target/co_search-${project.version}</outputDirectory>-->
+                            &lt;!&ndash;输出路径&ndash;&gt;
+                            &lt;!&ndash;<outputDirectory>../target/co_search-${project.version}</outputDirectory>&ndash;&gt;
                             <descriptors>
-                                <descriptor>src/script/zip.xml</descriptor>
+                                <descriptor>../script/zip.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>