wangliang 4 سال پیش
والد
کامیت
79fd753048
2فایلهای تغییر یافته به همراه114 افزوده شده و 100 حذف شده
  1. 54 47
      distributed-print-task/pom.xml
  2. 60 53
      distributed-print/pom.xml

+ 54 - 47
distributed-print-task/pom.xml

@@ -1,54 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.qmth.distributed.print.task</groupId>
-	<artifactId>distributed-print-task</artifactId>
-	<version>2.0.0</version>
-	<packaging>jar</packaging>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.qmth.distributed.print.task</groupId>
+    <artifactId>distributed-print-task</artifactId>
+    <version>2.0.0</version>
+    <packaging>jar</packaging>
 
-	<parent>
-		<groupId>com.qmth.distributed.print.service</groupId>
-		<artifactId>distributed-print-service</artifactId>
-		<version>2.0.0</version>
-	</parent>
+    <parent>
+        <groupId>com.qmth.distributed.print.service</groupId>
+        <artifactId>distributed-print-service</artifactId>
+        <version>2.0.0</version>
+    </parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.qmth.distributed.print.business</groupId>
-			<artifactId>distributed-print-business</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-quartz</artifactId>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>com.qmth.distributed.print.business</groupId>
+            <artifactId>distributed-print-business</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+        </dependency>
+    </dependencies>
 
-<!--	<build>-->
-<!--		<plugins>-->
-<!--			<plugin>-->
-<!--				<groupId>org.springframework.boot</groupId>-->
-<!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--				<configuration>-->
-<!--					<includeSystemScope>true</includeSystemScope>-->
-<!--				</configuration>-->
-<!--			</plugin>-->
-<!--			<plugin>-->
-<!--				<groupId>com.spotify</groupId>-->
-<!--				<artifactId>dockerfile-maven-plugin</artifactId>-->
-<!--				<version>1.4.12</version>-->
-<!--				<configuration>-->
-<!--					<repository>registry.cn-shenzhen.aliyuncs.com/distributed_print_task</repository>-->
-<!--					<tag>${project.version}</tag>-->
-<!--					<contextDirectory>${project.baseDir}</contextDirectory>-->
-<!--					<useMavenSettingsForAuth>true</useMavenSettingsForAuth>-->
-<!--					<pullNewerImage>true</pullNewerImage>-->
-<!--					<buildArgs>-->
-<!--						<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>-->
-<!--					</buildArgs>-->
-<!--				</configuration>-->
-<!--			</plugin>-->
-<!--		</plugins>-->
-<!--	</build>-->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <goals>-->
+<!--                            <goal>repackage</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.12</version>
+                <configuration>
+                    <repository>registry.cn-shenzhen.aliyuncs.com/distributed_print_task</repository>
+                    <tag>${project.version}</tag>
+                    <contextDirectory>${project.baseDir}</contextDirectory>
+                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                    <pullNewerImage>true</pullNewerImage>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

+ 60 - 53
distributed-print/pom.xml

@@ -1,60 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.qmth.distributed.print</groupId>
-	<artifactId>distributed-print</artifactId>
-	<version>2.0.0</version>
-	<packaging>jar</packaging>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.qmth.distributed.print</groupId>
+    <artifactId>distributed-print</artifactId>
+    <version>2.0.0</version>
+    <packaging>jar</packaging>
 
-	<parent>
-		<groupId>com.qmth.distributed.print.service</groupId>
-		<artifactId>distributed-print-service</artifactId>
-		<version>2.0.0</version>
-	</parent>
+    <parent>
+        <groupId>com.qmth.distributed.print.service</groupId>
+        <artifactId>distributed-print-service</artifactId>
+        <version>2.0.0</version>
+    </parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.qmth.distributed.print.task</groupId>
-			<artifactId>distributed-print-task</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<version>${spring-boot.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13</version>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>com.qmth.distributed.print.task</groupId>
+            <artifactId>distributed-print-task</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<includeSystemScope>true</includeSystemScope>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>dockerfile-maven-plugin</artifactId>
-				<version>1.4.12</version>
-				<configuration>
-					<repository>registry.cn-shenzhen.aliyuncs.com/distributed_print</repository>
-					<tag>${project.version}</tag>
-					<contextDirectory>${project.baseDir}</contextDirectory>
-					<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-					<pullNewerImage>true</pullNewerImage>
-					<buildArgs>
-						<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-					</buildArgs>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.12</version>
+                <configuration>
+                    <repository>registry.cn-shenzhen.aliyuncs.com/distributed_print</repository>
+                    <tag>${project.version}</tag>
+                    <contextDirectory>${project.baseDir}</contextDirectory>
+                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                    <pullNewerImage>true</pullNewerImage>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>