diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 52c8b5148..dcf17104d 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -110,7 +110,7 @@ samples)
fi
;;
clirr)
- mvn -B -ntp -Denforcer.skip=true clirr:check
+ mvn -B -ntp -Denforcer.skip=true -P=clirr-compatibility-check clirr:check
RETURN_CODE=$?
;;
*)
diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml
index cfb0a0c7f..cb7703b07 100644
--- a/google-api-client-android/pom.xml
+++ b/google-api-client-android/pom.xml
@@ -42,6 +42,13 @@
android
4.1.1.4
provided
+
+
+
+ xerces
+ xmlParserAPIs
+
+
com.google.http-client
diff --git a/google-api-client-apache-v5/pom.xml b/google-api-client-apache-v5/pom.xml
index 3a5f5e324..01ddb1422 100644
--- a/google-api-client-apache-v5/pom.xml
+++ b/google-api-client-apache-v5/pom.xml
@@ -54,7 +54,6 @@
org.apache.felix
maven-bundle-plugin
- 5.1.9
bundle-manifest
diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml
index e02d12a8d..218835732 100644
--- a/google-api-client-appengine/pom.xml
+++ b/google-api-client-appengine/pom.xml
@@ -41,7 +41,6 @@
org.apache.felix
maven-bundle-plugin
- 5.1.9
bundle-manifest
diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
index e160a05cb..84e57484b 100644
--- a/google-api-client-gson/pom.xml
+++ b/google-api-client-gson/pom.xml
@@ -39,7 +39,6 @@
org.apache.felix
maven-bundle-plugin
- 5.1.9
bundle-manifest
diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index 49fd81310..502092deb 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -39,7 +39,6 @@
org.apache.felix
maven-bundle-plugin
- 5.1.9
bundle-manifest
diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 7cc8a8442..b4ee62b99 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -46,7 +46,6 @@
org.apache.felix
maven-bundle-plugin
- 5.1.9
bundle-manifest
diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
index 22ea1b572..d2613778d 100644
--- a/google-api-client-servlet/pom.xml
+++ b/google-api-client-servlet/pom.xml
@@ -40,7 +40,6 @@
org.apache.felix
maven-bundle-plugin
- 5.1.9
bundle-manifest
diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
index 79836c84f..59050436d 100644
--- a/google-api-client-xml/pom.xml
+++ b/google-api-client-xml/pom.xml
@@ -39,7 +39,6 @@
org.apache.felix
maven-bundle-plugin
- 5.1.9
bundle-manifest
diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index 7644bac9a..88b5eba44 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -60,7 +60,6 @@
org.apache.felix
maven-bundle-plugin
- 5.1.9
bundle-manifest
diff --git a/pom.xml b/pom.xml
index 2184afc60..063030eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,6 +343,81 @@
org.codehaus.mojo
findbugs-maven-plugin
3.0.5
+
+
+
+ antlr
+ antlr
+ 2.7.7
+
+
+ org.codehaus.plexus
+ plexus-i18n
+ 1.0-beta-10
+
+
+
+ *
+ *
+
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ 5.1.9
+
+
+
+ org.codehaus.plexus
+ plexus-i18n
+ 1.0-beta-10
+
+
+
+ *
+ *
+
+
+
+
+
+ org.apache.felix
+ org.apache.felix.bundlerepository
+ 1.6.6
+
+
+ org.osgi
+ org.osgi.core
+
+
+
+
+ org.apache.felix
+ org.apache.felix.utils
+ 1.6.0
+
+
+ org.osgi
+ org.osgi.core
+
+
+
+
org.codehaus.mojo
@@ -471,22 +546,6 @@
-
- org.codehaus.mojo
- clirr-maven-plugin
-
- 1.27.0
- ${basedir}/../clirr-ignored-differences.xml
- true
-
-
-
-
- check
-
-
-
-
org.codehaus.mojo
animal-sniffer-maven-plugin
@@ -760,5 +819,37 @@
+
+ clirr-compatibility-check
+
+
+
+
+ org.codehaus.mojo
+ clirr-maven-plugin
+
+ 1.27.0
+ ${basedir}/../clirr-ignored-differences.xml
+ true
+
+
+
+
+ check
+
+
+
+
+
+
+