Mercurial > hg > heapstats

changeset 139:7ead933556b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug 2833: Improve the versioning by maven Reviewed-by: yasuenag GitHub: https://github.com/HeapStats/heapstats/pull/7
author KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
date Tue, 02 Feb 2016 19:46:07 +0900
parents 9cd4715a15aa
children 13533e30935b
files ChangeLog analyzer/cli/pom.xml analyzer/cli/src/main/assembly/distribution.xml analyzer/core/pom.xml analyzer/fx/pom.xml analyzer/fx/src/main/assembly/distribution.xml mbean/java/pom.xml
diffstat 7 files changed, 30 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 01 11:49:46 2016 +0900
+++ b/ChangeLog	Tue Feb 02 19:46:07 2016 +0900
@@ -1,3 +1,7 @@
+2016-02-02  KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
+
+	* Bug 2833: Improve the versioning by maven
+
 2016-02-01  KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
 
 	* Bug 2828: Warn if chosen snapshot do not have reference tree data
--- a/analyzer/cli/pom.xml	Mon Feb 01 11:49:46 2016 +0900
+++ b/analyzer/cli/pom.xml	Tue Feb 02 19:46:07 2016 +0900
@@ -23,9 +23,11 @@
     <parent>
         <groupId>jp.co.ntt.oss.heapstats</groupId>
         <artifactId>heapstats</artifactId>
-        <version>2.0</version>
+        <version>${project.version}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
+
+    <groupId>jp.co.ntt.oss.heapstats</groupId>
     <artifactId>heapstats-cli</artifactId>
     <packaging>jar</packaging>
     <name>HeapStats CLI</name>
@@ -39,7 +41,7 @@
     <organization>
         <name>NTT OSS Center</name>
     </organization>
-    
+
     <build>
         <plugins>
             <plugin>
--- a/analyzer/cli/src/main/assembly/distribution.xml	Mon Feb 01 11:49:46 2016 +0900
+++ b/analyzer/cli/src/main/assembly/distribution.xml	Tue Feb 02 19:46:07 2016 +0900
@@ -14,7 +14,7 @@
     <fileSets>
         <fileSet>
             <directory>${project.build.directory}</directory>
-            <outputDirectory>heapstats-cli-2.0</outputDirectory>
+            <outputDirectory>heapstats-cli-${project.version}</outputDirectory>
             <includes>
                 <include>*.jar</include>
             </includes>
@@ -26,7 +26,7 @@
             <scope>runtime</scope>
             <useProjectArtifact>false</useProjectArtifact>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>heapstats-cli-2.0/lib</outputDirectory>
+            <outputDirectory>heapstats-cli-${project.version}/lib</outputDirectory>
         </dependencySet>
     </dependencySets>
 
--- a/analyzer/core/pom.xml	Mon Feb 01 11:49:46 2016 +0900
+++ b/analyzer/core/pom.xml	Tue Feb 02 19:46:07 2016 +0900
@@ -20,9 +20,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>
+    <parent>
+        <groupId>jp.co.ntt.oss.heapstats</groupId>
+        <artifactId>heapstats</artifactId>
+        <version>${project.version}</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
     <groupId>jp.co.ntt.oss.heapstats</groupId>
     <artifactId>heapstats-core</artifactId>
-    <version>2.0</version>
     <packaging>jar</packaging>
     <name>HeapStats Analyzer Core</name>
     <properties>
@@ -30,12 +36,6 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
-    <parent>
-        <groupId>jp.co.ntt.oss.heapstats</groupId>
-        <artifactId>heapstats</artifactId>
-        <version>2.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
     <organization>
         <name>NTT OSS Center</name>
     </organization>
--- a/analyzer/fx/pom.xml	Mon Feb 01 11:49:46 2016 +0900
+++ b/analyzer/fx/pom.xml	Tue Feb 02 19:46:07 2016 +0900
@@ -23,13 +23,12 @@
     <parent>
         <artifactId>heapstats</artifactId>
         <groupId>jp.co.ntt.oss.heapstats</groupId>
-        <version>2.0</version>
+        <version>${project.version}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>jp.co.ntt.oss.heapstats</groupId>
     <artifactId>heapstats-analyzer</artifactId>
-    <version>2.0</version>
     <packaging>jar</packaging>
 
     <name>HeapStats Analyzer</name>
--- a/analyzer/fx/src/main/assembly/distribution.xml	Mon Feb 01 11:49:46 2016 +0900
+++ b/analyzer/fx/src/main/assembly/distribution.xml	Tue Feb 02 19:46:07 2016 +0900
@@ -32,7 +32,7 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
-            <outputDirectory>heapstats-analyzer-2.0</outputDirectory>
+            <outputDirectory>heapstats-analyzer-${project.version}</outputDirectory>
             <includes>
                 <include>filterDefine.xsd</include>
                 <include>heapstats.properties</include>
@@ -40,21 +40,21 @@
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}</directory>
-            <outputDirectory>heapstats-analyzer-2.0</outputDirectory>
+            <outputDirectory>heapstats-analyzer-${project.version}</outputDirectory>
             <includes>
                 <include>*.jar</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>${pom.basedir}/lib</directory>
-            <outputDirectory>heapstats-analyzer-2.0/lib</outputDirectory>
+            <outputDirectory>heapstats-analyzer-${project.version}/lib</outputDirectory>
             <includes>
                 <include>*.jar</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>${pom.basedir}</directory>
-            <outputDirectory>heapstats-analyzer-2.0</outputDirectory>
+            <outputDirectory>heapstats-analyzer-${project.version}</outputDirectory>
             <includes>
                 <include>THIRD_PARTY_README</include>
             </includes>
@@ -66,7 +66,7 @@
             <scope>runtime</scope>
             <useProjectArtifact>false</useProjectArtifact>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-            <outputDirectory>heapstats-analyzer-2.0/lib</outputDirectory>
+            <outputDirectory>heapstats-analyzer-${project.version}/lib</outputDirectory>
         </dependencySet>
     </dependencySets>
 
--- a/mbean/java/pom.xml	Mon Feb 01 11:49:46 2016 +0900
+++ b/mbean/java/pom.xml	Tue Feb 02 19:46:07 2016 +0900
@@ -20,9 +20,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>
+    <parent>
+        <groupId>jp.co.ntt.oss.heapstats</groupId>
+        <artifactId>heapstats</artifactId>
+        <version>${project.version}</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
     <groupId>jp.co.ntt.oss.heapstats</groupId>
     <artifactId>heapstats-mbean</artifactId>
-    <version>2.0</version>
     <packaging>jar</packaging>
     <name>HeapStats MBean Java Module</name>
     <properties>
@@ -30,12 +36,6 @@
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
     </properties>
-    <parent>
-        <groupId>jp.co.ntt.oss.heapstats</groupId>
-        <artifactId>heapstats</artifactId>
-        <version>2.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
     <organization>
         <name>NTT OSS Center</name>
     </organization>