inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fewer changes. Might fixes the 2 failing tests.

Browse Source 
[skip repo][skip db][skip tas][ags]

(cherry picked from commit f1d69ded9929a0f9a4c9c9599d0d63640e56ff65)
This commit is contained in:
alandavis
2021-05-05 21:26:52 +01:00
parent f0fe4c99a6
commit d1b56aad8e
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
amps/ags/pom.xml
View File

@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.13.2</version> <!-- <version>4.13.2</version>-->
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- XML jars removed in Java 11 but are provided by alfresco-content-services --> <!-- XML jars removed in Java 11 but are provided by alfresco-content-services -->
@@ -136,7 +136,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration> <configuration>
<doclint>none</doclint> <doclint>none</doclint>
</configuration> </configuration>
@@ -167,7 +166,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<executions> <executions>
<execution> <execution>
<id>default-install</id> <id>default-install</id>
@@ -180,7 +178,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version> <!-- <version>2.7</version>-->
<executions> <executions>
<execution> <execution>
<id>default-deploy</id> <id>default-deploy</id>
@@ -246,7 +244,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>${maven.compiler.version}</version>
<configuration> <configuration>
<source>${maven.compiler.source}</source> <source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target> <target>${maven.compiler.target}</target>
@@ -267,7 +265,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version> <version>${maven.enforcer.plugin}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@@ -290,7 +288,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version> <version>${maven.buildhelper.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@@ -369,12 +367,12 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version> <version>${maven.resources.version}</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId> <artifactId>maven-filtering</artifactId>
<version>3.1.1</version> <version>${dependency.maven-filtering.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
@@ -411,13 +409,14 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version> <version>${maven.war.plugin.version}</version>
<dependencies> <dependencies>
<!-- Needed when creating the community and enterprise rest api wars --> <!-- Needed when creating the community and enterprise rest api wars -->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId> <artifactId>commons-compress</artifactId>
<version>1.19</version> <!-- <version>1.19</version>-->
<version>${dependency.apache-compress.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
@@ -546,7 +545,7 @@
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version> <!-- <version>3.1.0</version>-->
<configuration> <configuration>
<doclet>com.docflex.javadoc.Doclet</doclet> <doclet>com.docflex.javadoc.Doclet</doclet>
<docletPath>${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar</docletPath> <docletPath>${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar</docletPath>
@@ -586,7 +585,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version> <version>${maven.buildhelper.version}</version>
<executions> <executions>
<execution> <execution>
<id>add-env-test-properties</id> <id>add-env-test-properties</id>

10
amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
View File

@@ -11,8 +11,7 @@
</parent> </parent>
<properties> <properties>
<fluent.json.version>2.0.0</fluent.json.version> <dependency.jackson-databind.version>2.7.9.1</dependency.jackson-databind.version> <!-- does this fix the 2 tests? -->
<jackson.databind.version>2.7.9.1</jackson.databind.version>
</properties> </properties>
<build> <build>
@@ -50,7 +49,6 @@
<dependency> <dependency>
<groupId>org.alfresco.tas</groupId> <groupId>org.alfresco.tas</groupId>
<artifactId>restapi</artifactId> <artifactId>restapi</artifactId>
<version>${dependency.tas-restapi.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
@@ -70,14 +68,13 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.6</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- FIXME: Remove this dependency once RMUserAPI.java has been refactored --> <!-- FIXME: Remove this dependency once RMUserAPI.java has been refactored -->
<dependency> <dependency>
<groupId>org.jglue.fluent-json</groupId> <groupId>org.jglue.fluent-json</groupId>
<artifactId>fluent-json</artifactId> <artifactId>fluent-json</artifactId>
<version>${fluent.json.version}</version> <version>2.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco.test</groupId> <groupId>org.alfresco.test</groupId>
@@ -87,7 +84,7 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId> <artifactId>commons-collections4</artifactId>
<version>4.1</version> <!-- <version>4.1</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.docker-java</groupId> <groupId>com.github.docker-java</groupId>
@@ -97,7 +94,6 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>