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

Fix TAS test by using old version of org.json in tests

Browse Source
This commit is contained in:
Alan Davis
2020-07-24 23:12:15 +01:00
parent 798468f306
commit dcf2683675
4 changed files with 996 additions and 1060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitattributes vendored
View File

@@ -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

636
packaging/docker-alfresco/pom.xml
View File

@@ -1,344 +1,292 @@
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-community-repo-docker</artifactId> <artifactId>alfresco-community-repo-docker</artifactId>
<name>Alfresco Community Repo Docker Base Builder</name> <name>Alfresco Community Repo Docker Base Builder</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId> <artifactId>alfresco-community-repo-packaging</artifactId>
<version>8.300-SNAPSHOT</version> <version>8.300-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<image.name>alfresco/alfresco-community-repo-base</image.name> <image.name>alfresco/alfresco-community-repo-base</image.name>
<image.registry>quay.io</image.registry> <image.registry>quay.io</image.registry>
</properties> </properties>
<dependencies> <build>
<dependency> <plugins>
<groupId>org.alfresco</groupId> <plugin>
<artifactId>content-services-community</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>${project.version}</version> <artifactId>maven-resources-plugin</artifactId>
<type>war</type> <version>3.1.0</version>
</dependency> <executions>
<dependency> <execution>
<groupId>org.alfresco</groupId> <id>copy-licenses</id>
<artifactId>alfresco-server-root</artifactId> <phase>process-resources</phase>
<version>${dependency.alfresco-server-root.version}</version> <goals>
<type>war</type> <goal>copy-resources</goal>
</dependency> </goals>
<dependency> <configuration>
<groupId>org.postgresql</groupId> <resources>
<artifactId>postgresql</artifactId> <resource>
</dependency> <!-- Extract licenses directory -->
<dependency> <directory>../distribution/src/main/resources/licenses</directory>
<groupId>org.alfresco</groupId> <filtering>false</filtering>
<artifactId>alfresco-mmt</artifactId> </resource>
<version>${dependency.alfresco-mmt.version}</version> </resources>
</dependency> <outputDirectory>${project.build.directory}/licenses</outputDirectory>
<dependency> </configuration>
<groupId>org.alfresco.aos-module</groupId> </execution>
<artifactId>alfresco-aos-module</artifactId> </executions>
<version>${alfresco.aos-module.version}</version> </plugin>
<type>amp</type> <plugin>
<exclusions> <groupId>org.apache.maven.plugins</groupId>
<exclusion> <artifactId>maven-dependency-plugin</artifactId>
<groupId>org.alfresco.aos-module</groupId> <version>3.1.2</version>
<artifactId>alfresco-aos-repo-binding</artifactId> <executions>
</exclusion> <execution>
</exclusions> <id>unpack-war-files</id>
</dependency> <phase>process-resources</phase>
<dependency> <goals>
<groupId>org.alfresco.aos-module</groupId> <goal>unpack</goal>
<artifactId>alfresco-vti-bin</artifactId> </goals>
<version>${alfresco.aos-module.version}</version> <configuration>
<type>war</type> <artifactItems>
</dependency> <artifactItem>
<dependency> <groupId>org.alfresco</groupId>
<groupId>org.alfresco.integrations</groupId> <artifactId>content-services-community</artifactId>
<artifactId>alfresco-googledrive-repo-community</artifactId> <version>${project.version}</version>
<version>${alfresco.googledrive.version}</version> <type>war</type>
<type>amp</type> <overWrite>false</overWrite>
</dependency> <outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>
</dependencies> </artifactItem>
<artifactItem>
<build> <groupId>org.alfresco</groupId>
<plugins> <artifactId>alfresco-server-root</artifactId>
<plugin> <version>${dependency.alfresco-server-root.version}</version>
<groupId>org.apache.maven.plugins</groupId> <type>war</type>
<artifactId>maven-resources-plugin</artifactId> <outputDirectory>${project.build.directory}/war/ROOT</outputDirectory>
<version>3.1.0</version> </artifactItem>
<executions> <artifactItem>
<execution> <groupId>org.alfresco.aos-module</groupId>
<id>copy-licenses</id> <artifactId>alfresco-vti-bin</artifactId>
<phase>process-resources</phase> <type>war</type>
<goals> <outputDirectory>${project.build.directory}/war/_vti_bin</outputDirectory>
<goal>copy-resources</goal> </artifactItem>
</goals> </artifactItems>
<configuration> </configuration>
<resources> </execution>
<resource> <execution>
<!-- Extract licenses directory --> <id>copy-jdbc-connectors</id>
<directory>../distribution/src/main/resources/licenses</directory> <phase>process-resources</phase>
<filtering>false</filtering> <goals>
</resource> <goal>copy</goal>
</resources> </goals>
<outputDirectory>${project.build.directory}/licenses</outputDirectory> <configuration>
</configuration> <artifactItems>
</execution> <artifactItem>
</executions> <groupId>org.postgresql</groupId>
</plugin> <artifactId>postgresql</artifactId>
<plugin> <type>jar</type>
<groupId>org.apache.maven.plugins</groupId> <overWrite>false</overWrite>
<artifactId>maven-dependency-plugin</artifactId> <outputDirectory>${project.build.directory}/connector</outputDirectory>
<version>3.1.2</version> </artifactItem>
<executions> <artifactItem>
<execution> <groupId>org.alfresco</groupId>
<id>unpack-war-files</id> <artifactId>alfresco-mmt</artifactId>
<phase>process-resources</phase> <type>jar</type>
<goals> <overWrite>false</overWrite>
<goal>unpack</goal> <outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory>
</goals> </artifactItem>
<configuration> </artifactItems>
<artifactItems> </configuration>
<artifactItem> </execution>
<groupId>org.alfresco</groupId>
<artifactId>content-services-community</artifactId> <execution>
<version>${project.version}</version> <id>copy-amps</id>
<type>war</type> <phase>process-resources</phase>
<overWrite>false</overWrite> <goals>
<outputDirectory>${project.build.directory}/war/alfresco</outputDirectory> <goal>copy</goal>
</artifactItem> </goals>
<artifactItem> <configuration>
<groupId>org.alfresco</groupId> <artifactItems>
<artifactId>alfresco-server-root</artifactId> <artifactItem>
<version>${dependency.alfresco-server-root.version}</version> <groupId>org.alfresco.aos-module</groupId>
<type>war</type> <artifactId>alfresco-aos-module</artifactId>
<outputDirectory>${project.build.directory}/war/ROOT</outputDirectory> <type>amp</type>
</artifactItem> <overWrite>false</overWrite>
<artifactItem> <outputDirectory>${project.build.directory}/amps</outputDirectory>
<groupId>org.alfresco.aos-module</groupId> </artifactItem>
<artifactId>alfresco-vti-bin</artifactId> <artifactItem>
<version>${alfresco.aos-module.version}</version> <groupId>org.alfresco.integrations</groupId>
<type>war</type> <artifactId>alfresco-googledrive-repo-community</artifactId>
<outputDirectory>${project.build.directory}/war/_vti_bin</outputDirectory> <type>amp</type>
</artifactItem> <overWrite>false</overWrite>
</artifactItems> <outputDirectory>${project.build.directory}/amps</outputDirectory>
</configuration> </artifactItem>
</execution> </artifactItems>
<execution> </configuration>
<id>copy-jdbc-connectors</id> </execution>
<phase>process-resources</phase> </executions>
<goals> </plugin>
<goal>copy</goal>
</goals> <plugin>
<configuration> <groupId>io.fabric8</groupId>
<artifactItems> <artifactId>fabric8-maven-plugin</artifactId>
<artifactItem> <version>${dependency.fabric8.version}</version>
<groupId>org.postgresql</groupId> <configuration>
<artifactId>postgresql</artifactId> <images>
<type>jar</type> <image>
<overWrite>false</overWrite> <name>${image.name}</name>
<outputDirectory>${project.build.directory}/connector</outputDirectory> <build>
</artifactItem> <dockerFileDir>${project.basedir}/</dockerFileDir>
<artifactItem> </build>
<groupId>org.alfresco</groupId> </image>
<artifactId>alfresco-mmt</artifactId> </images>
<version>${dependency.alfresco-mmt.version}</version> </configuration>
<type>jar</type> </plugin>
<overWrite>false</overWrite> </plugins>
<outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory> </build>
</artifactItem>
</artifactItems> <profiles>
</configuration> <profile>
</execution> <id>communityDocker</id>
<build>
<execution> <plugins>
<id>copy-amps</id> <plugin>
<phase>process-resources</phase> <groupId>io.fabric8</groupId>
<goals> <artifactId>fabric8-maven-plugin</artifactId>
<goal>copy</goal> <version>${dependency.fabric8.version}</version>
</goals> <executions>
<configuration> <execution>
<artifactItems> <id>build-image</id>
<artifactItem> <phase>install</phase>
<groupId>org.alfresco.aos-module</groupId> <goals>
<artifactId>alfresco-aos-module</artifactId> <goal>build</goal>
<version>${alfresco.aos-module.version}</version> </goals>
<type>amp</type> </execution>
<overWrite>false</overWrite> </executions>
<outputDirectory>${project.build.directory}/amps</outputDirectory> </plugin>
</artifactItem> </plugins>
<artifactItem> </build>
<groupId>org.alfresco.integrations</groupId> </profile>
<artifactId>alfresco-googledrive-repo-community</artifactId>
<version>${alfresco.googledrive.version}</version> <profile>
<type>amp</type> <id>internal</id>
<overWrite>false</overWrite> <build>
<outputDirectory>${project.build.directory}/amps</outputDirectory> <plugins>
</artifactItem> <plugin>
</artifactItems> <groupId>io.fabric8</groupId>
</configuration> <artifactId>fabric8-maven-plugin</artifactId>
</execution> <version>${dependency.fabric8.version}</version>
</executions> <configuration>
</plugin> <images>
<image>
<plugin> <name>${image.name}:${image.tag}</name>
<groupId>io.fabric8</groupId> <registry>${image.registry}</registry>
<artifactId>fabric8-maven-plugin</artifactId> <build>
<version>${dependency.fabric8.version}</version> <dockerFileDir>${project.basedir}/</dockerFileDir>
<configuration> </build>
<images> </image>
<image> </images>
<name>${image.name}</name> </configuration>
<build> <executions>
<dockerFileDir>${project.basedir}/</dockerFileDir> <execution>
</build> <id>build-push-image</id>
</image> <phase>install</phase>
</images> <goals>
</configuration> <goal>build</goal>
</plugin> <goal>push</goal>
</plugins> </goals>
</build> </execution>
</executions>
<profiles> </plugin>
<profile> </plugins>
<id>communityDocker</id> </build>
<build> </profile>
<plugins>
<plugin> <profile>
<groupId>io.fabric8</groupId> <id>master</id>
<artifactId>fabric8-maven-plugin</artifactId> <build>
<version>${dependency.fabric8.version}</version> <plugins>
<executions> <plugin>
<execution> <groupId>io.fabric8</groupId>
<id>build-image</id> <artifactId>fabric8-maven-plugin</artifactId>
<phase>install</phase> <version>${dependency.fabric8.version}</version>
<goals> <configuration>
<goal>build</goal> <images>
</goals> <image>
</execution> <name>${image.name}</name>
</executions> <registry>${image.registry}</registry>
</plugin> <build>
</plugins> <dockerFileDir>${project.basedir}/</dockerFileDir>
</build> </build>
</profile> </image>
<image>
<profile> <name>${image.name}</name>
<id>internal</id> <build>
<build> <dockerFileDir>${project.basedir}/</dockerFileDir>
<plugins> </build>
<plugin> </image>
<groupId>io.fabric8</groupId> </images>
<artifactId>fabric8-maven-plugin</artifactId> </configuration>
<version>${dependency.fabric8.version}</version> <executions>
<configuration> <execution>
<images> <id>build-push-image</id>
<image> <phase>install</phase>
<name>${image.name}:${image.tag}</name> <goals>
<registry>${image.registry}</registry> <goal>build</goal>
<build> <goal>push</goal>
<dockerFileDir>${project.basedir}/</dockerFileDir> </goals>
</build> </execution>
</image> </executions>
</images> </plugin>
</configuration> </plugins>
<executions> </build>
<execution> </profile>
<id>build-push-image</id>
<phase>install</phase> <profile>
<goals> <id>release</id>
<goal>build</goal> <build>
<goal>push</goal> <plugins>
</goals> <plugin>
</execution> <groupId>io.fabric8</groupId>
</executions> <artifactId>fabric8-maven-plugin</artifactId>
</plugin> <version>${dependency.fabric8.version}</version>
</plugins> <configuration>
</build> <images>
</profile> <image>
<alias>quay.io</alias>
<profile> <name>${image.name}:${project.version}</name>
<id>master</id> <registry>${image.registry}</registry>
<build> <build>
<plugins> <dockerFileDir>${project.basedir}/</dockerFileDir>
<plugin> </build>
<groupId>io.fabric8</groupId> </image>
<artifactId>fabric8-maven-plugin</artifactId> <image>
<version>${dependency.fabric8.version}</version> <alias>dockerhub</alias>
<configuration> <name>${image.name}:${project.version}</name>
<images> <build>
<image> <dockerFileDir>${project.basedir}/</dockerFileDir>
<name>${image.name}</name> </build>
<registry>${image.registry}</registry> </image>
<build> </images>
<dockerFileDir>${project.basedir}/</dockerFileDir> </configuration>
</build> <executions>
</image> <execution>
<image> <id>build-push-image</id>
<name>${image.name}</name> <phase>deploy</phase>
<build> <goals>
<dockerFileDir>${project.basedir}/</dockerFileDir> <goal>build</goal>
</build> <goal>push</goal>
</image> </goals>
</images> </execution>
</configuration> </executions>
<executions> </plugin>
<execution> </plugins>
<id>build-push-image</id> </build>
<phase>install</phase> </profile>
<goals> </profiles>
<goal>build</goal> </project>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<configuration>
<images>
<image>
<alias>quay.io</alias>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<alias>dockerhub</alias>
<name>${image.name}:${project.version}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>deploy</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

42
packaging/tests/pom.xml
View File

@@ -1,20 +1,24 @@
<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"> <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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-community-repo-tests</artifactId> <artifactId>alfresco-community-repo-tests</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId> <artifactId>alfresco-community-repo-packaging</artifactId>
<version>8.300-SNAPSHOT</version> <version>8.300-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
<module>tas-restapi</module> <module>tas-restapi</module>
<module>tas-cmis</module> <module>tas-cmis</module>
<module>tas-email</module> <module>tas-email</module>
<module>tas-webdav</module> <module>tas-webdav</module>
<module>tas-integration</module> <module>tas-integration</module>
</modules> </modules>
<properties>
<!-- TAS tests require an old version -->
<dependency.org-json.version>20170516</dependency.org-json.version>
</properties>
</project> </project>

1368
pom.xml
View File

File diff suppressed because it is too large Load Diff