Merge branch 'master' of adgit.src.corp.qihoo.net:deep-learning/hbox …

…into fix_some_issues
Qihoo360 · Jun 7, 2024 · 7b3e9b7 · 7b3e9b7
2 parents 7044e56 + 745768f
commit 7b3e9b7
Show file tree

Hide file tree

Showing 11 changed files with 152 additions and 19 deletions.
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1 @@
+-Dmirror.of.proxy=central
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -5,7 +5,7 @@
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
   <mirrors>
     <mirror>
-      <id>mediav-proxy</id>
+      <id>aliyun-proxy</id>
       <name>Public Maven2 Proxy Repositories</name>
       <url>https://maven.aliyun.com/repository/central/</url>
       <mirrorOf>${mirror.of.proxy}</mirrorOf>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,6 +13,8 @@ Dev Tasks
 
 Bump maven plugins: `./mvnw versions:display-plugin-updates -pl .`
 Bump maven wrapper: `./mvnw wrapper:wrapper`
+Bump project major version: `./mvnw validate -Pbump-major-version`
+Bump project minor version: `./mvnw validate -Pbump-minor-version`
 Sort pom.xml: `./mvnw sortpom:sort`
 
 Release Steps
@@ -26,11 +28,12 @@ Release Steps
 # run on gateways
 
 # 3. prepare release version, git tag and next version
-./mvnw release:clean release:prepare
+./mvnw release:clean release:prepare -DpushChanges=false
 
-# 4. cleanup
-./mvnw release:clean
+# 4. push to git repo
+git push --follow-tags
 
-# 5. sync with the remote repo
+# 5. cleanup and sync with the remote repo
+./mvnw release:clean
 git fetch
 ```
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,12 +15,12 @@ pipeline {
                 }
                 stage('Lint: Maven Pom Format') {
                     steps {
-                        sh './mvnw -V -B -Dmirror.of.proxy=central sortpom:verify -Dsort.verifyFail=STOP'
+                        sh './mvnw -V -B sortpom:verify -Dsort.verifyFail=STOP'
                     }
                 }
                 stage('Lint: Check Maven Plugins') {
                     steps {
-                        sh './mvnw -V -B -Dmirror.of.proxy=central artifact:check-buildplan'
+                        sh './mvnw -V -B artifact:check-buildplan'
                     }
                 }
             }
@@ -29,7 +29,7 @@ pipeline {
             stages {
                 stage('Build: Maven Verify') {
                     steps {
-                        sh './mvnw -B -Dmirror.of.proxy=central clean verify'
+                        sh './mvnw -B clean verify'
                     }
                 }
                 stage('Build: Reproducible on tags') {
@@ -39,13 +39,13 @@ pipeline {
                     steps {
                         sh '''
                             set -eux
-                            ./mvnw -B -Dmirror.of.proxy=central clean install -Dmaven.test.skip=true -DskipTests -Dinvoker.skip -Dbuildinfo.detect.skip=false
-                            ./mvnw -B -Dmirror.of.proxy=central clean
+                            ./mvnw -B clean install -Dmaven.test.skip=true -DskipTests -Dinvoker.skip -Dbuildinfo.detect.skip=false
+                            ./mvnw -B clean
                             mkdir -p target
 
                             true artifact:compare should not contain warning or error
                             trap 'cat target/build.log' ERR
-                            ./mvnw -B -Dmirror.of.proxy=central -l target/build.log package artifact:compare -Dmaven.test.skip=true -DskipTests -Dinvoker.skip -Dbuildinfo.detect.skip=false
+                            ./mvnw -B -l target/build.log package artifact:compare -Dmaven.test.skip=true -DskipTests -Dinvoker.skip -Dbuildinfo.detect.skip=false
                             test 0 = "$(sed -n '/^\\[INFO\\] --- maven-artifact-plugin:[^:][^:]*:compare/,/^\\[INFO\\] ---/ p' target/build.log | grep -c '^\\[\\(WARNING\\|ERROR\\)\\]')"
 
                             true all files should be ok

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.qihoo</groupId>
     <artifactId>hbox-parent</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hbox-common</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.qihoo</groupId>
     <artifactId>hbox-parent</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hbox-core</artifactId>

diff --git a/history-server/pom.xml b/history-server/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.qihoo</groupId>
     <artifactId>hbox-parent</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hbox-history-server</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.qihoo</groupId>
   <artifactId>hbox-parent</artifactId>
-  <version>1.7.3-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>HBox Parent Pom</name>
@@ -26,7 +26,7 @@
   <properties>
     <maven.min-version>3.6.3</maven.min-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.outputTimestamp>2024-06-04T08:11:48Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-07T06:53:32Z</project.build.outputTimestamp>
 
     <!-- Supporting Tech Matrix
     ~ Build-time JDK: 8+, select by developer or ci environment, prefer LTS JDKs
@@ -38,6 +38,8 @@
     <sortpom.version>4.0.0</sortpom.version>
     <sort.verifyFail>warn</sort.verifyFail>
 
+    <project.effective.version>${project.version}</project.effective.version>
+
     <!-- release, only deploy the tgz archive -->
     <autoVersionSubmodules>true</autoVersionSubmodules>
     <tagNameFormat>v@{project.version}</tagNameFormat>
@@ -291,6 +293,16 @@
           <artifactId>maven-wrapper-plugin</artifactId>
           <version>3.3.2</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.6.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>versions-maven-plugin</artifactId>
+          <version>2.16.2</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -351,6 +363,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>parse-version</id>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -458,6 +482,111 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>bump-minor-version</id>
+      <properties>
+        <project.effective.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}.0${parsedVersion.qualifier?}</project.effective.version>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>versions-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>bumping-minor-version</id>
+                <goals>
+                  <goal>set</goal>
+                </goals>
+                <phase>validate</phase>
+                <inherited>false</inherited>
+                <configuration>
+                  <newVersion>${project.effective.version}</newVersion>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sync-ver-for-tests</id>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <phase>validate</phase>
+                <inherited>false</inherited>
+                <configuration>
+                  <outputDirectory>${project.basedir}/tests</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>src/test/resources</directory>
+                      <includes>
+                        <include>ver.sh</include>
+                      </includes>
+                      <filtering>true</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>bump-major-version</id>
+      <properties>
+        <project.effective.version>${parsedVersion.nextMajorVersion}.0.0${parsedVersion.qualifier?}</project.effective.version>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>versions-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>bumping-major-version</id>
+                <goals>
+                  <goal>set</goal>
+                </goals>
+                <phase>validate</phase>
+                <inherited>false</inherited>
+                <configuration>
+                  <newVersion>${project.effective.version}</newVersion>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sync-ver-for-tests</id>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <phase>validate</phase>
+                <inherited>false</inherited>
+                <configuration>
+                  <outputDirectory>${project.basedir}/tests</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>src/test/resources</directory>
+                      <includes>
+                        <include>ver.sh</include>
+                      </includes>
+                      <filtering>true</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
 </project>
diff --git a/src/test/resources/ver.sh b/src/test/resources/ver.sh
@@ -1,2 +1,2 @@
 # shellcheck shell=bash disable=SC2034
-[email protected]@
+HBOX_VERSION=@project.effective.version@
diff --git a/tests/ver.sh b/tests/ver.sh
@@ -1,2 +1,2 @@
 # shellcheck shell=bash disable=SC2034
-HBOX_VERSION=1.7.3-SNAPSHOT
+HBOX_VERSION=1.8.0-SNAPSHOT
diff --git a/web/pom.xml b/web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.qihoo</groupId>
     <artifactId>hbox-parent</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hbox-web</artifactId>