Centralize where versions are control for the build and update them

eclipse-birt · Mar 28, 2024 · 52743e7 · 52743e7
1 parent 88b9efb
commit 52743e7
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 56 deletions.
diff --git a/build/birt-packages/birt-charts/ChartRuntime/pom.xml b/build/birt-packages/birt-charts/ChartRuntime/pom.xml
@@ -32,7 +32,7 @@
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-ssh</artifactId>
-				<version>1.0-beta-6</version>
+				<version>${wagon.ssh.version}</version>
 			</extension>
 		</extensions>
 		<plugins>

diff --git a/build/birt-packages/birt-charts/ChartSDK/pom.xml b/build/birt-packages/birt-charts/ChartSDK/pom.xml
@@ -32,7 +32,7 @@
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-ssh</artifactId>
-				<version>1.0-beta-6</version>
+				<version>${wagon.ssh.version}</version>
 			</extension>
 		</extensions>
 		<plugins>

diff --git a/build/birt-packages/birt-charts/DeploymentRuntime/pom.xml b/build/birt-packages/birt-charts/DeploymentRuntime/pom.xml
@@ -32,7 +32,7 @@
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-ssh</artifactId>
-				<version>1.0-beta-6</version>
+				<version>${wagon.ssh.version}</version>
 			</extension>
 		</extensions>
 		<plugins>

diff --git a/build/birt-packages/birt-nl/birt-charts/pom.xml b/build/birt-packages/birt-nl/birt-charts/pom.xml
@@ -89,7 +89,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.3</version>
+				<version>${build.helper.maven.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>add-runtime-sdk</id>

diff --git a/build/birt-packages/birt-nl/birt-rcp-report-designer/pom.xml b/build/birt-packages/birt-nl/birt-rcp-report-designer/pom.xml
@@ -133,7 +133,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.3</version>
+				<version>${build.helper.maven.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>add-runtime-sdk</id>

diff --git a/build/birt-packages/birt-nl/birt-report-designer-all-in-one/pom.xml b/build/birt-packages/birt-nl/birt-report-designer-all-in-one/pom.xml
@@ -203,7 +203,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.3</version>
+				<version>${build.helper.maven.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>add-runtime-sdk</id>

diff --git a/build/birt-packages/birt-nl/birt-report-framework/pom.xml b/build/birt-packages/birt-nl/birt-report-framework/pom.xml
@@ -203,7 +203,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.3</version>
+				<version>${build.helper.maven.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>add-runtime-sdk</id>

diff --git a/build/birt-packages/birt-nl/birt-runtime/pom.xml b/build/birt-packages/birt-nl/birt-runtime/pom.xml
@@ -127,7 +127,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.3</version>
+				<version>${build.helper.maven.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>add-runtime-sdk</id>

diff --git a/build/birt-packages/birt-runtime-osgi/pom.xml b/build/birt-packages/birt-runtime-osgi/pom.xml
@@ -87,7 +87,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
+				<version>${antrun.version}</version>
 				<executions>
 					<execution>
 						<id>clean</id>

diff --git a/build/birt-packages/birt-runtime-test/pom.xml b/build/birt-packages/birt-runtime-test/pom.xml
@@ -40,7 +40,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>${maven.dependency.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>copy</id>

diff --git a/build/birt-packages/birt-runtime/pom.xml b/build/birt-packages/birt-runtime/pom.xml
@@ -54,7 +54,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
+				<version>${antrun.version}</version>
 				<executions>
 					<execution>
 						<id>clean</id>

diff --git a/build/org.eclipse.birt.build/pom.xml b/build/org.eclipse.birt.build/pom.xml
@@ -29,7 +29,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>${maven.dependency.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>download-jars</id>

diff --git a/build/org.eclipse.birt.p2updatesite/pom.xml b/build/org.eclipse.birt.p2updatesite/pom.xml
@@ -32,7 +32,7 @@
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-ssh</artifactId>
-				<version>1.0-beta-6</version>
+				<version>${wagon.ssh.version}</version>
 			</extension>
 		</extensions>
 		<plugins>

diff --git a/build/org.eclipse.birt.sdk/pom.xml b/build/org.eclipse.birt.sdk/pom.xml
@@ -89,7 +89,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4.1</version>
+				<version>${maven-assembly-plugin-version}</version>
 				<configuration>
 					<!-- <filters> <filter>src/assembly/filter.properties</filter> </filters> -->
 					<descriptors>
@@ -109,7 +109,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>${maven.dependency.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>unpack</id>

diff --git a/chart/org.eclipse.birt.chart.device.pdf/pom.xml b/chart/org.eclipse.birt.chart.device.pdf/pom.xml
@@ -35,7 +35,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
+				<version>${maven.dependency.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>Copy jars</id>

diff --git a/pom.xml b/pom.xml
@@ -2,20 +2,20 @@
 <!--
  *******************************************************************************
  * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0/.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *   See git history
  *******************************************************************************
 -->
-<!-- Copyright (c) 2015, 2021 Eclipse BIRT contributors and others This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License 2.0 which is available at https://www.eclipse.org/legal/epl-2.0/. 
+<!-- Copyright (c) 2015, 2021 Eclipse BIRT contributors and others This program
+	and the accompanying materials are made available under the terms of the
+	Eclipse Public License 2.0 which is available at https://www.eclipse.org/legal/epl-2.0/.
 	SPDX-License-Identifier: EPL-2.0 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
@@ -26,21 +26,28 @@
 
 	<properties>
 		<birt.version>4.16.0</birt.version>
-		<antrun.version>3.0.0</antrun.version>
+		<tycho.scmUrl>scm:git:https://github.com/eclipse-birt/birt.git</tycho.scmUrl>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<skipTests>false</skipTests>
+
 		<Replace_By_Date>v${maven.build.timestamp}</Replace_By_Date>
-		<!--<build>v${maven.build.timestamp}</build> -->
 		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
-		<tycho.scmUrl>scm:git:https://github.com/eclipse-birt/birt.git</tycho.scmUrl>
+
+		<antrun.version>3.1.0</antrun.version>
+		<build.helper.maven.plugin.version>3.5.0</build.helper.maven.plugin.version>
+		<cbi-version>1.4.3</cbi-version>
+		<jacoco.maven.plugin.version>0.8.9</jacoco.maven.plugin.version>
+		<jetty-jspc-maven-plugin-version>10.0.20</jetty-jspc-maven-plugin-version>
 		<junit-version>4.13.2</junit-version>
+		<maven-compiler-plugin-version>3.9.0</maven-compiler-plugin-version>
+		<maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
 		<maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
 		<maven-surefire-plugin-version>3.2.5</maven-surefire-plugin-version>
+		<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
 		<tycho.version>4.0.7</tycho.version>
-		<jetty.version>10.0.15</jetty.version>
-		<cbi-version>1.4.3</cbi-version>
-		<skipTests>false</skipTests>
+		<wagon.ssh.version>3.5.3</wagon.ssh.version>
 
-		<build.type>nightly</build.type>		
+		<build.type>nightly</build.type>
 		<justj.tools.repo>https://download.eclipse.org/justj/tools/updates/nightly/latest</justj.tools.repo>
 		<justj.eclipse.repo>https://download.eclipse.org/releases/2023-03</justj.eclipse.repo>
 		<org.eclipse.storage.user>genie.birt</org.eclipse.storage.user>
@@ -292,7 +299,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>${maven-compiler-plugin-version}</version>
 				<configuration>
 					<release>11</release>
 				</configuration>
@@ -348,19 +355,19 @@
 				<configuration>
 					<skipTests>true</skipTests>
 				</configuration>
-				<!-- Exclude integration tests that may hang or cause other occasional 
-					delays in integration test. Uncomment the following config block to disable 
+				<!-- Exclude integration tests that may hang or cause other occasional
+					delays in integration test. Uncomment the following config block to disable
 					these tests temporarely. -->
-				<!-- <configuration> <testRuntime>default</testRuntime> <excludes> <exclude>**/FolderArchiveTest.*</exclude> 
-					<exclude>**/org/eclipse/birt/data/engine/**/*Test.*</exclude> </excludes> 
+				<!-- <configuration> <testRuntime>default</testRuntime> <excludes> <exclude>**/FolderArchiveTest.*</exclude>
+					<exclude>**/org/eclipse/birt/data/engine/**/*Test.*</exclude> </excludes>
 					</configuration> -->
 			</plugin>
 
 			<!-- generate code coverage report -->
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.9</version>
+				<version>${jacoco.maven.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>jacoco-prepare-agent</id>

diff --git a/viewer/org.eclipse.birt.report.viewer/pom.xml b/viewer/org.eclipse.birt.report.viewer/pom.xml
@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-jspc-maven-plugin</artifactId>
-				<version>${jetty.version}</version>
+				<version>${jetty-jspc-maven-plugin-version}</version>
 				<executions>
 					<execution>
 						<id>pre-compile-jsp</id>
@@ -70,26 +70,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!--
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.4.1</version>
-				<configuration>
-					<phase>clean</phase>
-					<failOnError>false</failOnError>
-					<filesets>
-						<fileset>
-							<directory>birt/WEB-INF/lib</directory>
-							<includes>
-								<include>jsp.jar</include>
-								<include>viewservlets.jar</include>
-							</includes>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			-->
 		</plugins>
 	</build>
 </project>