common versions pt1

(cherry picked from commit 6ddf2afb0b)
This commit is contained in:
alandavis
2021-05-05 21:24:35 +01:00
parent 525842a77c
commit b447272ee3
4 changed files with 74 additions and 145 deletions

View File

@@ -17,72 +17,56 @@
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.buildhelper.version>1.9.1</maven.buildhelper.version>
<maven.compiler.version>3.8.0</maven.compiler.version>
<maven.enforcer.plugin>3.0.0-M2</maven.enforcer.plugin>
<maven.resources.version>3.1.0</maven.resources.version>
<maven.tomcat.port>8080</maven.tomcat.port>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<license.update.dryrun>true</license.update.dryrun>
<license.verbose>false</license.verbose>
<app.amp.client.war.folder>${project.build.directory}/${project.build.finalName}-war</app.amp.client.war.folder>
<app.amp.folder>src/main/amp</app.amp.folder>
<app.amp.output.folder>../${project.build.finalName}</app.amp.output.folder>
<app.filtering.enabled>true</app.filtering.enabled>
<app.properties.include>**</app.properties.include>
<app.properties.folder>src/main/properties/local</app.properties.folder>
<app.properties.test.include>**</app.properties.test.include>
<app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco.surf</groupId>
<artifactId>spring-webscripts</artifactId>
<version>${alfresco-spring-webscripts.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${alfresco.postgres.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${dependency.mysql.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<!-- XML jars removed in Java 11 but are provided by alfresco-content-services -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${javax-jaxb.version}</version>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
<version>${camel.mock.version}</version>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>javax.xml.bind</groupId>-->
<!-- <artifactId>jaxb-api</artifactId>-->
<!-- <version>${javax-jaxb.version}</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${javax-jaxb-impl.version}</version>
<scope>provided</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.sun.xml.bind</groupId>-->
<!-- <artifactId>jaxb-impl</artifactId>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
<version>6.2.99</version>
<scope>provided</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.bcel</groupId>-->
<!-- <artifactId>bcel</artifactId>-->
<!-- <version>6.2.99</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
</dependencies>
<build>
@@ -123,7 +107,7 @@
<regexPropertySettings>
<regexPropertySetting>
<name>ags.module.repo.version.min</name>
<value>${alfresco.min.version}</value>
<value>${amp.min.version}</value>
<regex>(\d+)\.(\d+).*</regex>
<replacement>$1.$2</replacement>
<failIfNoMatch>false</failIfNoMatch>
@@ -287,8 +271,8 @@
<goal>testCompile</goal>
</goals>
<configuration>
<source>${testJavaVersion}</source>
<target>${testJavaVersion}</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</execution>
</executions>
@@ -487,7 +471,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${apache-compress.version}</version>
<version>${dependency.apache-compress.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco.maven.plugin</groupId>

View File

@@ -28,31 +28,6 @@
<artifactId>spring-test</artifactId>
<version>${dependency.spring.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

View File

@@ -12,24 +12,7 @@
</parent>
<properties>
<alfresco.data.location>${basedir}/target/alf_test_data</alfresco.data.location>
<alfresco.db.hibernate.dialect>org.alfresco.repo.domain.dialect.MySQLInnoDBDialect</alfresco.db.hibernate.dialect>
<alfresco.db.name>alfresco</alfresco.db.name>
<alfresco.db.username>alfresco</alfresco.db.username>
<alfresco.db.password>alfresco</alfresco.db.password>
<alfresco.db.host>localhost</alfresco.db.host>
<alfresco.test.db.name>alfresco-test</alfresco.test.db.name>
<mysql.version>5.7.23</mysql.version>
<mysql.port>3306</mysql.port>
<mysql.tests.port>3307</mysql.tests.port>
<postgresql.port>5432</postgresql.port>
<!--This prevents a clash when postgres is already running natively on the machine.-->
<postgresql.tests.port>5431</postgresql.tests.port>
<alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
<alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
<image.name>alfresco/alfresco-governance-repository-community</image.name>
@@ -99,7 +82,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>
@@ -563,7 +546,7 @@
<configuration>
<images>
<image>
<name>mysql:${mysql.version}</name>
<name>mysql:${dependency.mysql-image.version}</name>
<run>
<ports>
<port>${mysql.tests.port}:${mysql.port}</port>