Update OSGiManifestIT not to depend on order. (#2965)

* Update `OSGiManifestIT` not to depend on order.

It appears that sometimes the clauses being checked for appear in the
other order, possibly because of a `HashMap` or the like somewhere in
the guts of OSGi. I haven't seen this on GitHub, but I do see it when
running locally with Google's JDK, which has more hash randomization.

* Fix use of assignment expression.

* Remove the parser, which was overkill.

It's enough just to swap the two clauses of a line when they are not in
the expected order.

Also, unrelatedly, update `protobuf-maven-plugin`.

* Update comments and undo an unnecessary split.

Author: eamonnmcmanus

gson/src/test/java/com/google/gson/integration/OSGiManifestIT.java

@@ -130,7 +130,12 @@ public void testImports() throws Exception {
   public void testExports() {
     String gsonVersion = GSON_VERSION.replace("-SNAPSHOT", "");
 
-    List<String> exports = splitPackages(getAttribute("Export-Package"));
+    // Sometimes the `uses` and `exports` clauses can end up in the opposite order, so we use a
+    // quick substitution to canonicalize them.
+    List<String> exports =
+        splitPackages(getAttribute("Export-Package")).stream()
+            .map(line -> line.replaceAll("(;version=\".*\")(;uses:=\".*\")", "$2$1"))
+            .collect(Collectors.toList());
     // When not running `mvn clean` the exports might differ slightly, see
     // https://github.com/bndtools/bnd/issues/6221
     assertWithMessage("Unexpected exports; make sure you are running `mvn clean ...`")

proto/pom.xml

@@ -79,7 +79,7 @@
       <plugin>
         <groupId>io.github.ascopes</groupId>
         <artifactId>protobuf-maven-plugin</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
         <configuration>
           <skip>${maven.test.skip}</skip>
           <protoc>${protobufVersion}</protoc>