Commit 9ef965c6 authored by Brian Long's avatar Brian Long
Browse files

abstract plugin versions for easier maintenance

parent 045e31a9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@
			<plugin>
				<groupId>io.repaint.maven</groupId>
				<artifactId>tiles-maven-plugin</artifactId>
				<version>2.44</version>
				<version>${tiles-maven-plugin.version}</version>
				<extensions>true</extensions>
				<configuration>
                    <!-- This assures the parent properties override defaults in the tiles -->
+8 −8
Original line number Diff line number Diff line
@@ -56,13 +56,13 @@ The following properties are intended to be exposed by inheriting Public API Mav
### Plugin Versions

| Maven Property                      |
| ---------------------------------- |
| ----------------------------------- |
| `maven-jar-plugin.version`          |
| `build-helper-plugin.version`      |
| `download-plugin.version`          |
| `regex-plugin.version`             |
| `conditional-plugin.version`       |
| `amp-plugin.version`               |
| `build-helper-maven-plugin.version` |
| `download-maven-plugin.version`     |
| `regex-maven-plugin.version`        |
| `conditional-maven-plugin.version`  |
| `amp-maven-plugin.version`          |

## Results

+75 −86
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@
			<plugin>
				<groupId>org.codehaus.mojo</groupId>
				<artifactId>build-helper-maven-plugin</artifactId>
				<version>${build-helper-plugin.version}</version>
				<version>${build-helper-maven-plugin.version}</version>
				<executions>
					<execution>
						<id>module-snapshot-timestamp</id>
@@ -45,41 +45,6 @@
							<pattern>yyyyMMddHHmmss</pattern>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>com.inteligr8</groupId>
				<artifactId>regex-maven-plugin</artifactId>
				<version>${regex-plugin.version}</version>
				<executions>
					<execution>
						<id>acs-module-version</id>
						<phase>initialize</phase>
						<goals><goal>replace-text</goal></goals>
						<configuration>
							<text>${project.version}</text>
							<newProperty>module.version</newProperty>
							<regexes>
								<!-- turn -SNAPSHOT into ATIMESTAMP -->
								<regex>
									<pattern>^(.*)-SNAPSHOT$</pattern>
									<replacement>$1-A${module.timestamp}</replacement>
								</regex>
								<!-- all others are just a copy -->
								<regex>
									<pattern>^(.*)$</pattern>
									<replacement>$1</replacement>
								</regex>
							</regexes>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>org.codehaus.mojo</groupId>
				<artifactId>build-helper-maven-plugin</artifactId>
				<version>${build-helper-plugin.version}</version>
				<executions>
					<execution>
						<id>add-acs-module-resources</id>
						<phase>generate-resources</phase>
@@ -133,11 +98,75 @@
							</resources>
						</configuration>
					</execution>
					<!-- This execution enables/disables the AMP file during the install phases -->
					<execution>
						<id>attach-amp</id>
						<phase>post-integration-test</phase>
						<goals>
							<goal>attach-artifact</goal>
						</goals>
						<configuration>
							<artifacts>
								<artifact>
									<type>amp</type>
									<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
								</artifact>
							</artifacts>
							<skipAttach>${beedk.noAmp}</skipAttach>
						</configuration>
					</execution>
					<!-- This execution enables/disables the AMP file during the deploy phases -->
					<execution>
						<id>attach-amp-classifier</id>
						<phase>post-integration-test</phase>
						<goals>
							<goal>attach-artifact</goal>
						</goals>
						<configuration>
							<artifacts>
								<artifact>
									<type>amp</type>
									<classifier>${alfresco.module.classifier}</classifier>
									<file>${project.build.directory}/${project.artifactId}-${project.version}-${alfresco.module.classifier}.amp</file>
								</artifact>
							</artifacts>
							<skipAttach>${beedk.noAmpClassifier}</skipAttach>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>com.inteligr8</groupId>
				<artifactId>regex-maven-plugin</artifactId>
				<version>${regex-maven-plugin.version}</version>
				<executions>
					<execution>
						<id>acs-module-version</id>
						<phase>initialize</phase>
						<goals><goal>replace-text</goal></goals>
						<configuration>
							<text>${project.version}</text>
							<newProperty>module.version</newProperty>
							<regexes>
								<!-- turn -SNAPSHOT into ATIMESTAMP -->
								<regex>
									<pattern>^(.*)-SNAPSHOT$</pattern>
									<replacement>$1-A${module.timestamp}</replacement>
								</regex>
								<!-- all others are just a copy -->
								<regex>
									<pattern>^(.*)$</pattern>
									<replacement>$1</replacement>
								</regex>
							</regexes>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<!-- This plugin prevents binary file formats from being corrupted due to filtering -->
			<plugin>
				<artifactId>maven-resources-plugin</artifactId>
				<version>${maven-resources-plugin.version}</version>
				<configuration>
					<encoding>UTF-8</encoding>
					<nonFilteredFileExtensions>
@@ -262,7 +291,7 @@
			<plugin>
				<groupId>com.inteligr8.alfresco</groupId>
				<artifactId>amp-maven-plugin</artifactId>
				<version>${amp-plugin.version}</version>
				<version>${amp-maven-plugin.version}</version>
				<executions>
					<execution>
						<id>build-amp-file</id>
@@ -281,7 +310,7 @@
			<plugin>
				<groupId>com.inteligr8</groupId>
				<artifactId>conditional-maven-plugin</artifactId>
				<version>${conditional-plugin.version}</version>
				<version>${conditional-maven-plugin.version}</version>
				<executions>
					<execution>
						<id>check-amp-file</id>
@@ -311,47 +340,6 @@
					</execution>
				</executions>
			</plugin>
			<!-- This plugin enables/disables the AMP file during the install/deploy phases -->
			<plugin>
				<groupId>org.codehaus.mojo</groupId>
				<artifactId>build-helper-maven-plugin</artifactId>
				<version>${build-helper-plugin.version}</version>
				<executions>
					<execution>
						<id>attach-amp</id>
						<phase>post-integration-test</phase>
						<goals>
							<goal>attach-artifact</goal>
						</goals>
						<configuration>
							<artifacts>
								<artifact>
									<type>amp</type>
									<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
								</artifact>
							</artifacts>
							<skipAttach>${beedk.noAmp}</skipAttach>
						</configuration>
					</execution>
					<execution>
						<id>attach-amp-classifier</id>
						<phase>post-integration-test</phase>
						<goals>
							<goal>attach-artifact</goal>
						</goals>
						<configuration>
							<artifacts>
								<artifact>
									<type>amp</type>
									<classifier>${alfresco.module.classifier}</classifier>
									<file>${project.build.directory}/${project.artifactId}-${project.version}-${alfresco.module.classifier}.amp</file>
								</artifact>
							</artifacts>
							<skipAttach>${beedk.noAmpClassifier}</skipAttach>
						</configuration>
					</execution>
				</executions>
			</plugin>
		</plugins>
	</build>
	
@@ -369,7 +357,7 @@
					<plugin>
						<groupId>com.googlecode.maven-download-plugin</groupId>
						<artifactId>download-maven-plugin</artifactId>
						<version>${download-plugin.version}</version>
						<version>${download-maven-plugin.version}</version>
						<executions>
							<execution>
								<id>download-module-props</id>
@@ -405,12 +393,13 @@
				<alfresco.module.path>alfresco/module/${alfresco.module.pathname}</alfresco.module.path>
				
				<!-- versions -->
				<build-helper-plugin.version>3.6.1</build-helper-plugin.version>
				<maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
				<download-plugin.version>1.13.0</download-plugin.version>
				<regex-plugin.version>1.0.7</regex-plugin.version>
				<conditional-plugin.version>1.0.2</conditional-plugin.version>
				<amp-plugin.version>1.1.5</amp-plugin.version>
				<maven-resources-plugin.version>@maven-resources-plugin.version@</maven-resources-plugin.version>
				<maven-jar-plugin.version>@maven-jar-plugin.version@</maven-jar-plugin.version>
				<build-helper-maven-plugin.version>@build-helper-maven-plugin.version@</build-helper-maven-plugin.version>
				<download-maven-plugin.version>@download-maven-plugin.version@</download-maven-plugin.version>
				<regex-maven-plugin.version>@regex-maven-plugin.version@</regex-maven-plugin.version>
				<conditional-maven-plugin.version>@conditional-maven-plugin.version@</conditional-maven-plugin.version>
				<amp-maven-plugin.version>1.1.5</amp-maven-plugin.version>
			</properties>
		</profile>
	</profiles>
+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@

				<!-- versions -->
				<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
				<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
				<maven-dependency-plugin.version>@maven-dependency-plugin.version@</maven-dependency-plugin.version>

				<!-- configuring beedk-acs-platform-it-tile -->
				<beedk.deploy.platform.warFile>${project.build.warDirectory}/${alfresco.platform.war.artifactId}-${alfresco.platform.war.version}.war</beedk.deploy.platform.warFile>
+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@

				<!-- versions -->
				<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
				<maven-dependency-plugin.version>3.10.0</maven-dependency-plugin.version>
				<maven-dependency-plugin.version>@maven-dependency-plugin.version@</maven-dependency-plugin.version>

				<!-- configuring beedk-acs-platform-rad-tile -->
				<beedk.deploy.platform.warFile>${project.build.warDirectory}/${alfresco.platform.war.artifactId}-${alfresco.platform.war.version}.war</beedk.deploy.platform.warFile>
Loading