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

Revert changes except for dependency.jackson-databind.version:2.7.9.1

Browse Source 
(cherry picked from commit 016019f9f55644571306bbaf0682fcb7d1014571)
This commit is contained in:
alandavis
2021-05-05 21:27:14 +01:00
parent d1b56aad8e
commit 42bcc60652
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
amps/ags/pom.xml
View File

@@ -41,12 +41,11 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency> <!-- <dependency>-->
<groupId>junit</groupId> <!-- <groupId>junit</groupId>-->
<artifactId>junit</artifactId> <!-- <artifactId>junit</artifactId>-->
<!-- <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 -->
<dependency> <dependency>
<groupId>jakarta.jws</groupId> <groupId>jakarta.jws</groupId>
@@ -178,7 +177,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>
@@ -409,19 +408,17 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<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>${dependency.apache-compress.version}</version> <version>${dependency.apache-compress.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId> <artifactId>alfresco-maven-plugin</artifactId>
<version>2.1.1</version> <version>${alfresco.maven-plugin.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
@@ -545,7 +542,6 @@
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<!-- <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>

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

@@ -12,6 +12,7 @@
<properties> <properties>
<dependency.jackson-databind.version>2.7.9.1</dependency.jackson-databind.version> <!-- does this fix the 2 tests? --> <dependency.jackson-databind.version>2.7.9.1</dependency.jackson-databind.version> <!-- does this fix the 2 tests? -->
<maven.javadoc.skip>false</maven.javadoc.skip>
</properties> </properties>
<build> <build>
@@ -84,7 +85,6 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId> <artifactId>commons-collections4</artifactId>
<!-- <version>4.1</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.docker-java</groupId> <groupId>com.github.docker-java</groupId>