Unverified Commit 154bbc70 authored by clmntsl's avatar clmntsl Committed by GitHub
Browse files

Merge branch 'develop' into story_8787_allow_snapshot_packaging

parents 3bd9c339 0c118b3f
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="2 - Security-Internal" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="spring-boot:run" />
<option value="-DskipTests" />
<option value="-DskipAllFrontendTests" />
<option value="-Pvitam" />
</list>
</option>
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$/api/api-security/security-internal" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
</configuration>
<configuration default="false" name="2 - Security-Internal" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings"/>
<option name="myRunnerSettings"/>
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set/>
</option>
<option name="goals">
<list>
<option value="spring-boot:run"/>
<option value="-Pdev"/>
</list>
</option>
<option name="pomFileName"/>
<option name="profilesMap">
<map/>
</option>
<option name="resolveToWorkspace" value="false"/>
<option name="workingDirPath" value="$PROJECT_DIR$/api/api-security/security-internal"/>
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2"/>
</configuration>
</component>
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="3 - IAM-Internal" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="spring-boot:run" />
<option value="-DskipTests" />
<option value="-DskipAllFrontendTests" />
<option value="-Pvitam" />
</list>
</option>
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$/api/api-iam/iam-internal" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
</configuration>
<configuration default="false" name="3 - IAM-Internal" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings"/>
<option name="myRunnerSettings"/>
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set/>
</option>
<option name="goals">
<list>
<option value="spring-boot:run"/>
<option value="-Pdev"/>
</list>
</option>
<option name="pomFileName"/>
<option name="profilesMap">
<map/>
</option>
<option name="resolveToWorkspace" value="false"/>
<option name="workingDirPath" value="$PROJECT_DIR$/api/api-iam/iam-internal"/>
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2"/>
</configuration>
</component>
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="4 - IAM-External" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="spring-boot:run" />
<option value="-DskipTests" />
<option value="-DskipAllFrontendTests" />
<option value="-Pvitam" />
</list>
</option>
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$/api/api-iam/iam-external" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
</configuration>
<configuration default="false" name="4 - IAM-External" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings"/>
<option name="myRunnerSettings"/>
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set/>
</option>
<option name="goals">
<list>
<option value="spring-boot:run"/>
<option value="-Pdev"/>
</list>
</option>
<option name="pomFileName"/>
<option name="profilesMap">
<map/>
</option>
<option name="resolveToWorkspace" value="false"/>
<option name="workingDirPath" value="$PROJECT_DIR$/api/api-iam/iam-external"/>
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2"/>
</configuration>
</component>
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="6 - UI-Portal back" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="spring-boot:run" />
<option value="-DskipTests" />
<option value="-DskipAllFrontendTests" />
<option value="-Pvitam" />
<option value="-Pvitam" />
<option value="-DskipTests" />
</list>
</option>
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$/ui/ui-portal" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
</configuration>
<configuration default="false" name="6 - UI-Portal back" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings"/>
<option name="myRunnerSettings"/>
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set/>
</option>
<option name="goals">
<list>
<option value="spring-boot:run"/>
<option value="-Pdev"/>
</list>
</option>
<option name="pomFileName"/>
<option name="profilesMap">
<map/>
</option>
<option name="resolveToWorkspace" value="false"/>
<option name="workingDirPath" value="$PROJECT_DIR$/ui/ui-portal"/>
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2"/>
</configuration>
</component>
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="7 - UI-Identity back" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings" />
<option name="myRunnerSettings" />
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set />
</option>
<option name="goals">
<list>
<option value="clean" />
<option value="spring-boot:run" />
<option value="-DskipTests" />
<option value="-DskipAllFrontendTests" />
<option value="-Pvitam" />
</list>
</option>
<option name="pomFileName" />
<option name="profilesMap">
<map />
</option>
<option name="resolveToWorkspace" value="false" />
<option name="workingDirPath" value="$PROJECT_DIR$/ui/ui-identity" />
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2" />
</configuration>
<configuration default="false" name="7 - UI-Identity back" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
<option name="myGeneralSettings"/>
<option name="myRunnerSettings"/>
<option name="myRunnerParameters">
<MavenRunnerParameters>
<option name="profiles">
<set/>
</option>
<option name="goals">
<list>
<option value="spring-boot:run"/>
<option value="-Pdev"/>
</list>
</option>
<option name="pomFileName"/>
<option name="profilesMap">
<map/>
</option>
<option name="resolveToWorkspace" value="false"/>
<option name="workingDirPath" value="$PROJECT_DIR$/ui/ui-identity"/>
</MavenRunnerParameters>
</option>
</MavenSettings>
<method v="2"/>
</configuration>
</component>
......@@ -204,11 +204,6 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.archive.internal.server.ApiArchiveInternalServerApplication</mainClass>
<jvmArguments>
-Xmx512m -Dvitam.config.folder=${basedir}/src/main/config/dev-vitam
</jvmArguments>
<jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
......
......@@ -212,11 +212,7 @@
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.ingest.external.server.ApiIngestExternalServerApplication</mainClass>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
<argument>
--spring.config.additional-location=file:${basedir}/src/main/config/ingest-external-application-dev.yml
</argument>
<argument>--spring.profiles.active=dev</argument>
</arguments>
</configuration>
</plugin>
......
......@@ -244,9 +244,7 @@
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
<argument>
--spring.config.additional-location=file:${basedir}/src/main/config/ingest-internal-application-dev.yml
</argument>
<argument>--spring.profiles.active=dev</argument>
</arguments>
</configuration>
</plugin>
......
......@@ -200,90 +200,4 @@
</plugins>
</build>
<profiles>
<profile>
<id>rpm</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>rpm-package-admin</id>
<phase>install</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>make</executable>
<workingDirectory>target</workingDirectory>
<skip>${rpm.skip}</skip>
<arguments>
<argument>-f</argument>
<argument>${maven.multiModuleProjectDirectory}/tools/packaging/Makefile
</argument>
<argument>rpm</argument>
<argument>NAME=${project.artifactId}-admin</argument>
<argument>VERSION=${project.version}</argument>
<argument>JAR_FILE=${rpm.jar-file}</argument>
<argument>USER=vitamui</argument>
<!--
If you want to changes default dependencies (only systemd), define them as a
comma separated list of packages
-->
<argument>DEPENDENCIES=systemd,java-11-openjdk</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>deb</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>deb-package-admin</id>
<phase>install</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>make</executable>
<workingDirectory>target</workingDirectory>
<skip>${rpm.skip}</skip>
<arguments>
<argument>-f</argument>
<argument>${maven.multiModuleProjectDirectory}/tools/packaging/Makefile
</argument>
<argument>deb</argument>
<argument>NAME=${project.artifactId}-admin</argument>
<argument>VERSION=${project.version}</argument>
<argument>JAR_FILE=${rpm.jar-file}</argument>
<argument>USER=vitamui</argument>
<!--
If you want to changes default dependencies (only systemd), define them as a
comma separated list of packages
-->
<argument>DEPENDENCIES=systemd,openjdk-11-jdk</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
......@@ -189,91 +189,4 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>rpm</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>rpm-package-admin</id>
<phase>install</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>make</executable>
<workingDirectory>target</workingDirectory>
<skip>${rpm.skip}</skip>
<arguments>
<argument>-f</argument>
<argument>${maven.multiModuleProjectDirectory}/tools/packaging/Makefile
</argument>
<argument>rpm</argument>
<argument>NAME=${project.artifactId}-admin</argument>
<argument>VERSION=${project.version}</argument>
<argument>JAR_FILE=${rpm.jar-file}</argument>
<argument>USER=vitamui</argument>
<!--
If you want to changes default dependencies (only systemd), define them as a
comma separated list of packages
-->
<argument>DEPENDENCIES=systemd,java-11-openjdk</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>deb</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>deb-package-admin</id>
<phase>install</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>make</executable>
<workingDirectory>target</workingDirectory>
<skip>${rpm.skip}</skip>
<arguments>
<argument>-f</argument>
<argument>${maven.multiModuleProjectDirectory}/tools/packaging/Makefile
</argument>
<argument>deb</argument>
<argument>NAME=${project.artifactId}-admin</argument>
<argument>VERSION=${project.version}</argument>
<argument>JAR_FILE=${rpm.jar-file}</argument>
<argument>USER=vitamui</argument>
<!--
If you want to changes default dependencies (only systemd), define them as a
comma separated list of packages
-->
<argument>DEPENDENCIES=systemd,openjdk-11-jdk</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
......@@ -199,74 +199,6 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${maven.frontend.plugin.version}</version>
<configuration>
<workingDirectory>${maven.multiModuleProjectDirectory}/ui/ui-frontend</workingDirectory>
<installDirectory>${maven.multiModuleProjectDirectory}/ui/ui-frontend</installDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>initialize</phase>
<configuration>
<skip>${skipAllFrontend}</skip>
<nodeVersion>${node.version}</nodeVersion>
<npmVersion>${npm.version}</npmVersion>
</configuration>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<skip>${skipAllFrontend}</skip>
<arguments>install --legacy-peer-deps --loglevel warn</arguments>
</configuration>
</execution>
<!-- copy scss from vitamui-library to other projects -->
<execution>
<id>copy scss</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<skip>${skipAllFrontend}</skip>
<arguments>run copy-scss:vitamui-library</arguments>
</configuration>
</execution>
<execution>
<id>npm run build</id>
<goals>
<goal>npm</goal>
</goals>
<phase>process-sources</phase>
<configuration>
<skip>${skipAllFrontend}</skip>
<arguments>run ng-high-memory build -- --project=referential --prod
--output-path=${project.basedir}/target/www --base-href=${angular.base.href}
--deploy-url=${angular.base.href}
</arguments>
</configuration>
</execution>
<execution>
<id>npm test</id>
<phase>test</phase>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<arguments>run test:conf-ci -- --project=referential</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment