Commit 499ac4a986835cec17da605003d72a984c12f376

Authored by Samuel Langlois
1 parent df5ce2594f
Exists in master

Use alfresco-super-pom to fix version of Maven plugins

Showing 1 changed file with 17 additions and 34 deletions   Show diff stats
1 1 <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">
2 2  
3 3 <modelVersion>4.0.0</modelVersion>
  4 + <parent>
  5 + <groupId>org.alfresco</groupId>
  6 + <artifactId>alfresco-super-pom</artifactId>
  7 + <version>7</version>
  8 + </parent>
4 9 <groupId>org.alfresco.test</groupId>
5 10 <artifactId>alfresco-api-test-utils</artifactId>
6 11 <version>1.2-SNAPSHOT</version>
... ... @@ -71,17 +76,7 @@
71 76 </testResources>
72 77 <plugins>
73 78 <plugin>
74   - <groupId>org.apache.maven.plugins</groupId>
75   - <artifactId>maven-compiler-plugin</artifactId>
76   - <version>3.3</version>
77   - <configuration>
78   - <source>${java.version}</source>
79   - <target>${java.version}</target>
80   - </configuration>
81   - </plugin>
82   - <plugin>
83 79 <artifactId>maven-surefire-plugin</artifactId>
84   - <version>2.16</version>
85 80 <configuration>
86 81 <suiteXmlFiles>
87 82 <suiteXmlFile>${testng.xml}</suiteXmlFile>
... ... @@ -97,15 +92,13 @@
97 92 <plugin>
98 93 <!-- Configuration triggered by mvn antrun:run, used by Bamboo to stop server -->
99 94 <artifactId>maven-antrun-plugin</artifactId>
100   - <version>1.7</version>
101 95 <executions>
102 96 <execution>
103 97 <id>default-cli</id>
104 98 <configuration>
105 99 <target>
106 100 <echo>Stopping Alfresco...</echo>
107   - <exec executable="${basedir}/target/alf-installation/alfresco.sh"
108   - dir="target/alf-installation" failonerror="true">
  101 + <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
109 102 <arg value="stop" />
110 103 </exec>
111 104 </target>
... ... @@ -136,12 +129,12 @@
136 129 <sql autocommit="true" driver="org.postgresql.Driver" password="alfresco" url="jdbc:postgresql:template1" userid="alfresco">drop
137 130 database if exists alfresco; create database alfresco</sql>
138 131 <echo>Downloading Alfresco installer...</echo>
139   - <sshexec command="ls -rt ${enterprise.installer.path} | tail -1 | tr ' ' '?' " host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" username="tomcat"/>
140   - <scp keyfile="${user.home}/.ssh/id_rsa" localTofile="target/alf-installer.bin" remoteFile="tomcat@pbam01.alfresco.com:${installerPath}"/>
141   - <chmod file="target/alf-installer.bin" perm="a+x" verbose="true"/>
  132 + <sshexec command="ls -rt ${enterprise.installer.path} | tail -1 | tr ' ' '?' " host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" username="tomcat" />
  133 + <scp keyfile="${user.home}/.ssh/id_rsa" localTofile="target/alf-installer.bin" remoteFile="tomcat@pbam01.alfresco.com:${installerPath}" />
  134 + <chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
142 135 <echo>Installing Alfresco...</echo>
143 136 <exec dir="target" executable="${basedir}/target/alf-installer.bin" failonerror="true">
144   - <arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation"/>
  137 + <arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation" />
145 138 </exec>
146 139 </target>
147 140 </configuration>
... ... @@ -181,10 +174,10 @@
181 174 <target>
182 175 <echo>Starting Alfresco...</echo>
183 176 <exec dir="target/alf-installation" executable="${basedir}/target/alf-installation/alfresco.sh" failonerror="true">
184   - <arg value="start"/>
185   - <env key="CATALINA_OPTS" value="${argLine}"/>
  177 + <arg value="start" />
  178 + <env key="CATALINA_OPTS" value="${argLine}" />
186 179 </exec>
187   - <sleep minutes="5"/>
  180 + <sleep minutes="5" />
188 181 </target>
189 182 </configuration>
190 183 </execution>
... ... @@ -198,7 +191,7 @@
198 191 <target>
199 192 <echo>Stopping Alfresco...</echo>
200 193 <exec dir="target/alf-installation" executable="${basedir}/target/alf-installation/alfresco.sh" failonerror="true">
201   - <arg value="stop"/>
  194 + <arg value="stop" />
202 195 </exec>
203 196 </target>
204 197 </configuration>
... ... @@ -211,20 +204,10 @@
211 204 </profiles>
212 205 <scm>
213 206 <connection>scm:git:https://gitlab.alfresco.com/engineering/alfresco-api-test-utils.git</connection>
  207 + <developerConnection>scm:git:https://gitlab.alfresco.com/engineering/alfresco-api-test-utils.git</developerConnection>
214 208 <url>https://gitlab.alfresco.com/engineering/alfresco-api-test-utils</url>
215   - </scm>
216   - <repositories>
217   - <repository>
218   - <id>alfresco-internal</id>
219   - <url>https://nexus.alfresco.com/nexus/content/repositories/releases</url>
220   - <releases>
221   - <enabled>true</enabled>
222   - </releases>
223   - <snapshots>
224   - <enabled>false</enabled>
225   - </snapshots>
226   - </repository>
227   - </repositories>
  209 + <tag>HEAD</tag>
  210 + </scm>
228 211 <distributionManagement>
229 212 <repository>
230 213 <id>alfresco-internal</id>
... ...