inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-09-17 14:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #528 from Alfresco/bug/440

Browse Source 
BUGFIX - 440 - Maven Plugin - Make Tomcat Maven Plugin version configurable
This commit is contained in:
Ole Hejlskov
2019-01-24 11:48:55 +01:00
committed by GitHub
parent 387a584aa1 a7f2db61e8
commit e8976addea
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java
View File

@@ -62,7 +62,6 @@ public abstract class AbstractRunMojo extends AbstractMojo {
public static final String MAVEN_INSTALL_PLUGIN_VERSION = "2.5.2"; public static final String MAVEN_INSTALL_PLUGIN_VERSION = "2.5.2";
public static final String MAVEN_REPLACER_PLUGIN_VERSION = "1.5.3"; public static final String MAVEN_REPLACER_PLUGIN_VERSION = "1.5.3";
public static final String MAVEN_RESOURCE_PLUGIN_VERSION = "2.7"; public static final String MAVEN_RESOURCE_PLUGIN_VERSION = "2.7";
public static final String MAVEN_TOMCAT7_PLUGIN_VERSION = "2.2";
public static final String MAVEN_BUILD_HELPER_PLUGIN_VERSION = "1.12"; public static final String MAVEN_BUILD_HELPER_PLUGIN_VERSION = "1.12";
public static final String PLATFORM_WAR_PREFIX_NAME = "platform"; public static final String PLATFORM_WAR_PREFIX_NAME = "platform";
@@ -394,6 +393,13 @@ public abstract class AbstractRunMojo extends AbstractMojo {
@Parameter(property = "maven.alfresco.tomcat.version") @Parameter(property = "maven.alfresco.tomcat.version")
protected String tomcatVersion; protected String tomcatVersion;
/**
* Tomcat Maven Plugin version to be used when running the project. If this parameter is not set, then the
* default Tomcat Maven Plugin version will be used (2.2).
*/
@Parameter(property = "maven.alfresco.tomcat.maven.plugin.version", defaultValue = "2.2")
protected String tomcatMavenPluginVersion;
/** /**
* Location of a custom context file to use in the deployment of the platform war in Tomcat. * Location of a custom context file to use in the deployment of the platform war in Tomcat.
*/ */
@@ -1466,7 +1472,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
plugin( plugin(
groupId("org.apache.tomcat.maven"), groupId("org.apache.tomcat.maven"),
artifactId("tomcat7-maven-plugin"), artifactId("tomcat7-maven-plugin"),
version(MAVEN_TOMCAT7_PLUGIN_VERSION), version(tomcatMavenPluginVersion),
tomcatPluginDependencies tomcatPluginDependencies
), ),
goal("run"), goal("run"),