mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Fix TAS test by using old version of org.json in tests
This commit is contained in:
Alan Davis
10
.gitattributes
vendored
10
.gitattributes
vendored
@@ -1,10 +0,0 @@
|
||||
.* eol=crlf
|
||||
*.html eol=crlf
|
||||
*.java eol=crlf
|
||||
*.txt eol=crlf
|
||||
*.css eol=crlf
|
||||
*.xml eol=crlf
|
||||
*.js eol=crlf
|
||||
*.properties eol=crlf
|
||||
# Shell scripts require LF
|
||||
*.sh text eol=lf
|
||||
@@ -15,54 +15,6 @@
|
||||
<image.registry>quay.io</image.registry>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>content-services-community</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-server-root</artifactId>
|
||||
<version>${dependency.alfresco-server-root.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-mmt</artifactId>
|
||||
<version>${dependency.alfresco-mmt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco.aos-module</groupId>
|
||||
<artifactId>alfresco-aos-module</artifactId>
|
||||
<version>${alfresco.aos-module.version}</version>
|
||||
<type>amp</type>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.alfresco.aos-module</groupId>
|
||||
<artifactId>alfresco-aos-repo-binding</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco.aos-module</groupId>
|
||||
<artifactId>alfresco-vti-bin</artifactId>
|
||||
<version>${alfresco.aos-module.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco.integrations</groupId>
|
||||
<artifactId>alfresco-googledrive-repo-community</artifactId>
|
||||
<version>${alfresco.googledrive.version}</version>
|
||||
<type>amp</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
@@ -120,7 +72,6 @@
|
||||
<artifactItem>
|
||||
<groupId>org.alfresco.aos-module</groupId>
|
||||
<artifactId>alfresco-vti-bin</artifactId>
|
||||
<version>${alfresco.aos-module.version}</version>
|
||||
<type>war</type>
|
||||
<outputDirectory>${project.build.directory}/war/_vti_bin</outputDirectory>
|
||||
</artifactItem>
|
||||
@@ -145,7 +96,6 @@
|
||||
<artifactItem>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-mmt</artifactId>
|
||||
<version>${dependency.alfresco-mmt.version}</version>
|
||||
<type>jar</type>
|
||||
<overWrite>false</overWrite>
|
||||
<outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory>
|
||||
@@ -165,7 +115,6 @@
|
||||
<artifactItem>
|
||||
<groupId>org.alfresco.aos-module</groupId>
|
||||
<artifactId>alfresco-aos-module</artifactId>
|
||||
<version>${alfresco.aos-module.version}</version>
|
||||
<type>amp</type>
|
||||
<overWrite>false</overWrite>
|
||||
<outputDirectory>${project.build.directory}/amps</outputDirectory>
|
||||
@@ -173,7 +122,6 @@
|
||||
<artifactItem>
|
||||
<groupId>org.alfresco.integrations</groupId>
|
||||
<artifactId>alfresco-googledrive-repo-community</artifactId>
|
||||
<version>${alfresco.googledrive.version}</version>
|
||||
<type>amp</type>
|
||||
<overWrite>false</overWrite>
|
||||
<outputDirectory>${project.build.directory}/amps</outputDirectory>
|
||||
|
||||
@@ -17,4 +17,8 @@
|
||||
<module>tas-integration</module>
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
<!-- TAS tests require an old version -->
|
||||
<dependency.org-json.version>20170516</dependency.org-json.version>
|
||||
</properties>
|
||||
</project>
|
||||
10
pom.xml
10
pom.xml
@@ -38,7 +38,6 @@
|
||||
<dependency.alfresco-trashcan-cleaner.version>2.3</dependency.alfresco-trashcan-cleaner.version>
|
||||
<dependency.alfresco-jlan.version>7.1</dependency.alfresco-jlan.version>
|
||||
<dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
|
||||
<dependency.alfresco-api-explorer.version>7.0.0-A1</dependency.alfresco-api-explorer.version>
|
||||
<dependency.alfresco-messaging-repo.version>1.2.15</dependency.alfresco-messaging-repo.version>
|
||||
<dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
|
||||
<dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
|
||||
@@ -56,6 +55,7 @@
|
||||
<dependency.webscripts.version>8.5</dependency.webscripts.version>
|
||||
<dependency.bouncycastle.version>1.66</dependency.bouncycastle.version>
|
||||
<dependency.mockito-core.version>3.4.4</dependency.mockito-core.version>
|
||||
<dependency.org-json.version>20090211</dependency.org-json.version>
|
||||
|
||||
<alfresco.googledrive.version>3.2.0</alfresco.googledrive.version>
|
||||
<alfresco.aos-module.version>1.3.1</alfresco.aos-module.version>
|
||||
@@ -319,7 +319,7 @@
|
||||
<dependency>
|
||||
<groupId>org.json</groupId>
|
||||
<artifactId>json</artifactId>
|
||||
<version>20090211</version>
|
||||
<version>${dependency.org-json.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
@@ -495,12 +495,6 @@
|
||||
<version>${alfresco.googledrive.version}</version>
|
||||
<type>amp</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco.integrations</groupId>
|
||||
<artifactId>alfresco-googledrive-share-community</artifactId>
|
||||
<version>${alfresco.googledrive.version}</version>
|
||||
<type>amp</type>
|
||||
</dependency>
|
||||
<!-- Enforce newer version -->
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
|
||||
Reference in New Issue
Block a user