Эх сурвалжийг харах

upgrade pom.xml 云平台版本变量全局化

deason 4 жил өмнө
parent
commit
26b99bd2c0

+ 3 - 4
examcloud-api-commons/pom.xml

@@ -3,20 +3,19 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-api-commons</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-jenkins-build</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>

+ 3 - 12
examcloud-commons/pom.xml

@@ -3,30 +3,21 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-commons</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-jenkins-build</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
-        <!--<dependency>
-            <groupId>jdk.tools</groupId>
-            <artifactId>jdk.tools</artifactId>
-            <version>${java.version}</version>
-            <scope>system</scope>
-            <systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
-        </dependency>-->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

+ 3 - 4
examcloud-config-center-starter/pom.xml

@@ -3,20 +3,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-config-center-starter</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-web</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.cloud</groupId>

+ 5 - 16
examcloud-java-sdk/pom.xml

@@ -1,23 +1,15 @@
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>cn.com.qmth.sdk</groupId>
     <artifactId>examcloud-java-sdk</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -64,13 +56,10 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <skipTests>true</skipTests>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
             <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

+ 3 - 4
examcloud-jenkins-build/pom.xml

@@ -3,13 +3,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-jenkins-build</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
-</project>
+</project>

+ 3 - 5
examcloud-question-commons/pom.xml

@@ -2,22 +2,20 @@
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>cn.com.qmth.examcloud.question</groupId>
     <artifactId>examcloud-question-commons</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-jenkins-build</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

+ 3 - 5
examcloud-reports-commons/pom.xml

@@ -3,22 +3,20 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>cn.com.qmth.examcloud.reports</groupId>
     <artifactId>examcloud-reports-commons</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-web</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.aliyun.openservices</groupId>

+ 3 - 5
examcloud-starters/examcloud-geetest-starter/pom.xml

@@ -2,15 +2,13 @@
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>cn.com.qmth.examcloud.starters</groupId>
     <artifactId>examcloud-geetest-starter</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <groupId>cn.com.qmth.examcloud.starters</groupId>
+        <artifactId>examcloud-starters</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>

+ 6 - 1
examcloud-starters/pom.xml

@@ -3,9 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud.starters</groupId>
     <artifactId>examcloud-starters</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <parent>
+        <groupId>cn.com.qmth.examcloud</groupId>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
+    </parent>
+
     <modules>
         <module>examcloud-geetest-starter</module>
     </modules>

+ 5 - 6
examcloud-support/pom.xml

@@ -3,25 +3,24 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-support</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-web</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.question</groupId>
+            <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-question-commons</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

+ 4 - 6
examcloud-web/pom.xml

@@ -3,25 +3,24 @@
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-web</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-commons</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-api-commons</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -99,7 +98,6 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>${druid.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>log4j</groupId>

+ 3 - 4
examcloud-ws-starter/pom.xml

@@ -3,20 +3,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examcloud-ws-starter</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
-        <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <artifactId>examcloud-components</artifactId>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-web</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 7 - 46
pom.xml

@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud</groupId>
     <artifactId>examcloud-components</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <parent>
+        <groupId>cn.com.qmth.examcloud</groupId>
+        <artifactId>examcloud-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../examcloud-parent/pom.xml</relativePath>
+    </parent>
 
     <modules>
         <module>examcloud-jenkins-build</module>
@@ -26,43 +26,4 @@
         <module>examcloud-starters</module>
     </modules>
 
-  
-    
-   <distributionManagement>
-     <repository>
-         <id>maven-releases</id>
-         <name>Release repository</name>
-        <url>http://192.168.10.201:8081/repository/maven-releases/</url>
-    </repository>
-     <snapshotRepository>
-        <id>maven-snapshots</id>
-        <name>Snapshots repository</name>
-        <url>http://192.168.10.201:8081/repository/maven-snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <showWarnings>false</showWarnings>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+</project>