| author | Thanh Ha | 2012-12-10 08:18:37 (EST) |
|---|---|---|
| committer | Paul Webster | 2012-12-10 08:18:37 (EST) |
| commit | 23c6b569a28ede882790449b61f818ff616f4d9d (patch) (side-by-side diff) | |
| tree | ce885ec633dee85f2e18a4cdcc4b5a236edda0de | |
| parent | 9fff62b07d2cc8c1e449aec3f4a04e479b39a5bb (diff) | |
| download | eclipse.platform.common-23c6b569a28ede882790449b61f818ff616f4d9d.zip eclipse.platform.common-23c6b569a28ede882790449b61f818ff616f4d9d.tar.gz eclipse.platform.common-23c6b569a28ede882790449b61f818ff616f4d9d.tar.bz2 | |
Bug 396097 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) for eclipse.platform.commonv20121210-131837I20121211-0800I20121210-2000
| -rw-r--r-- | bundles/org.eclipse.jdt.doc.isv/pom.xml | 117 | ||||
| -rw-r--r-- | bundles/org.eclipse.jdt.doc.user/pom.xml | 52 | ||||
| -rw-r--r-- | bundles/org.eclipse.pde.doc.user/pom.xml | 108 | ||||
| -rw-r--r-- | bundles/org.eclipse.platform.doc.isv/pom.xml | 269 | ||||
| -rw-r--r-- | bundles/org.eclipse.platform.doc.user/pom.xml | 50 | ||||
| -rw-r--r-- | pom.xml | 5 |
6 files changed, 593 insertions, 8 deletions
diff --git a/bundles/org.eclipse.jdt.doc.isv/pom.xml b/bundles/org.eclipse.jdt.doc.isv/pom.xml index a326be5..6ece0c3 100644 --- a/bundles/org.eclipse.jdt.doc.isv/pom.xml +++ b/bundles/org.eclipse.jdt.doc.isv/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -21,6 +21,119 @@ </parent> <groupId>eclipse.platform.common</groupId> <artifactId>org.eclipse.jdt.doc.isv</artifactId> - <version>3.8.0-SNAPSHOT</version> + <version>3.9.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + + <profiles> + <profile> + <id>build-docs</id> + <activation> + <property> + <!-- workaround. activeByDefault is disabled when another profile is + selected. --> + <name>!longnotexistingproperty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.pde.build</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.pde.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>com.ibm.icu</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.apache.ant</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.junit</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overwriteReleases>true</overwriteReleases> + <overwriteSnapshots>true</overwriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-eclipserun-plugin</artifactId> + <!-- this is actually present in any 0.14+ version --> + <version>${tycho.version}</version> + <configuration> + <!-- this is to fix some lucene 3.x compatibility issue --> + <argLine>-XX:-UseLoopPredicate -Dhelp.lucene.tokenizer=standard</argLine> + <!-- actuall indexer call --> + <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -Dbasedir.properties=cbi_basedirs.properties</appArgLine> + <dependencies> + <!-- list of bundles that we need --> + <dependency> + <artifactId>org.eclipse.ant.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.apache.ant</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.help.base</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.build</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + </dependencies> + </configuration> + <executions> + <execution> + <goals> + <goal>eclipse-run</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/bundles/org.eclipse.jdt.doc.user/pom.xml b/bundles/org.eclipse.jdt.doc.user/pom.xml index 62a2618..8745af1 100644 --- a/bundles/org.eclipse.jdt.doc.user/pom.xml +++ b/bundles/org.eclipse.jdt.doc.user/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -21,6 +21,54 @@ </parent> <groupId>eclipse.platform.common</groupId> <artifactId>org.eclipse.jdt.doc.user</artifactId> - <version>3.8.0-SNAPSHOT</version> + <version>3.9.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + + <profiles> + <profile> + <id>build-docs</id> + <activation> + <property> + <!-- workaround. activeByDefault is disabled when another profile is + selected. --> + <name>!longnotexistingproperty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-eclipserun-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <argLine>-Dhelp.lucene.tokenizer=standard</argLine> + <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine> + <dependencies> + <dependency> + <artifactId>org.eclipse.ant.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.apache.ant</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.help.base</artifactId> + <type>eclipse-plugin</type> + </dependency> + </dependencies> + </configuration> + <executions> + <execution> + <goals> + <goal>eclipse-run</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/bundles/org.eclipse.pde.doc.user/pom.xml b/bundles/org.eclipse.pde.doc.user/pom.xml index afa9e0b..7bfe81b 100644 --- a/bundles/org.eclipse.pde.doc.user/pom.xml +++ b/bundles/org.eclipse.pde.doc.user/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -21,6 +21,110 @@ </parent> <groupId>eclipse.platform.common</groupId> <artifactId>org.eclipse.pde.doc.user</artifactId> - <version>3.8.0-SNAPSHOT</version> + <version>3.9.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + + <profiles> + <profile> + <id>build-docs</id> + <activation> + <property> + <!-- workaround. activeByDefault is disabled when another profile is + selected. --> + <name>!longnotexistingproperty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.pde.build</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.pde.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jdt.debug</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jdt.junit</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overwriteReleases>true</overwriteReleases> + <overwriteSnapshots>true</overwriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-eclipserun-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <argLine>-XX:-UseLoopPredicate -Dhelp.lucene.tokenizer=standard</argLine> + <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -Dbasedir.properties=cbi_basedirs.properties</appArgLine> + <dependencies> + <dependency> + <artifactId>org.eclipse.ant.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.apache.ant</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.help.base</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.build</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + </dependencies> + </configuration> + <executions> + <execution> + <goals> + <goal>eclipse-run</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/bundles/org.eclipse.platform.doc.isv/pom.xml b/bundles/org.eclipse.platform.doc.isv/pom.xml index 0d0af07..b514ca9 100644 --- a/bundles/org.eclipse.platform.doc.isv/pom.xml +++ b/bundles/org.eclipse.platform.doc.isv/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -23,4 +23,271 @@ <artifactId>org.eclipse.platform.doc.isv</artifactId> <version>4.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + + <profiles> + <profile> + <id>build-docs</id> + <activation> + <property> + <!-- workaround. activeByDefault is disabled when another profile is + selected. --> + <name>!longnotexistingproperty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.pde.build</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.pde.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>com.ibm.icu</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>com.jcraft.jsch</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>javax.annotation</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>javax.el</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>javax.inject</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>javax.servlet</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>javax.servlet.jsp</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.apache.ant</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.apache.batik.css</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.apache.jasper.glassfish</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.apache.lucene.analysis</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.apache.lucene.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.provider.filetransfer</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.filetransfer</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.ssl</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.identity</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.provider.filetransfer.ssl</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.provider.filetransfer.httpclient</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.ecf.provider.filetransfer.httpclient.ssl</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.emf.common</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.emf.ecore</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.emf.ecore.xmi</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jetty.continuation</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jetty.http</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jetty.io</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jetty.security</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jetty.server</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jetty.servlet</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.jetty.util</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.sat4j.core</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.sat4j.pb</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-plugin</type> + <id>org.w3c.css.sac</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overwriteReleases>true</overwriteReleases> + <overwriteSnapshots>true</overwriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-eclipserun-plugin</artifactId> + <!-- this is actually present in any 0.14+ version --> + <version>${tycho.version}</version> + <configuration> + <!-- this is to fix some lucene 3.x compatibility issue --> + <argLine>-XX:-UseLoopPredicate -Dhelp.lucene.tokenizer=standard</argLine> + <!-- actuall indexer call --> + <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -Dbasedir.properties=cbi_basedirs.properties</appArgLine> + <dependencies> + <!-- list of bundles that we need --> + <dependency> + <artifactId>org.eclipse.ant.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.apache.ant</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.help.base</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.build</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.pde.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.equinox.launcher</artifactId> + <type>eclipse-plugin</type> + </dependency> + </dependencies> + </configuration> + <executions> + <execution> + <goals> + <goal>eclipse-run</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/bundles/org.eclipse.platform.doc.user/pom.xml b/bundles/org.eclipse.platform.doc.user/pom.xml index 236022c..8a26d5c 100644 --- a/bundles/org.eclipse.platform.doc.user/pom.xml +++ b/bundles/org.eclipse.platform.doc.user/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -23,4 +23,52 @@ <artifactId>org.eclipse.platform.doc.user</artifactId> <version>4.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + + <profiles> + <profile> + <id>build-docs</id> + <activation> + <property> + <!-- workaround. activeByDefault is disabled when another profile is + selected. --> + <name>!longnotexistingproperty</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-eclipserun-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <argLine>-Dhelp.lucene.tokenizer=standard</argLine> + <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> + <dependencies> + <dependency> + <artifactId>org.eclipse.ant.core</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.apache.ant</artifactId> + <type>eclipse-plugin</type> + </dependency> + <dependency> + <artifactId>org.eclipse.help.base</artifactId> + <type>eclipse-plugin</type> + </dependency> + </dependencies> + </configuration> + <executions> + <execution> + <goals> + <goal>eclipse-run</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> @@ -19,6 +19,7 @@ <groupId>org.eclipse</groupId> <artifactId>eclipse-parent</artifactId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../eclipse-parent</relativePath> </parent> <groupId>eclipse.platform.common</groupId> @@ -26,6 +27,10 @@ <version>3.8.0-SNAPSHOT</version> <packaging>pom</packaging> + <properties> + <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.common.git</tycho.scmUrl> + </properties> + <modules> <module>bundles/org.eclipse.jdt.doc.isv</module> <module>bundles/org.eclipse.jdt.doc.user</module> |

