Bug 509981 - [SysML 1.4] web generation do not take into account the
rcptt images
-new version compatible with site generation
-new component version
Change-Id: I4ec9de828e9d5d79940f966fd47871138e651600
Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/pom.xml
index c83ee4f..be99ae4 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.papyrus.components</groupId>
<artifactId>org.eclipse.papyrus.components.parent</artifactId>
- <version>0.0.22-SNAPSHOT</version>
+ <version>0.0.22</version>
</parent>
<artifactId>org.eclipse.papyrus.components.archetype</artifactId>
<packaging>jar</packaging>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/test/resources/projects/mytestproject/references/org.eclipse.mytestcategory.mytestproject/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/test/resources/projects/mytestproject/references/org.eclipse.mytestcategory.mytestproject/pom.xml
index 665c84d..a208d19 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/test/resources/projects/mytestproject/references/org.eclipse.mytestcategory.mytestproject/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/test/resources/projects/mytestproject/references/org.eclipse.mytestcategory.mytestproject/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.papyrus.components</groupId>
<artifactId>org.eclipse.papyrus.components.parent</artifactId>
- <version>0.0.22-SNAPSHOT</version>
+ <version>0.0.22</version>
</parent>
<groupId>org.eclipse.papyrus</groupId>
diff --git a/components/org.eclipse.papyrus.components.parent/pom.xml b/components/org.eclipse.papyrus.components.parent/pom.xml
index 39a3c67..13ec2dd 100644
--- a/components/org.eclipse.papyrus.components.parent/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.papyrus.components</groupId>
<artifactId>org.eclipse.papyrus.components.parent</artifactId>
- <version>0.0.22-SNAPSHOT</version>
+ <version>0.0.22</version>
<packaging>pom</packaging>
<name>Papyrus Shared Components Descriptor</name>
<description>This pom is the main parent pom for all Papyrus Components. It gather all shared configuration and properties, ensuring all components benefit from any evolution.</description>
@@ -100,7 +100,7 @@
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.jacoco.reportPath>${session.executionRootDirectory}/target/jacoco.exec</sonar.jacoco.reportPath>
<jacoco-version>0.7.4.201502262128</jacoco-version>
- <siteMainDirectory>${user.home}/staging</siteMainDirectory>
+ <siteMainDirectory>${WORKSPACE}/staging</siteMainDirectory>
<!-- Eclipse properties -->
@@ -784,11 +784,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <inherited>false</inherited>
+ <inherited>true</inherited>
<executions>
<execution>
<id>copy-resources</id>
- <phase>pre-site</phase>
+ <phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -982,6 +982,29 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>src/site/resources/images/rcptt-screenshots/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${WORKSPACE}/rcptt-screenshots/</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- Failed on hudson see https://bugs.eclipse.org/bugs/show_bug.cgi?id=473888 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1395,7 +1418,7 @@
</property>
</activation>
<properties>
- <WORKSPACE>${user.home}</WORKSPACE>
+ <WORKSPACE>${user.home}/workspace</WORKSPACE>
</properties>
</profile>
