diff options
author | Jonah Graham | 2019-06-07 14:56:59 +0000 |
---|---|---|
committer | Jonah Graham | 2019-06-07 17:57:15 +0000 |
commit | 53e14118d2448ea9aca75eea9093f7c863fe23d1 (patch) | |
tree | 74fba229e5392516c2917a36b6f8a6816026b4bb | |
parent | cb213e217f8c7232e909cde677426bdf4aab769d (diff) | |
download | org.eclipse.cdt-53e14118d2448ea9aca75eea9093f7c863fe23d1.tar.gz org.eclipse.cdt-53e14118d2448ea9aca75eea9093f7c863fe23d1.tar.xz org.eclipse.cdt-53e14118d2448ea9aca75eea9093f7c863fe23d1.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.MF | 2 | ||||
-rw-r--r-- | build/org.eclipse.cdt.autotools.docs/pom.xml | 2 | ||||
-rw-r--r-- | build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF | 4 | ||||
-rw-r--r-- | build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | build/org.eclipse.cdt.meson.docs/pom.xml | 2 | ||||
-rw-r--r-- | debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | debug/org.eclipse.cdt.debug.application.doc/pom.xml | 2 | ||||
-rw-r--r-- | doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | doc/org.eclipse.cdt.doc.isv/pom.xml | 2 | ||||
-rw-r--r-- | doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | doc/org.eclipse.cdt.doc.user/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 26 |
13 files changed, 26 insertions, 26 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..f8a1fdbcf36 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.100.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 2d6cc5a661f..41eebf2d57c 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.100-SNAPSHOT</version> <artifactId>org.eclipse.cdt.autotools.docs</artifactId> <packaging>eclipse-plugin</packaging> diff --git a/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF index e3a4d687417..9508e0dbfb3 100644 --- a/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.cdt.autotools.ui;singleton:=true -Bundle-Version: 2.0.100.qualifier +Bundle-Version: 2.0.200.qualifier Bundle-Activator: org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin Bundle-Localization: plugin Bundle-Vendor: %provider diff --git a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF index 74313015179..b1a1afd6ffc 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui; singleton:=true -Bundle-Version: 9.1.100.qualifier +Bundle-Version: 9.1.200.qualifier Bundle-Activator: org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.cdt.make.core, org.eclipse.cdt.make.ui, - org.eclipse.cdt.managedbuilder.core;bundle-version="[8.1.0,9.0.0)", + org.eclipse.cdt.managedbuilder.core;bundle-version="[8.7.0,9.0.0)", org.eclipse.cdt.ui;bundle-version="[6.0.0,7.0.0)", org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.console;bundle-version="[3.5.100,4.0.0)", 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..4a3f483c7ce 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.100.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 3177956b5e3..05b1b88c733 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.100-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..cf856e4d244 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.100.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 3713a9476db..358fcbf22c9 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.100-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..3cc08cc9f8a 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.100.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 b7ce27f3f77..9eac3488766 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.100-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..ce036673c2a 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.100.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 e19ed02b51a..8dfd023f09b 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.100-SNAPSHOT</version> <artifactId>org.eclipse.cdt.doc.user</artifactId> <packaging>eclipse-plugin</packaging> @@ -750,21 +750,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> |