diff options
Diffstat (limited to 'releng/toolsmiths')
| -rwxr-xr-x | releng/toolsmiths/pom.xml | 85 | ||||
| -rw-r--r-- | releng/toolsmiths/site/pom.xml | 12 |
2 files changed, 36 insertions, 61 deletions
diff --git a/releng/toolsmiths/pom.xml b/releng/toolsmiths/pom.xml index 47c3c46501b..994344ca683 100755 --- a/releng/toolsmiths/pom.xml +++ b/releng/toolsmiths/pom.xml @@ -1,6 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<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> +<?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> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -23,46 +24,20 @@ <module>targetPlatform</module> </modules> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> - <configuration> - <source>${java.source.version}</source> - <target>${java.target.version}</target> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <build> <plugins> + <!-- local plugins --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </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>tycho-maven-plugin</artifactId> - <version>${tycho-version}</version> - <extensions>true</extensions> </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> @@ -71,8 +46,9 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-repository-plugin</artifactId> - <version>${tycho-version}</version> </plugin> + + <!-- Sources --> <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-source-plugin</artifactId> @@ -100,6 +76,7 @@ </execution> </executions> </plugin> + <!-- Pack200 --> <plugin> <groupId>org.eclipse.tycho.extras</groupId> @@ -135,7 +112,6 @@ </build> <profiles> - <profile> <id>defaultProfile</id> <repositories> @@ -152,8 +128,13 @@ <profile> <id>buildAll</id> - <!-- Papyrus Update sites not included (They are included in the same build) --> - + <!-- 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> @@ -171,21 +152,19 @@ </executions> </plugin> </plugins> - </build> - - <activation> - <property> - <name>buildAll</name> - <value>true</value> - </property> - </activation> + </build> </profile> - <!-- Stable release profile. Takes +30min. Eclipse servers only --> <profile> <id>packAndSign</id> <!-- Pack200 --> + <activation> + <property> + <name>SIGN</name> + <value>true</value> + </property> + </activation> <build> <plugins> <plugin> @@ -246,18 +225,18 @@ </plugin> </plugins> </build> - <activation> - <property> - <name>SIGN</name> - <value>true</value> - </property> - </activation> </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> <build> <plugins> <!-- Pack200 --> @@ -293,12 +272,6 @@ </plugin> </plugins> </build> - <activation> - <property> - <name>SIGN</name> - <value>false</value> - </property> - </activation> </profile> diff --git a/releng/toolsmiths/site/pom.xml b/releng/toolsmiths/site/pom.xml index 83a51e29d49..a485ec78ee1 100644 --- a/releng/toolsmiths/site/pom.xml +++ b/releng/toolsmiths/site/pom.xml @@ -1,6 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<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> +<?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> <artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId> @@ -35,8 +36,9 @@ <goal>generate-repository-facade</goal> </goals> <configuration> - - <!-- 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>http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/</site> |