Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2019-09-09 19:23:53 +0000
committerJonah Graham2019-09-09 19:53:46 +0000
commita29e38f46dc67dc7939334fced67e44d070be955 (patch)
tree32833c2b9d0b81fca9ed139513f7a70909aa30ca
parent63e37acaac9fac9df9122ff7344491b14f430497 (diff)
downloadorg.eclipse.cdt-a29e38f46dc67dc7939334fced67e44d070be955.tar.gz
org.eclipse.cdt-a29e38f46dc67dc7939334fced67e44d070be955.tar.xz
org.eclipse.cdt-a29e38f46dc67dc7939334fced67e44d070be955.zip
[releng] Bump version number of docs plug-ins
These docs plug-ins were having baselinereplace-p2-metadata. This is due to still having problems with the compare&replace logic. The root pom.xml lits <pattern>index/*</pattern> to exclude from compare, which means if the only thing that changes is the generate files, and not the source files, then the jar is a candidate for replace. In commit 3bab315fd23, the version of help-docs-eclipserun-repo was changed, which means that the generated output changes too. Change-Id: I7f73159776d209aadaa70587988652e125b60851
-rw-r--r--build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.autotools.docs/pom.xml2
-rw-r--r--build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.meson.docs/pom.xml2
-rw-r--r--pom.xml5
5 files changed, 9 insertions, 4 deletions
diff --git a/build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF
index f8a1fdbcf36..b433ae0a887 100644
--- a/build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.cdt.autotools.docs;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 2.0.200.qualifier
Bundle-Vendor: %provider
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help,
diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml
index 27a307dde24..a219b7c52dc 100644
--- a/build/org.eclipse.cdt.autotools.docs/pom.xml
+++ b/build/org.eclipse.cdt.autotools.docs/pom.xml
@@ -11,7 +11,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>2.0.100-SNAPSHOT</version>
+ <version>2.0.200-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.autotools.docs</artifactId>
<packaging>eclipse-plugin</packaging>
diff --git a/build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF
index 4a3f483c7ce..c2516b188d3 100644
--- a/build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.cdt.meson.docs;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Vendor: %provider
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help,
diff --git a/build/org.eclipse.cdt.meson.docs/pom.xml b/build/org.eclipse.cdt.meson.docs/pom.xml
index 38e6f54c6fa..f911e6118aa 100644
--- a/build/org.eclipse.cdt.meson.docs/pom.xml
+++ b/build/org.eclipse.cdt.meson.docs/pom.xml
@@ -11,7 +11,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.0.200-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.meson.docs</artifactId>
<packaging>eclipse-plugin</packaging>
diff --git a/pom.xml b/pom.xml
index cac072cc2c7..db11f6e3966 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,12 @@
<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
<sonar.java.source>1.8</sonar.java.source>
<target-platform>cdt</target-platform>
+
+ <!-- When changing this value, consider also bumping the version numbers of all the docs plug-ins so that compare&replace does not
+ replace the the newly built docs because the only change is in the filtered out index/* resources. -->
<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.13-I-builds/</help-docs-eclipserun-repo>
+
+
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git</tycho.scmUrl>
<base.test.vmargs>-Xms256m -Xmx512m -ea</base.test.vmargs>
<comparator.repo>https://download.eclipse.org/tools/cdt/releases/9.8/cdt-9.8.1/</comparator.repo>

Back to the top