Browse Source

Merge pull request #379 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0

* commit '66ee1e7028eab11c2c6dd34f9f31ef85ab29549c':
  提交错了一个类,删掉
  无JIRA任务 修改pom版本号规则
final/10.0
richie 6 years ago
parent
commit
8a1396bb53
  1. 9
      designer-base/pom.xml
  2. 6
      designer-chart/pom.xml
  3. 6
      designer-form/pom.xml
  4. 8
      designer-realize/pom.xml
  5. 4
      pom.xml

9
designer-base/pom.xml

@ -6,8 +6,11 @@
<parent> <parent>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>design</artifactId> <artifactId>design</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>10.0</version>
</parent> </parent>
<groupId>com.fr.report</groupId>
<artifactId>designer-base</artifactId>
<version>${branch}-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.socket</groupId> <groupId>io.socket</groupId>
@ -15,7 +18,5 @@
<version>0.7.0</version> <version>0.7.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<groupId>com.fr.report</groupId>
<artifactId>designer-base</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version>
</project> </project>

6
designer-chart/pom.xml

@ -6,16 +6,16 @@
<parent> <parent>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>design</artifactId> <artifactId>design</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>10.0</version>
</parent> </parent>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>designer-chart</artifactId> <artifactId>designer-chart</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>${branch}-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>designer-base</artifactId> <artifactId>designer-base</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>${branch}-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

6
designer-form/pom.xml

@ -6,16 +6,16 @@
<parent> <parent>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>design</artifactId> <artifactId>design</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>10.0</version>
</parent> </parent>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>designer-form</artifactId> <artifactId>designer-form</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>${branch}-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>designer-base</artifactId> <artifactId>designer-base</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>${branch}-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

8
designer-realize/pom.xml

@ -6,21 +6,21 @@
<parent> <parent>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>design</artifactId> <artifactId>design</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>10.0</version>
</parent> </parent>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>designer-realize</artifactId> <artifactId>designer-realize</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>${branch}-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>designer-form</artifactId> <artifactId>designer-form</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>${branch}-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>designer-chart</artifactId> <artifactId>designer-chart</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>${branch}-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

4
pom.xml

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>fine-report-designer</artifactId> <artifactId>fine-report-designer</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>10.0</version>
<relativePath>../design-settings/fine-report-designer</relativePath> <relativePath>../design-settings/fine-report-designer</relativePath>
</parent> </parent>
@ -19,7 +19,7 @@
</modules> </modules>
<groupId>com.fr.report</groupId> <groupId>com.fr.report</groupId>
<artifactId>design</artifactId> <artifactId>design</artifactId>
<version>10.0-RELEASE-SNAPSHOT</version> <version>10.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<build> <build>
<plugins> <plugins>

Loading…
Cancel
Save