temporary solution

This commit is contained in:
Rodica Sutu
2018-06-25 13:50:58 +03:00
parent 3bbff09d83
commit a0663b2cf8
2 changed files with 151 additions and 152 deletions

43
pom.xml
View File

@@ -175,6 +175,49 @@
</build>
</profile>
<!--
The following 2 profiles adds the /properties directories as resource directories in the project.
This means we can filter the property files in these directories.
The presence of this /properties directory also activates these profiles.
-->
<profile>
<id>enable-test-properties-filtering</id>
<activation>
<file>
<!-- No properties allowed here. Only hardcoded values are properly interpreted -->
<exists>src/test/properties</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${maven.buildhelper.version}</version>
<executions>
<execution>
<id>add-env-test-properties</id>
<phase>generate-resources</phase>
<goals>
<goal>add-test-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${app.properties.test.folder}</directory>
<includes>
<include>${app.properties.test.include}</include>
</includes>
<filtering>${app.filtering.enabled}</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!--Docker profiles-->
<!-- Profile used only to build docker images-->
<profile>

View File

@@ -481,158 +481,6 @@
<profiles>
<!--
Enables AMP specific processing when a module.properties file is found.
The following files will be filtered and copied to the test-classpath
so they can be picked up by tests and tomcat embedded:
module.properties file for the AMP
/config directory content for the AMP
-->
<profile>
<id>enable-amp</id>
<activation>
<file>
<exists>src/main/amp/module.properties</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<!-- Copies module properties to the test classpath in the right location,
so that it can be picked up by tests and tomcat embedded -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>add-module-properties-to-test-classpath</id>
<phase>process-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${app.amp.folder}</directory>
<includes>
<include>module.properties</include>
</includes>
<filtering>${app.filtering.enabled}</filtering>
<targetPath>alfresco/module/${project.artifactId}</targetPath>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>add-module-config-to-test-classpath</id>
<phase>process-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${app.amp.folder}/config</directory>
<includes>
<include>**/*</include>
</includes>
<filtering>${app.filtering.enabled}</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!--
The following 2 profiles adds the /properties directories as resource directories in the project.
This means we can filter the property files in these directories.
The presence of this /properties directory also activates these profiles.
-->
<profile>
<id>enable-properties-filtering</id>
<activation>
<file>
<!-- No properties allowed here. Only hardcoded values are properly interpreted -->
<exists>src/main/properties</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${maven.buildhelper.version}</version>
<executions>
<execution>
<id>add-env-properties</id>
<phase>generate-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${app.properties.folder}</directory>
<includes>
<include>${app.properties.include}</include>
</includes>
<filtering>${app.filtering.enabled}</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>enable-test-properties-filtering</id>
<activation>
<file>
<!-- No properties allowed here. Only hardcoded values are properly interpreted -->
<exists>src/test/properties</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${maven.buildhelper.version}</version>
<executions>
<execution>
<id>add-env-test-properties</id>
<phase>generate-resources</phase>
<goals>
<goal>add-test-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${app.properties.test.folder}</directory>
<includes>
<include>${app.properties.test.include}</include>
</includes>
<filtering>${app.filtering.enabled}</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>use-mysql</id>
<properties>
@@ -808,6 +656,114 @@
</plugin>
</plugins>
</build>
</profile>
<!--
Enables AMP specific processing when a module.properties file is found.
The following files will be filtered and copied to the test-classpath
so they can be picked up by tests and tomcat embedded:
module.properties file for the AMP
/config directory content for the AMP
-->
<profile>
<id>enable-amp</id>
<activation>
<file>
<exists>src/main/amp/module.properties</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<!-- Copies module properties to the test classpath in the right location,
so that it can be picked up by tests and tomcat embedded -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>add-module-properties-to-test-classpath</id>
<phase>process-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${app.amp.folder}</directory>
<includes>
<include>module.properties</include>
</includes>
<filtering>${app.filtering.enabled}</filtering>
<targetPath>alfresco/module/${project.artifactId}</targetPath>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>add-module-config-to-test-classpath</id>
<phase>process-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${app.amp.folder}/config</directory>
<includes>
<include>**/*</include>
</includes>
<filtering>${app.filtering.enabled}</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>enable-properties-filtering</id>
<activation>
<file>
<!-- No properties allowed here. Only hardcoded values are properly interpreted -->
<exists>src/main/properties</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${maven.buildhelper.version}</version>
<executions>
<execution>
<id>add-env-properties</id>
<phase>generate-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${app.properties.folder}</directory>
<includes>
<include>${app.properties.include}</include>
</includes>
<filtering>${app.filtering.enabled}</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!--Docker profiles used to build specific docker images for community repo, defined in parent pom -->
<profile>