Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2019-06-07 14:56:59 +0000
committerJonah Graham2019-06-07 18:03:41 +0000
commit87da77a7e2cd9a664bbf0a7305453762930b31bd (patch)
tree57873a3d897193e3aec70110ce5e263236efe435
parent58c267bd672e9b736d98cc7eabebbb6929ce5aa3 (diff)
downloadorg.eclipse.cdt-87da77a7e2cd9a664bbf0a7305453762930b31bd.tar.gz
org.eclipse.cdt-87da77a7e2cd9a664bbf0a7305453762930b31bd.tar.xz
org.eclipse.cdt-87da77a7e2cd9a664bbf0a7305453762930b31bd.zip
Bug 547894: Fail build if differences before baseline replace
Also fix version numbers in all bundles who's binary contents have changed despite no change in the source of the bundle. Change-Id: Ic67b79aafa801c7ce96c5e52843ad5c881827d84
-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--debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF2
-rw-r--r--debug/org.eclipse.cdt.debug.application.doc/pom.xml2
-rw-r--r--doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF2
-rw-r--r--doc/org.eclipse.cdt.doc.isv/pom.xml2
-rw-r--r--doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF2
-rw-r--r--doc/org.eclipse.cdt.doc.user/pom.xml2
-rw-r--r--pom.xml26
11 files changed, 23 insertions, 23 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 4d5357801dd..4f589cfeb30 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.3.qualifier
+Bundle-Version: 2.0.4.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 3d1edb1fda7..880cb2659dc 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.3-SNAPSHOT</version>
+ <version>2.0.4-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 b5a36bce2cf..ea21d358af4 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.1.qualifier
+Bundle-Version: 1.0.2.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 026751cb157..678dc2dcd90 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.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.meson.docs</artifactId>
<packaging>eclipse-plugin</packaging>
diff --git a/debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF
index 2774e0f5436..b2d7b415bdc 100644
--- a/debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.cdt.debug.application.doc;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: %provider
Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.application.doc/pom.xml b/debug/org.eclipse.cdt.debug.application.doc/pom.xml
index d5a986cd992..6f4a74037c4 100644
--- a/debug/org.eclipse.cdt.debug.application.doc/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application.doc/pom.xml
@@ -10,7 +10,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.2-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.debug.application.doc</artifactId>
<packaging>eclipse-plugin</packaging>
diff --git a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
index 89a264ca2e7..ed432916f67 100644
--- a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.doc.isv; singleton:=true
-Bundle-Version: 5.4.1.qualifier
+Bundle-Version: 5.4.2.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml
index e8b76cb30ff..201a517e7b0 100644
--- a/doc/org.eclipse.cdt.doc.isv/pom.xml
+++ b/doc/org.eclipse.cdt.doc.isv/pom.xml
@@ -10,7 +10,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>5.4.1-SNAPSHOT</version>
+ <version>5.4.2-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.doc.isv</artifactId>
<packaging>eclipse-plugin</packaging>
diff --git a/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
index daf97928ee0..21244509fbb 100644
--- a/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.doc.user; singleton:=true
-Bundle-Version: 5.4.1.qualifier
+Bundle-Version: 5.4.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml
index 848e6f74e71..16833d0dfa4 100644
--- a/doc/org.eclipse.cdt.doc.user/pom.xml
+++ b/doc/org.eclipse.cdt.doc.user/pom.xml
@@ -10,7 +10,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>5.4.1-SNAPSHOT</version>
+ <version>5.4.2-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.doc.user</artifactId>
<packaging>eclipse-plugin</packaging>
diff --git a/pom.xml b/pom.xml
index e9f15c0de50..c7c64f84897 100644
--- a/pom.xml
+++ b/pom.xml
@@ -769,21 +769,21 @@
<goal>p2-metadata</goal>
</goals>
<phase>verify</phase>
- <configuration>
- <baselineMode>warn</baselineMode>
- <baselineReplace>all</baselineReplace>
- <baselineRepositories>
- <repository>
- <url>${comparator.repo}</url>
- </repository>
- </baselineRepositories>
- <ignoredPatterns>
- <pattern>META-INF/ECLIPSE_.RSA</pattern>
- <pattern>META-INF/ECLIPSE_.SF</pattern>
- </ignoredPatterns>
- </configuration>
</execution>
</executions>
+ <configuration>
+ <baselineMode>fail</baselineMode>
+ <baselineReplace>all</baselineReplace>
+ <baselineRepositories>
+ <repository>
+ <url>${comparator.repo}</url>
+ </repository>
+ </baselineRepositories>
+ <ignoredPatterns>
+ <pattern>META-INF/ECLIPSE_.RSA</pattern>
+ <pattern>META-INF/ECLIPSE_.SF</pattern>
+ </ignoredPatterns>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

Back to the top