Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2018-10-08 04:28:10 -0400
committerVincent Lorenzo2018-10-08 04:40:48 -0400
commit27b26398ac676209dc3020447a16ad44251cf4a2 (patch)
treeccff95ad8b5d6e69418f7ec7afc38cc98eb305c1
parent7b75b9f254d797a581765d5e6fdaab4ae0b1ad44 (diff)
downloadorg.eclipse.papyrus-27b26398ac676209dc3020447a16ad44251cf4a2.tar.gz
org.eclipse.papyrus-27b26398ac676209dc3020447a16ad44251cf4a2.tar.xz
org.eclipse.papyrus-27b26398ac676209dc3020447a16ad44251cf4a2.zip
Fix pom in releng folder : add full schema for project node + format all pom files
Change-Id: I1e9d72a14db01e0962d83438c97973c97cb3674c Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
-rw-r--r--releng/main-tests/pom.xml97
-rw-r--r--releng/main-tests/targetPlatform/eclipse/pom.xml6
-rw-r--r--releng/main-tests/targetPlatform/pom.xml10
-rw-r--r--releng/main-tests/targetPlatform/portable/pom.xml6
-rwxr-xr-xreleng/main/pom.xml104
-rw-r--r--releng/main/site/pom.xml5
-rw-r--r--releng/main/targetPlatform/eclipse/pom.xml6
-rw-r--r--releng/main/targetPlatform/pom.xml10
-rw-r--r--releng/main/targetPlatform/portable/pom.xml6
-rw-r--r--releng/pom.xml97
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml9
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml11
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/pom.xml9
-rw-r--r--releng/rcp/pom.xml34
-rw-r--r--releng/rcp/targetPlatform/eclipse/pom.xml3
-rw-r--r--releng/rcp/targetPlatform/pom.xml3
-rw-r--r--releng/rcp/targetPlatform/portable/pom.xml3
-rwxr-xr-xreleng/toolsmiths/pom.xml82
-rw-r--r--releng/toolsmiths/site/pom.xml19
-rw-r--r--releng/toolsmiths/targetPlatform/eclipse/pom.xml6
-rw-r--r--releng/toolsmiths/targetPlatform/pom.xml8
-rw-r--r--releng/toolsmiths/targetPlatform/portable/pom.xml6
22 files changed, 290 insertions, 250 deletions
diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml
index 0961c03ccca..7b63549afcb 100644
--- a/releng/main-tests/pom.xml
+++ b/releng/main-tests/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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>
<parent>
<groupId>org.eclipse.papyrus</groupId>
<artifactId>org.eclipse.papyrus.all.releng</artifactId>
@@ -11,24 +12,25 @@
<artifactId>org.eclipse.papyrus.tests.releng</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<properties>
<testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig -->
<testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass>
<jacoco.version>0.7.9</jacoco.version>
- <!-- Separate property for test argLine seems to be required when running Jacoco + Surefire -->
+ <!-- Separate property for test argLine seems to be required when running
+ Jacoco + Surefire -->
<test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine>
<target.platform>org.eclipse.papyrus.main.tests.${target.suffix}.target</target.platform>
</properties>
-
+
<modules>
- <!-- Features -->
+ <!-- Features -->
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.emf.expressions.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature</module>
+ <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.decoratormodel.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature</module>
@@ -40,13 +42,13 @@
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.uml.textedit.tests.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.uml.alf.tests.feature</module>
<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature</module>
-
+
<!-- Plugins -->
<module>../../tests/junit/plugins</module>
-
+
<module>targetPlatform</module>
</modules>
-
+
<build>
<pluginManagement>
<plugins>
@@ -57,13 +59,13 @@
</plugin>
</plugins>
</pluginManagement>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
-
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
@@ -80,23 +82,24 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <failIfNoTests>false</failIfNoTests>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <testFailureIgnore>true</testFailureIgnore>
- <!-- ${tycho.testArgLine} is populated by JaCoCo and is required to enable code coverage -->
- <argLine>${tycho.testArgLine} ${test.argLine}</argLine>
- <appArgLine>-testConfig=${testConfig}</appArgLine>
- <product>org.eclipse.sdk.ide</product>
- <skipTests>${skipInnerTests}</skipTests>
- </configuration>
- </plugin>
-
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <testFailureIgnore>true</testFailureIgnore>
+ <!-- ${tycho.testArgLine} is populated by JaCoCo and is required to
+ enable code coverage -->
+ <argLine>${tycho.testArgLine} ${test.argLine}</argLine>
+ <appArgLine>-testConfig=${testConfig}</appArgLine>
+ <product>org.eclipse.sdk.ide</product>
+ <skipTests>${skipInnerTests}</skipTests>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
@@ -126,13 +129,13 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>defaultProfile</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<repositories>
<repository>
<id>papyrus-main</id>
@@ -146,7 +149,7 @@
</repository>
</repositories>
</profile>
-
+
<profile>
<id>mac-tests</id>
<activation>
@@ -155,20 +158,22 @@
</os>
</activation>
<properties>
- <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100 -XstartOnFirstThread</test.argLine>
+ <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100
+ -XstartOnFirstThread</test.argLine>
</properties>
- </profile>
-
+ </profile>
+
<profile>
<id>buildAll</id>
- <activation>
- <property>
- <name>buildAll</name>
- <value>true</value>
- </property>
- </activation>
- <!-- Papyrus Update sites not included (They are included in the same build) -->
-
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <!-- Papyrus Update sites not included (They are included in the same
+ build) -->
+
<build>
<plugins>
<plugin>
diff --git a/releng/main-tests/targetPlatform/eclipse/pom.xml b/releng/main-tests/targetPlatform/eclipse/pom.xml
index 9705f81ba2d..ba9327703dd 100644
--- a/releng/main-tests/targetPlatform/eclipse/pom.xml
+++ b/releng/main-tests/targetPlatform/eclipse/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>
diff --git a/releng/main-tests/targetPlatform/pom.xml b/releng/main-tests/targetPlatform/pom.xml
index c8a3c6e8b27..c434df6b0e2 100644
--- a/releng/main-tests/targetPlatform/pom.xml
+++ b/releng/main-tests/targetPlatform/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>
@@ -11,7 +13,7 @@
<artifactId>org.eclipse.papyrus.main.tests.target.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<profiles>
<profile>
<id>portable</id>
@@ -35,6 +37,6 @@
</modules>
</profile>
</profiles>
-
+
</project>
diff --git a/releng/main-tests/targetPlatform/portable/pom.xml b/releng/main-tests/targetPlatform/portable/pom.xml
index db4873445b5..bf7a091e540 100644
--- a/releng/main-tests/targetPlatform/portable/pom.xml
+++ b/releng/main-tests/targetPlatform/portable/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 4711fe3c359..d6d314ed52f 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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>
<artifactId>org.eclipse.papyrus.releng</artifactId>
<packaging>pom</packaging>
<parent>
@@ -9,7 +10,7 @@
<artifactId>org.eclipse.papyrus.all.releng</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
-
+
<modules>
<module>../../plugins</module>
<module>../../examples</module>
@@ -18,17 +19,17 @@
<module>targetPlatform</module>
<module>site</module>
</modules>
-
+
<properties>
- <mojo.buildhelper.version>3.0.0</mojo.buildhelper.version>
- <mylyn.wikitext.version>3.0.24</mylyn.wikitext.version>
-
+ <mojo.buildhelper.version>3.0.0</mojo.buildhelper.version>
+ <mylyn.wikitext.version>3.0.24</mylyn.wikitext.version>
+
<target.platform>org.eclipse.papyrus.main.${target.suffix}.target</target.platform>
</properties>
-
+
<build>
<pluginManagement>
- <!-- redistributed plugins -->
+ <!-- redistributed plugins -->
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -40,7 +41,7 @@
<artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<version>${mylyn.wikitext.version}</version>
</plugin>
-
+
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
@@ -75,9 +76,9 @@
</plugin>
</plugins>
</pluginManagement>
-
+
<plugins>
- <!-- local plugins -->
+ <!-- local plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -94,7 +95,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
</plugin>
-
+
<!-- Sources -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -151,9 +152,9 @@
<profiles>
<profile>
<id>defaultProfile</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
@@ -176,12 +177,12 @@
<profile>
<id>buildAll</id>
- <activation>
- <property>
- <name>buildAll</name>
- <value>true</value>
- </property>
- </activation>
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -202,16 +203,17 @@
</build>
</profile>
- <!-- nightly profile is useful for developers that want to link to nightly build -->
+ <!-- nightly profile is useful for developers that want to link to nightly
+ build -->
<profile>
<id>nightly</id>
- <activation>
- <property>
- <name>env</name>
- <value>devnightly</value>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
+ <activation>
+ <property>
+ <name>env</name>
+ <value>devnightly</value>
+ </property>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<repositories>
<repository>
<id>papyrus-nightly</id>
@@ -231,17 +233,17 @@
</repository>
</repositories>
</profile>
-
-
+
+
<!-- Stable release profile. Takes +30min. Eclipse servers only -->
<profile>
- <id>packAndSign</id>
- <activation>
- <property>
- <name>SIGN</name>
- <value>true</value>
- </property>
- </activation>
+ <id>packAndSign</id>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>true</value>
+ </property>
+ </activation>
<!-- Pack200 -->
<build>
<plugins>
@@ -304,17 +306,17 @@
</plugins>
</build>
</profile>
-
+
<!-- Nightly profile. Artifacts can be consumed, but are not signed -->
<profile>
- <id>pack</id>
- <activation>
- <property>
- <name>SIGN</name>
- <value>false</value>
- </property>
- </activation>
+ <id>pack</id>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>false</value>
+ </property>
+ </activation>
<build>
<plugins>
<!-- Pack200 -->
@@ -351,11 +353,11 @@
</plugins>
</build>
</profile>
-
-
+
+
<!-- Analysis profile. Takes +1h -->
<profile>
- <id>findBugs</id>
+ <id>findBugs</id>
<build>
<plugins>
<plugin>
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index 5892a9de3db..e5d11095548 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
<parent>
diff --git a/releng/main/targetPlatform/eclipse/pom.xml b/releng/main/targetPlatform/eclipse/pom.xml
index 9c9023ae512..816554eb7ca 100644
--- a/releng/main/targetPlatform/eclipse/pom.xml
+++ b/releng/main/targetPlatform/eclipse/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>
diff --git a/releng/main/targetPlatform/pom.xml b/releng/main/targetPlatform/pom.xml
index 925cec75054..3ab858a97ce 100644
--- a/releng/main/targetPlatform/pom.xml
+++ b/releng/main/targetPlatform/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>
@@ -10,7 +12,7 @@
<artifactId>org.eclipse.papyrus.main.target.parent</artifactId>
<packaging>pom</packaging>
-
+
<profiles>
<profile>
<id>portable</id>
@@ -34,5 +36,5 @@
</modules>
</profile>
</profiles>
-
+
</project>
diff --git a/releng/main/targetPlatform/portable/pom.xml b/releng/main/targetPlatform/portable/pom.xml
index 4fd9a347590..fa2ffec7b17 100644
--- a/releng/main/targetPlatform/portable/pom.xml
+++ b/releng/main/targetPlatform/portable/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>
diff --git a/releng/pom.xml b/releng/pom.xml
index f2a2baed611..8d92935e0d1 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
<groupId>org.eclipse.papyrus</groupId>
@@ -17,18 +18,20 @@
<maven.clean.version>3.0.0</maven.clean.version>
<mojo.execmaven.version>1.6.0</mojo.execmaven.version>
<jboss.utils.version>1.1.0</jboss.utils.version>
- <maven.compiler.version>3.7.0</maven.compiler.version>
-
+ <maven.compiler.version>3.7.0</maven.compiler.version>
+
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</tycho.scmUrl>
<java.source.version>1.8</java.source.version>
<java.target.version>1.8</java.target.version>
<skipAllTests>false</skipAllTests>
<skipInnerTests>true</skipInnerTests>
- <!-- Set buildAll to true when building this pom directly (Rather than individual
- components). This will disable Papyrus Update Sites (Since they are being built by this POM). -->
- <buildAll>false</buildAll>
+ <!-- Set buildAll to true when building this pom directly (Rather than
+ individual components). This will disable Papyrus Update Sites (Since they
+ are being built by this POM). -->
+ <buildAll>false</buildAll>
- <!-- Papyrus repositories. Used when we're building individual components (vs building the parent pom including everything) -->
+ <!-- Papyrus repositories. Used when we're building individual components
+ (vs building the parent pom including everything) -->
<papyrus.eclipse.target>master</papyrus.eclipse.target>
<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main>
<papyrus.repo.toolsmiths>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/toolsmiths</papyrus.repo.toolsmiths>
@@ -62,13 +65,13 @@
<url>https://repository.jboss.org/</url>
</pluginRepository>
</pluginRepositories>
-
+
<repositories>
- <repository>
- <id>license-feature</id>
- <url>http://download.eclipse.org/cbi/updates/license/</url>
- <layout>p2</layout>
- </repository>
+ <repository>
+ <id>license-feature</id>
+ <url>http://download.eclipse.org/cbi/updates/license/</url>
+ <layout>p2</layout>
+ </repository>
</repositories>
<build>
@@ -76,15 +79,15 @@
<pluginManagement>
<!-- redistributed plugin configurations -->
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.version}</version>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -103,27 +106,27 @@
<artifactId>exec-maven-plugin</artifactId>
<version>${mojo.execmaven.version}</version>
</plugin>
-
+
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtext.version}</version>
- <!-- patch to fix a signer issue - https://github.com/eclipse/xtext/issues/1231 -->
+ <!-- patch to fix a signer issue - https://github.com/eclipse/xtext/issues/1231 -->
<dependencies>
<dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
- <version>3.10.0</version>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.equinox.common</artifactId>
+ <version>3.10.0</version>
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.jboss.tools.tycho-plugins</groupId>
- <artifactId>repository-utils</artifactId>
- <version>${jboss.utils.version}</version>
- </plugin>
-
+ <plugin>
+ <groupId>org.jboss.tools.tycho-plugins</groupId>
+ <artifactId>repository-utils</artifactId>
+ <version>${jboss.utils.version}</version>
+ </plugin>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
@@ -135,19 +138,19 @@
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- <optimize>true</optimize>
- <showWarnings>true</showWarnings>
- <!-- Tycho build using the project's JDT settings. -->
- <useProjectSettings>true</useProjectSettings>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ <optimize>true</optimize>
+ <showWarnings>true</showWarnings>
+ <!-- Tycho build using the project's JDT settings. -->
+ <useProjectSettings>true</useProjectSettings>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
@@ -193,7 +196,7 @@
</pluginManagement>
</build>
- <profiles>
+ <profiles>
<profile>
<id>eclipsehippIntegration</id>
<activation>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index 47df953903f..0afa5c0a580 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
-
+
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>4.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
-
+
<artifactId>org.eclipse.papyrus.rcp.feature</artifactId>
<packaging>eclipse-feature</packaging>
-
+
</project>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
index 42000613e43..946f4d4cd73 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
-
+
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>4.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
-
+
<artifactId>org.eclipse.papyrus.rcp.product</artifactId>
<packaging>eclipse-repository</packaging>
-
+
<properties>
<product-id>org.eclipse.papyrus.rcp.product</product-id>
</properties>
-
+
<build>
<plugins>
<plugin>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
index 9b15c0bc190..2261844b2d6 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
-
+
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>4.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
-
+
<artifactId>org.eclipse.papyrus.rcp</artifactId>
<packaging>eclipse-plugin</packaging>
-
+
</project>
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index fd3e2a1b482..ecbc0ee12ba 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -1,33 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
-
+
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.all.releng</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.all.releng</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<version>4.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<modules>
<module>org.eclipse.papyrus.rcp</module>
<module>org.eclipse.papyrus.rcp.feature</module>
<module>org.eclipse.papyrus.rcp.product</module>
<module>targetPlatform</module>
</modules>
-
+
<properties>
<!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) -->
- <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
- <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) -->
- <eclipse.simultaneous.release.name>2018-09 (4.8)</eclipse.simultaneous.release.name>
- <target.platform>org.eclipse.papyrus.rcp.${target.suffix}.target</target.platform>
+ <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
+ <!-- Human readable name of the release, e.g. used in the about dialog
+ (see about.mappings) -->
+ <eclipse.simultaneous.release.name>2018-09 (4.8)</eclipse.simultaneous.release.name>
+ <target.platform>org.eclipse.papyrus.rcp.${target.suffix}.target</target.platform>
</properties>
-
+
<repositories>
<!-- Papyrus repository -->
<repository>
@@ -36,7 +38,7 @@
<url>${papyrus.repo.main}</url>
</repository>
</repositories>
-
+
<build>
<plugins>
<plugin>
@@ -73,7 +75,7 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>update-branding-plugins-about.mappings</id>
diff --git a/releng/rcp/targetPlatform/eclipse/pom.xml b/releng/rcp/targetPlatform/eclipse/pom.xml
index 5a400d7e14c..82c230d0fcf 100644
--- a/releng/rcp/targetPlatform/eclipse/pom.xml
+++ b/releng/rcp/targetPlatform/eclipse/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
diff --git a/releng/rcp/targetPlatform/pom.xml b/releng/rcp/targetPlatform/pom.xml
index 58071d331ff..d211edec9a5 100644
--- a/releng/rcp/targetPlatform/pom.xml
+++ b/releng/rcp/targetPlatform/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
diff --git a/releng/rcp/targetPlatform/portable/pom.xml b/releng/rcp/targetPlatform/portable/pom.xml
index 352a11a1a7c..2e78c8aba4c 100644
--- a/releng/rcp/targetPlatform/portable/pom.xml
+++ b/releng/rcp/targetPlatform/portable/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
diff --git a/releng/toolsmiths/pom.xml b/releng/toolsmiths/pom.xml
index 994344ca683..cf59be44efb 100755
--- a/releng/toolsmiths/pom.xml
+++ b/releng/toolsmiths/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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>
<groupId>org.eclipse.papyrus</groupId>
<artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -11,11 +12,11 @@
<artifactId>org.eclipse.papyrus.all.releng</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
-
+
<properties>
<target.platform>org.eclipse.papyrus.toolsmiths.${target.suffix}.targetplatform</target.platform>
</properties>
-
+
<modules>
<module>../../features/papyrus-toolsmiths-features</module>
<module>../../plugins/toolsmiths</module>
@@ -23,10 +24,10 @@
<module>site</module>
<module>targetPlatform</module>
</modules>
-
- <build>
+
+ <build>
<plugins>
- <!-- local plugins -->
+ <!-- local plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -47,8 +48,8 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
</plugin>
-
- <!-- Sources -->
+
+ <!-- Sources -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
@@ -76,7 +77,7 @@
</execution>
</executions>
</plugin>
-
+
<!-- Pack200 -->
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
@@ -110,7 +111,7 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>defaultProfile</id>
@@ -125,16 +126,17 @@
<activeByDefault>true</activeByDefault>
</activation>
</profile>
-
+
<profile>
<id>buildAll</id>
- <!-- Papyrus Update sites not included (They are included in the same build) -->
- <activation>
- <property>
- <name>buildAll</name>
- <value>true</value>
- </property>
- </activation>
+ <!-- Papyrus Update sites not included (They are included in the same
+ build) -->
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -152,19 +154,19 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>
</profile>
-
+
<!-- Stable release profile. Takes +30min. Eclipse servers only -->
<profile>
- <id>packAndSign</id>
+ <id>packAndSign</id>
<!-- Pack200 -->
- <activation>
- <property>
- <name>SIGN</name>
- <value>true</value>
- </property>
- </activation>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -226,17 +228,17 @@
</plugins>
</build>
</profile>
-
+
<!-- Nightly profile. Artifacts can be consumed, but are not signed -->
<profile>
- <id>pack</id>
- <activation>
- <property>
- <name>SIGN</name>
- <value>false</value>
- </property>
- </activation>
+ <id>pack</id>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>false</value>
+ </property>
+ </activation>
<build>
<plugins>
<!-- Pack200 -->
@@ -273,11 +275,11 @@
</plugins>
</build>
</profile>
-
-
+
+
<!-- Analysis profile. Takes +1h -->
<profile>
- <id>findBugs</id>
+ <id>findBugs</id>
<build>
<plugins>
<plugin>
diff --git a/releng/toolsmiths/site/pom.xml b/releng/toolsmiths/site/pom.xml
index ef3cb3cd25b..87481c34ba2 100644
--- a/releng/toolsmiths/site/pom.xml
+++ b/releng/toolsmiths/site/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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>
<parent>
<artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId>
@@ -13,7 +14,7 @@
<groupId>org.eclipse.papyrus</groupId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
-
+
<build>
<plugins>
<plugin>
@@ -24,21 +25,21 @@
<includePackedArtifacts>true</includePackedArtifacts>
</configuration>
</plugin>
-
+
<!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
<executions>
<execution>
- <phase>package</phase>
+ <phase>package</phase>
<goals>
<goal>generate-repository-facade</goal>
</goals>
<configuration>
- <!-- do not generate the pesky web folder and index.html -->
- <skipWebContentGeneration>true</skipWebContentGeneration>
- <!-- p2 update site transitive dependencies repositories -->
+ <!-- do not generate the pesky web folder and index.html -->
+ <skipWebContentGeneration>true</skipWebContentGeneration>
+ <!-- p2 update site transitive dependencies repositories -->
<associateSites>
<site>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a</site>
<site>https://dl.bintray.com/mbarbero/fr.obeo.releng.targetplatform/latest</site>
diff --git a/releng/toolsmiths/targetPlatform/eclipse/pom.xml b/releng/toolsmiths/targetPlatform/eclipse/pom.xml
index 098c189e425..0724122b494 100644
--- a/releng/toolsmiths/targetPlatform/eclipse/pom.xml
+++ b/releng/toolsmiths/targetPlatform/eclipse/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>
diff --git a/releng/toolsmiths/targetPlatform/pom.xml b/releng/toolsmiths/targetPlatform/pom.xml
index 79311df7b84..a854d2c54ea 100644
--- a/releng/toolsmiths/targetPlatform/pom.xml
+++ b/releng/toolsmiths/targetPlatform/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>
@@ -35,5 +37,5 @@
</modules>
</profile>
</profiles>
-
</project>
+
diff --git a/releng/toolsmiths/targetPlatform/portable/pom.xml b/releng/toolsmiths/targetPlatform/portable/pom.xml
index 7dada98e3cd..806fafc6782 100644
--- a/releng/toolsmiths/targetPlatform/portable/pom.xml
+++ b/releng/toolsmiths/targetPlatform/portable/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<parent>

Back to the top