From f9d792824cddedd0ca95139f9001466fc4552813 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 17 2017 07:36:19 +0000
Subject: import rh-mongodb32-mongo-java-driver-3.5.0-3.el7


---

diff --git a/.gitignore b/.gitignore
index 7564709..f8dc9df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/r3.2.1.tar.gz
+SOURCES/r3.5.0.tar.gz
diff --git a/.rh-mongodb32-mongo-java-driver.metadata b/.rh-mongodb32-mongo-java-driver.metadata
index 609a604..2a8e763 100644
--- a/.rh-mongodb32-mongo-java-driver.metadata
+++ b/.rh-mongodb32-mongo-java-driver.metadata
@@ -1 +1 @@
-cf0b184a414c56b42a4b19338ed2548328b7921d SOURCES/r3.2.1.tar.gz
+62549e41d6c6d1c02b608c61f3256f00501bbd5d SOURCES/r3.5.0.tar.gz
diff --git a/SOURCES/0001-Maven-support.patch b/SOURCES/0001-Maven-support.patch
new file mode 100644
index 0000000..4911952
--- /dev/null
+++ b/SOURCES/0001-Maven-support.patch
@@ -0,0 +1,628 @@
+From ce1fc6cd336f623101a72b6d3de3d95d42998316 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Fri, 23 Jun 2017 18:21:43 +0200
+Subject: [PATCH] Maven support
+
+---
+ bson/pom.xml                                       |  90 ++++++++++++++
+ driver-async/pom.xml                               | 107 +++++++++++++++++
+ driver-core/pom.xml                                | 121 +++++++++++++++++++
+ .../unit/com/mongodb/ConnectionStringTest.java     |   2 +-
+ driver/pom.xml                                     |  77 ++++++++++++
+ mongo-java-driver/pom.xml                          | 133 +++++++++++++++++++++
+ pom.xml                                            |  27 +++++
+ 7 files changed, 551 insertions(+), 1 deletion(-)
+ create mode 100644 bson/pom.xml
+ create mode 100644 driver-async/pom.xml
+ create mode 100644 driver-core/pom.xml
+ create mode 100644 driver/pom.xml
+ create mode 100644 mongo-java-driver/pom.xml
+ create mode 100644 pom.xml
+
+diff --git a/bson/pom.xml b/bson/pom.xml
+new file mode 100644
+index 0000000..4076687
+--- /dev/null
++++ b/bson/pom.xml
+@@ -0,0 +1,90 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.mongodb</groupId>
++    <artifactId>aggregator-project</artifactId>
++    <version>@VERSION@</version>
++  </parent>
++  <groupId>org.mongodb</groupId>
++  <artifactId>bson</artifactId>
++  <version>@VERSION@</version>
++  <name>BSON</name>
++  <description>The BSON library</description>
++  <url>http://bsonspec.org</url>
++  <packaging>bundle</packaging>
++  <licenses>
++    <license>
++      <name>The Apache Software License, Version 2.0</name>
++      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
++      <distribution>repo</distribution>
++    </license>
++  </licenses>
++  <developers>
++    <developer>
++      <name>Various</name>
++      <organization>MongoDB</organization>
++    </developer>
++  </developers>
++  <scm>
++    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
++    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
++    <url>https://github.com/mongodb/mongo-java-driver</url>
++  </scm>
++  <dependencies>
++    <dependency>
++      <groupId>org.slf4j</groupId>
++      <artifactId>slf4j-api</artifactId>
++      <version>1.7.6</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.12</version>
++      <scope>test</scope>
++    </dependency>
++  </dependencies>
++  <build>
++    <sourceDirectory>src/main</sourceDirectory>
++    <testSourceDirectory>src/test/unit</testSourceDirectory>
++    <plugins>
++      <plugin>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <source>1.7</source>
++          <target>1.7</target>
++        </configuration>
++      </plugin>
++      <plugin>
++        <artifactId>maven-jar-plugin</artifactId>
++        <executions>
++          <execution>
++            <goals>
++              <goal>test-jar</goal>
++            </goals>
++          </execution>
++        </executions>
++      </plugin>
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <extensions>true</extensions>
++        <configuration>
++          <instructions>
++            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
++            <Bundle-SymbolicName>org.mongodb.bson</Bundle-SymbolicName>
++            <Export-Package>org.bson,org.bson.*</Export-Package>
++            <Import-Package>
++                    javax.xml.bind.*,
++                    org.slf4j;resolution:=optional,
++            </Import-Package>
++            <!-- Do not autogenerate uses clauses in Manifests -->
++            <_nouses>true</_nouses>
++          </instructions>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++</project>
+diff --git a/driver-async/pom.xml b/driver-async/pom.xml
+new file mode 100644
+index 0000000..7771e1b
+--- /dev/null
++++ b/driver-async/pom.xml
+@@ -0,0 +1,107 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.mongodb</groupId>
++    <artifactId>aggregator-project</artifactId>
++    <version>@VERSION@</version>
++  </parent>
++
++  <groupId>org.mongodb</groupId>
++  <artifactId>mongodb-driver-async</artifactId>
++  <version>@VERSION@</version>
++  <name>MongoDB Asynchronous Driver</name>
++  <description>The MongoDB Asynchronous Driver</description>
++  <url>http://www.mongodb.org</url>
++  <packaging>bundle</packaging>
++  <licenses>
++    <license>
++      <name>The Apache Software License, Version 2.0</name>
++      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
++      <distribution>repo</distribution>
++    </license>
++  </licenses>
++  <developers>
++    <developer>
++      <name>Various</name>
++      <organization>MongoDB</organization>
++    </developer>
++  </developers>
++  <scm>
++    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
++    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
++    <url>https://github.com/mongodb/mongo-java-driver</url>
++  </scm>
++  <dependencies>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>bson</artifactId>
++      <version>@VERSION@</version>
++    </dependency>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>mongodb-driver-core</artifactId>
++      <version>@VERSION@</version>
++    </dependency>
++    <dependency>
++      <groupId>io.netty</groupId>
++      <artifactId>netty-transport</artifactId>
++      <version>4.0.26.Final</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.slf4j</groupId>
++      <artifactId>slf4j-api</artifactId>
++      <version>1.7.6</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.12</version>
++      <scope>test</scope>
++    </dependency>
++  </dependencies>
++  <build>
++    <sourceDirectory>src/main</sourceDirectory>
++    <testSourceDirectory>src/test/unit</testSourceDirectory>
++    <plugins>
++      <plugin>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <source>1.7</source>
++          <target>1.7</target>
++        </configuration>
++      </plugin>
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <extensions>true</extensions>
++        <configuration>
++          <instructions>
++            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
++            <Bundle-SymbolicName>org.mongodb.driver-async</Bundle-SymbolicName>
++            <Export-Package>com.mongodb.*</Export-Package>
++            <Import-Package>
++              org.bson.*,
++              javax.crypto.*,
++              javax.crypto.spec.*,
++              javax.management.*,
++              javax.net.*,
++              javax.net.ssl.*,
++              javax.security.sasl.*,
++              javax.security.auth.*,
++              javax.security.auth.callback.*,
++              org.ietf.jgss.*,
++              io.netty.*;resolution:=optional,
++              org.slf4j;resolution:=optional,
++            </Import-Package>
++            <!-- Do not autogenerate uses clauses in Manifests -->
++            <_nouses>true</_nouses>
++          </instructions>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++</project>
+diff --git a/driver-core/pom.xml b/driver-core/pom.xml
+new file mode 100644
+index 0000000..3f6804b
+--- /dev/null
++++ b/driver-core/pom.xml
+@@ -0,0 +1,121 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.mongodb</groupId>
++    <artifactId>aggregator-project</artifactId>
++    <version>@VERSION@</version>
++  </parent>
++  <groupId>org.mongodb</groupId>
++  <artifactId>mongodb-driver-core</artifactId>
++  <version>@VERSION@</version>
++  <name>MongoDB Java Driver Core</name>
++  <description>The Java operations layer for the MongoDB Java Driver. Third parties can ' +
++                                                   'wrap this layer to provide custom higher-level APIs</description>
++  <url>http://www.mongodb.org</url>
++  <packaging>bundle</packaging>
++  <licenses>
++    <license>
++      <name>The Apache Software License, Version 2.0</name>
++      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
++      <distribution>repo</distribution>
++    </license>
++  </licenses>
++  <developers>
++    <developer>
++      <name>Various</name>
++      <organization>MongoDB</organization>
++    </developer>
++  </developers>
++  <scm>
++    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
++    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
++    <url>https://github.com/mongodb/mongo-java-driver</url>
++  </scm>
++  <dependencies>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>bson</artifactId>
++      <version>@VERSION@</version>
++    </dependency>
++    <dependency>
++      <groupId>io.netty</groupId>
++      <artifactId>netty-buffer</artifactId>
++      <version>4.0.26.Final</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>io.netty</groupId>
++      <artifactId>netty-transport</artifactId>
++      <version>4.0.26.Final</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>io.netty</groupId>
++      <artifactId>netty-handler</artifactId>
++      <version>4.0.26.Final</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.slf4j</groupId>
++      <artifactId>slf4j-api</artifactId>
++      <version>1.7.6</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>bson</artifactId>
++      <type>test-jar</type>
++      <version>@VERSION@</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.12</version>
++      <scope>test</scope>
++    </dependency>
++  </dependencies>
++  <build>
++    <sourceDirectory>src/main</sourceDirectory>
++    <testSourceDirectory>src/test/unit</testSourceDirectory>
++    <plugins>
++      <plugin>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <source>1.7</source>
++          <target>1.7</target>
++        </configuration>
++      </plugin>
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <extensions>true</extensions>
++        <configuration>
++          <instructions>
++            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
++            <Bundle-SymbolicName>org.mongodb.driver-core</Bundle-SymbolicName>
++            <Export-Package>com.mongodb.*</Export-Package>
++            <Import-Package>
++              org.bson.*,
++              javax.crypto.*,
++              javax.crypto.spec.*,
++              javax.management.*,
++              javax.net.*,
++              javax.net.ssl.*,
++              javax.security.sasl.*,
++              javax.security.auth.*,
++              javax.security.auth.callback.*,
++              org.ietf.jgss.*,
++              io.netty.*;resolution:=optional,
++              org.slf4j;resolution:=optional,
++            </Import-Package>
++            <!-- Do not autogenerate uses clauses in Manifests -->
++            <_nouses>true</_nouses>
++          </instructions>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++</project>
+diff --git a/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java b/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
+index 047b447..441476e 100644
+--- a/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
++++ b/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
+@@ -14,7 +14,7 @@
+  * limitations under the License.
+  */
+ 
+-package com.mongodb.client;
++package com.mongodb;
+ 
+ import com.mongodb.AuthenticationMechanism;
+ import com.mongodb.ConnectionString;
+diff --git a/driver/pom.xml b/driver/pom.xml
+new file mode 100644
+index 0000000..c2b9606
+--- /dev/null
++++ b/driver/pom.xml
+@@ -0,0 +1,77 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.mongodb</groupId>
++    <artifactId>aggregator-project</artifactId>
++    <version>@VERSION@</version>
++  </parent>
++  <groupId>org.mongodb</groupId>
++  <artifactId>mongodb-driver</artifactId>
++  <version>@VERSION@</version>
++  <name>MongoDB Driver</name>
++  <description>The MongoDB Driver</description>
++  <url>http://www.mongodb.org</url>
++  <licenses>
++    <license>
++      <name>The Apache Software License, Version 2.0</name>
++      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
++      <distribution>repo</distribution>
++    </license>
++  </licenses>
++  <developers>
++    <developer>
++      <name>Various</name>
++      <organization>MongoDB</organization>
++    </developer>
++  </developers>
++  <scm>
++    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
++    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
++    <url>https://github.com/mongodb/mongo-java-driver</url>
++  </scm>
++  <dependencies>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>bson</artifactId>
++      <version>@VERSION@</version>
++    </dependency>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>mongodb-driver-core</artifactId>
++      <version>@VERSION@</version>
++    </dependency>
++    <dependency>
++      <groupId>org.slf4j</groupId>
++      <artifactId>slf4j-api</artifactId>
++      <version>1.7.6</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.12</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++      <groupId>org.hamcrest</groupId>
++      <artifactId>hamcrest-library</artifactId>
++      <version>1.3</version>
++      <scope>test</scope>
++    </dependency>
++  </dependencies>
++  <build>
++    <sourceDirectory>src/main</sourceDirectory>
++    <testSourceDirectory>src/test/unit</testSourceDirectory>
++    <plugins>
++      <plugin>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <source>1.7</source>
++          <target>1.7</target>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++</project>
+diff --git a/mongo-java-driver/pom.xml b/mongo-java-driver/pom.xml
+new file mode 100644
+index 0000000..14092e0
+--- /dev/null
++++ b/mongo-java-driver/pom.xml
+@@ -0,0 +1,133 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.mongodb</groupId>
++    <artifactId>aggregator-project</artifactId>
++    <version>@VERSION@</version>
++  </parent>
++  <groupId>org.mongodb</groupId>
++  <artifactId>mongo-java-driver</artifactId>
++  <version>@VERSION@</version>
++  <name>MongoDB Java Driver</name>
++  <description>The MongoDB Java Driver uber-artifact, containing mongodb-driver, mongodb-driver-core, and bson</description>
++  <url>http://www.mongodb.org</url>
++  <packaging>bundle</packaging>
++  <licenses>
++    <license>
++      <name>The Apache Software License, Version 2.0</name>
++      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
++      <distribution>repo</distribution>
++    </license>
++  </licenses>
++  <developers>
++    <developer>
++      <name>Various</name>
++      <organization>MongoDB</organization>
++    </developer>
++  </developers>
++  <scm>
++    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
++    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
++    <url>https://github.com/mongodb/mongo-java-driver</url>
++  </scm>
++  <dependencies>
++    <dependency>
++      <groupId>io.netty</groupId>
++      <artifactId>netty-buffer</artifactId>
++      <version>4.0.26.Final</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>io.netty</groupId>
++      <artifactId>netty-transport</artifactId>
++      <version>4.0.26.Final</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>io.netty</groupId>
++      <artifactId>netty-handler</artifactId>
++      <version>4.0.26.Final</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.slf4j</groupId>
++      <artifactId>slf4j-api</artifactId>
++      <version>1.7.6</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>mongodb-driver</artifactId>
++      <version>@VERSION@</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>mongodb-driver-core</artifactId>
++      <version>@VERSION@</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.mongodb</groupId>
++      <artifactId>bson</artifactId>
++      <version>@VERSION@</version>
++      <optional>true</optional>
++    </dependency>
++  </dependencies>
++  <build>
++    <plugins>
++      <plugin>
++        <artifactId>maven-shade-plugin</artifactId>
++        <version>2.4.3</version>
++        <executions>
++          <execution>
++            <phase>package</phase>
++            <goals>
++              <goal>shade</goal>
++            </goals>
++          </execution>
++        </executions>
++        <configuration>
++          <artifactSet>
++            <includes>
++              <include>org.mongodb:*</include>
++            </includes>
++          </artifactSet>
++        </configuration>
++      </plugin>
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <extensions>true</extensions>
++        <configuration>
++          <instructions>
++            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
++            <Bundle-SymbolicName>org.mongodb.mongo-java-driver</Bundle-SymbolicName>
++            <Export-Package>
++              com.mongodb.*,
++              org.bson.*,
++            </Export-Package>
++            <Import-Package>
++              javax.xml.bind.*,
++              javax.crypto.*,
++              javax.management.*,
++              javax.naming.*,
++              javax.naming.spi.*,
++              javax.net.*,
++              javax.security.sasl.*,
++              javax.security.auth.*,
++              javax.security.auth.callback.*,
++              org.ietf.jgss.*,
++              io.netty.*;resolution:=optional,
++              org.slf4j;resolution:=optional,
++            </Import-Package>
++            <!-- Do not autogenerate uses clauses in Manifests -->
++            <_nouses>true</_nouses>
++          </instructions>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++</project>
+diff --git a/pom.xml b/pom.xml
+new file mode 100644
+index 0000000..63c6925
+--- /dev/null
++++ b/pom.xml
+@@ -0,0 +1,27 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <groupId>org.mongodb</groupId>
++  <artifactId>aggregator-project</artifactId>
++  <version>@VERSION@</version>
++  <packaging>pom</packaging>
++  <modules>
++    <module>mongo-java-driver</module>
++    <module>bson</module>
++    <module>driver-core</module>
++    <module>driver-async</module>
++    <module>driver</module>
++  </modules>
++  <build>
++    <pluginManagement>
++      <plugins>
++        <plugin>
++          <groupId>org.apache.felix</groupId>
++          <artifactId>maven-bundle-plugin</artifactId>
++          <version>1.4.0</version>
++        </plugin>
++      </plugins>
++    </pluginManagement>
++  </build>
++</project>
+-- 
+2.9.4
+
diff --git a/SOURCES/0002-Netty-update-workaround.patch b/SOURCES/0002-Netty-update-workaround.patch
new file mode 100644
index 0000000..ea68ba4
--- /dev/null
+++ b/SOURCES/0002-Netty-update-workaround.patch
@@ -0,0 +1,26 @@
+From cfc7a97f2ed55bdfea4a54f510ea17039b259644 Mon Sep 17 00:00:00 2001
+From: Tomas Repik <trepik@redhat.com>
+Date: Mon, 3 Jul 2017 18:47:19 +0200
+Subject: [PATCH] Netty update workaround (commit 454cbfe)
+
+---
+ driver-core/src/main/com/mongodb/connection/netty/NettyStream.java | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java b/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
+index 8ef8713..eae9db0 100644
+--- a/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
++++ b/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
+@@ -177,7 +177,8 @@ final class NettyStream implements Stream {
+     public void writeAsync(final List<ByteBuf> buffers, final AsyncCompletionHandler<Void> handler) {
+         CompositeByteBuf composite = PooledByteBufAllocator.DEFAULT.compositeBuffer();
+         for (ByteBuf cur : buffers) {
+-            composite.addComponent(true, ((NettyByteBuf) cur).asByteBuf());
++            composite.addComponent(((NettyByteBuf) cur).asByteBuf());
++            composite.writerIndex(composite.writerIndex() + ((NettyByteBuf) cur).asByteBuf().readableBytes());
+         }
+ 
+         channel.writeAndFlush(composite).addListener(new ChannelFutureListener() {
+-- 
+2.9.4
+
diff --git a/SOURCES/add-maven-support.patch b/SOURCES/add-maven-support.patch
deleted file mode 100644
index af167b5..0000000
--- a/SOURCES/add-maven-support.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-diff --git a/bson/pom.xml b/bson/pom.xml
-new file mode 100644
-index 0000000..4cc39e1
---- /dev/null
-+++ b/bson/pom.xml
-@@ -0,0 +1,66 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.mongodb</groupId>
-+  <artifactId>bson</artifactId>
-+  <version>3.2.1</version>
-+  <name>BSON</name>
-+  <description>The BSON library</description>
-+  <url>http://bsonspec.org</url>
-+  <licenses>
-+    <license>
-+      <name>The Apache Software License, Version 2.0</name>
-+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+  <developers>
-+    <developer>
-+      <name>Various</name>
-+      <organization>MongoDB</organization>
-+    </developer>
-+  </developers>
-+  <scm>
-+    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
-+    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
-+    <url>https://github.com/mongodb/mongo-java-driver</url>
-+  </scm>
-+  <dependencies>
-+    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-api</artifactId>
-+      <version>1.7.6</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>junit</groupId>
-+      <artifactId>junit</artifactId>
-+      <version>4.12</version>
-+      <scope>test</scope>
-+    </dependency>
-+  </dependencies>
-+  <build>
-+    <sourceDirectory>src/main</sourceDirectory>
-+    <testSourceDirectory>src/test/unit</testSourceDirectory>
-+    <plugins>
-+      <plugin>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <source>1.7</source>
-+          <target>1.7</target>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+        <artifactId>maven-jar-plugin</artifactId>
-+        <executions>
-+          <execution>
-+            <goals>
-+              <goal>test-jar</goal>
-+            </goals>
-+          </execution>
-+        </executions>
-+      </plugin>
-+    </plugins>
-+  </build>
-+</project>
-diff --git a/driver-async/pom.xml b/driver-async/pom.xml
-new file mode 100644
-index 0000000..b960af9
---- /dev/null
-+++ b/driver-async/pom.xml
-@@ -0,0 +1,66 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.mongodb</groupId>
-+  <artifactId>mongodb-driver-async</artifactId>
-+  <version>3.2.1</version>
-+  <name>MongoDB Asynchronous Driver</name>
-+  <description>The MongoDB Asynchronous Driver</description>
-+  <url>http://www.mongodb.org</url>
-+  <licenses>
-+    <license>
-+      <name>The Apache Software License, Version 2.0</name>
-+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+  <developers>
-+    <developer>
-+      <name>Various</name>
-+      <organization>MongoDB</organization>
-+    </developer>
-+  </developers>
-+  <scm>
-+    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
-+    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
-+    <url>https://github.com/mongodb/mongo-java-driver</url>
-+  </scm>
-+  <dependencies>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>bson</artifactId>
-+      <version>3.2.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>mongodb-driver-core</artifactId>
-+      <version>3.2.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-api</artifactId>
-+      <version>1.7.6</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>junit</groupId>
-+      <artifactId>junit</artifactId>
-+      <version>4.12</version>
-+      <scope>test</scope>
-+    </dependency>
-+  </dependencies>
-+  <build>
-+    <sourceDirectory>src/main</sourceDirectory>
-+    <testSourceDirectory>src/test/unit</testSourceDirectory>
-+    <plugins>
-+      <plugin>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <source>1.7</source>
-+          <target>1.7</target>
-+        </configuration>
-+      </plugin>
-+    </plugins>
-+  </build>
-+</project>
-diff --git a/driver-core/pom.xml b/driver-core/pom.xml
-new file mode 100644
-index 0000000..271265d
---- /dev/null
-+++ b/driver-core/pom.xml
-@@ -0,0 +1,87 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.mongodb</groupId>
-+  <artifactId>mongodb-driver-core</artifactId>
-+  <version>3.2.1</version>
-+  <name>MongoDB Java Driver Core</name>
-+  <description>The Java operations layer for the MongoDB Java Driver. Third parties can ' +
-+                                                   'wrap this layer to provide custom higher-level APIs</description>
-+  <url>http://www.mongodb.org</url>
-+  <licenses>
-+    <license>
-+      <name>The Apache Software License, Version 2.0</name>
-+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+  <developers>
-+    <developer>
-+      <name>Various</name>
-+      <organization>MongoDB</organization>
-+    </developer>
-+  </developers>
-+  <scm>
-+    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
-+    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
-+    <url>https://github.com/mongodb/mongo-java-driver</url>
-+  </scm>
-+  <dependencies>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>bson</artifactId>
-+      <version>3.2.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>io.netty</groupId>
-+      <artifactId>netty-buffer</artifactId>
-+      <version>4.0.26.Final</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>io.netty</groupId>
-+      <artifactId>netty-transport</artifactId>
-+      <version>4.0.26.Final</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>io.netty</groupId>
-+      <artifactId>netty-handler</artifactId>
-+      <version>4.0.26.Final</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-api</artifactId>
-+      <version>1.7.6</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>bson</artifactId>
-+      <type>test-jar</type>
-+      <version>3.2.1</version>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>junit</groupId>
-+      <artifactId>junit</artifactId>
-+      <version>4.12</version>
-+      <scope>test</scope>
-+    </dependency>
-+  </dependencies>
-+  <build>
-+    <sourceDirectory>src/main</sourceDirectory>
-+    <testSourceDirectory>src/test/unit</testSourceDirectory>
-+    <plugins>
-+      <plugin>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <source>1.7</source>
-+          <target>1.7</target>
-+        </configuration>
-+      </plugin>
-+    </plugins>
-+  </build>
-+</project>
-diff --git a/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java b/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
-index 047b447..441476e 100644
---- a/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
-+++ b/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
-@@ -14,7 +14,7 @@
-  * limitations under the License.
-  */
- 
--package com.mongodb.client;
-+package com.mongodb;
- 
- import com.mongodb.AuthenticationMechanism;
- import com.mongodb.ConnectionString;
-diff --git a/driver/pom.xml b/driver/pom.xml
-new file mode 100644
-index 0000000..27dde69
---- /dev/null
-+++ b/driver/pom.xml
-@@ -0,0 +1,72 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.mongodb</groupId>
-+  <artifactId>mongodb-driver</artifactId>
-+  <version>3.2.1</version>
-+  <name>MongoDB Driver</name>
-+  <description>The MongoDB Driver</description>
-+  <url>http://www.mongodb.org</url>
-+  <licenses>
-+    <license>
-+      <name>The Apache Software License, Version 2.0</name>
-+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+  <developers>
-+    <developer>
-+      <name>Various</name>
-+      <organization>MongoDB</organization>
-+    </developer>
-+  </developers>
-+  <scm>
-+    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
-+    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
-+    <url>https://github.com/mongodb/mongo-java-driver</url>
-+  </scm>
-+  <dependencies>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>bson</artifactId>
-+      <version>3.2.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>mongodb-driver-core</artifactId>
-+      <version>3.2.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-api</artifactId>
-+      <version>1.7.6</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>junit</groupId>
-+      <artifactId>junit</artifactId>
-+      <version>4.12</version>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.hamcrest</groupId>
-+      <artifactId>hamcrest-library</artifactId>
-+      <version>1.3</version>
-+      <scope>test</scope>
-+    </dependency>
-+  </dependencies>
-+  <build>
-+    <sourceDirectory>src/main</sourceDirectory>
-+    <testSourceDirectory>src/test/unit</testSourceDirectory>
-+    <plugins>
-+      <plugin>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <source>1.7</source>
-+          <target>1.7</target>
-+        </configuration>
-+      </plugin>
-+    </plugins>
-+  </build>
-+</project>
-diff --git a/mongo-java-driver/pom.xml b/mongo-java-driver/pom.xml
-new file mode 100644
-index 0000000..844fcd8
---- /dev/null
-+++ b/mongo-java-driver/pom.xml
-@@ -0,0 +1,96 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.mongodb</groupId>
-+  <artifactId>mongo-java-driver</artifactId>
-+  <version>3.2.1</version>
-+  <name>MongoDB Java Driver</name>
-+  <description>The MongoDB Java Driver uber-artifact, containing mongodb-driver, mongodb-driver-core, and bson</description>
-+  <url>http://www.mongodb.org</url>
-+  <licenses>
-+    <license>
-+      <name>The Apache Software License, Version 2.0</name>
-+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-+      <distribution>repo</distribution>
-+    </license>
-+  </licenses>
-+  <developers>
-+    <developer>
-+      <name>Various</name>
-+      <organization>MongoDB</organization>
-+    </developer>
-+  </developers>
-+  <scm>
-+    <connection>scm:https://github.com/mongodb/mongo-java-driver.git</connection>
-+    <developerConnection>scm:git@github.com:mongodb/mongo-java-driver.git</developerConnection>
-+    <url>https://github.com/mongodb/mongo-java-driver</url>
-+  </scm>
-+  <dependencies>
-+    <dependency>
-+      <groupId>io.netty</groupId>
-+      <artifactId>netty-buffer</artifactId>
-+      <version>4.0.26.Final</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>io.netty</groupId>
-+      <artifactId>netty-transport</artifactId>
-+      <version>4.0.26.Final</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>io.netty</groupId>
-+      <artifactId>netty-handler</artifactId>
-+      <version>4.0.26.Final</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-api</artifactId>
-+      <version>1.7.6</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>mongodb-driver</artifactId>
-+      <version>3.2.1</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>mongodb-driver-core</artifactId>
-+      <version>3.2.1</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.mongodb</groupId>
-+      <artifactId>bson</artifactId>
-+      <version>3.2.1</version>
-+      <optional>true</optional>
-+    </dependency>
-+  </dependencies>
-+  <build>
-+    <plugins>
-+      <plugin>
-+        <artifactId>maven-shade-plugin</artifactId>
-+        <version>2.4.3</version>
-+        <executions>
-+          <execution>
-+            <phase>package</phase>
-+            <goals>
-+              <goal>shade</goal>
-+            </goals>
-+          </execution>
-+        </executions>
-+        <configuration>
-+          <artifactSet>
-+            <includes>
-+              <include>org.mongodb:*</include>
-+            </includes>
-+          </artifactSet>
-+        </configuration>
-+      </plugin>
-+    </plugins>
-+  </build>
-+</project>
-diff --git a/pom.xml b/pom.xml
-new file mode 100644
-index 0000000..64f1e56
---- /dev/null
-+++ b/pom.xml
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <groupId>org.mongodb</groupId>
-+  <artifactId>aggregator-project</artifactId>
-+  <version>3.2.1</version>
-+  <packaging>pom</packaging>
-+  <modules>
-+    <module>mongo-java-driver</module>
-+    <module>bson</module>
-+    <module>driver-core</module>
-+    <module>driver-async</module>
-+    <module>driver</module>
-+  </modules>
-+</project>
diff --git a/SOURCES/add-osgi-metadata-maven.patch b/SOURCES/add-osgi-metadata-maven.patch
deleted file mode 100644
index 7301cc2..0000000
--- a/SOURCES/add-osgi-metadata-maven.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-diff --git a/mongo-java-driver-r3.2.1/bson/pom.xml b/mongo-java-driver-r3.2.1/bson/pom.xml
-index 4cc39e1..ee387fe 100644
---- a/mongo-java-driver-r3.2.1/bson/pom.xml
-+++ b/mongo-java-driver-r3.2.1/bson/pom.xml
-@@ -2,12 +2,18 @@
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <modelVersion>4.0.0</modelVersion>
-+  <parent>
-+    <groupId>org.mongodb</groupId>
-+    <artifactId>aggregator-project</artifactId>
-+    <version>3.2.1</version>
-+  </parent>
-   <groupId>org.mongodb</groupId>
-   <artifactId>bson</artifactId>
-   <version>3.2.1</version>
-   <name>BSON</name>
-   <description>The BSON library</description>
-   <url>http://bsonspec.org</url>
-+  <packaging>bundle</packaging>
-   <licenses>
-     <license>
-       <name>The Apache Software License, Version 2.0</name>
-@@ -61,6 +67,24 @@
-           </execution>
-         </executions>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <extensions>true</extensions>
-+        <configuration>
-+          <instructions>
-+            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-+            <Bundle-SymbolicName>org.mongodb.bson</Bundle-SymbolicName>
-+            <Export-Package>org.bson,org.bson.*</Export-Package>
-+            <Import-Package>
-+                    javax.xml.bind.*,
-+                    org.slf4j;resolution:=optional,
-+            </Import-Package>
-+            <!-- Do not autogenerate uses clauses in Manifests -->
-+            <_nouses>true</_nouses>
-+          </instructions>
-+        </configuration>
-+      </plugin>
-     </plugins>
-   </build>
- </project>
-diff --git a/mongo-java-driver-r3.2.1/driver-async/pom.xml b/mongo-java-driver-r3.2.1/driver-async/pom.xml
-index b960af9..9478ee4 100644
---- a/mongo-java-driver-r3.2.1/driver-async/pom.xml
-+++ b/mongo-java-driver-r3.2.1/driver-async/pom.xml
-@@ -2,12 +2,19 @@
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <modelVersion>4.0.0</modelVersion>
-+  <parent>
-+    <groupId>org.mongodb</groupId>
-+    <artifactId>aggregator-project</artifactId>
-+    <version>3.2.1</version>
-+  </parent>
-+
-   <groupId>org.mongodb</groupId>
-   <artifactId>mongodb-driver-async</artifactId>
-   <version>3.2.1</version>
-   <name>MongoDB Asynchronous Driver</name>
-   <description>The MongoDB Asynchronous Driver</description>
-   <url>http://www.mongodb.org</url>
-+  <packaging>bundle</packaging>
-   <licenses>
-     <license>
-       <name>The Apache Software License, Version 2.0</name>
-@@ -61,6 +68,33 @@
-           <target>1.7</target>
-         </configuration>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <extensions>true</extensions>
-+        <configuration>
-+          <instructions>
-+            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-+            <Bundle-SymbolicName>org.mongodb.driver-async</Bundle-SymbolicName>
-+            <Export-Package>com.mongodb.*</Export-Package>
-+            <Import-Package>
-+              org.bson.*,
-+              javax.crypto.*,
-+              javax.crypto.spec.*,
-+              javax.management.*,
-+              javax.net.*,
-+              javax.net.ssl.*,
-+              javax.security.sasl.*,
-+              javax.security.auth.callback.*,
-+              org.ietf.jgss.*,
-+              io.netty.*;resolution:=optional,
-+              org.slf4j;resolution:=optional,
-+            </Import-Package>
-+            <!-- Do not autogenerate uses clauses in Manifests -->
-+            <_nouses>true</_nouses>
-+          </instructions>
-+        </configuration>
-+      </plugin>
-     </plugins>
-   </build>
- </project>
-diff --git a/mongo-java-driver-r3.2.1/driver-core/pom.xml b/mongo-java-driver-r3.2.1/driver-core/pom.xml
-index 271265d..3f5826b 100644
---- a/mongo-java-driver-r3.2.1/driver-core/pom.xml
-+++ b/mongo-java-driver-r3.2.1/driver-core/pom.xml
-@@ -2,6 +2,11 @@
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <modelVersion>4.0.0</modelVersion>
-+  <parent>
-+    <groupId>org.mongodb</groupId>
-+    <artifactId>aggregator-project</artifactId>
-+    <version>3.2.1</version>
-+  </parent>
-   <groupId>org.mongodb</groupId>
-   <artifactId>mongodb-driver-core</artifactId>
-   <version>3.2.1</version>
-@@ -9,6 +14,7 @@
-   <description>The Java operations layer for the MongoDB Java Driver. Third parties can ' +
-                                                    'wrap this layer to provide custom higher-level APIs</description>
-   <url>http://www.mongodb.org</url>
-+  <packaging>bundle</packaging>
-   <licenses>
-     <license>
-       <name>The Apache Software License, Version 2.0</name>
-@@ -82,6 +88,33 @@
-           <target>1.7</target>
-         </configuration>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <extensions>true</extensions>
-+        <configuration>
-+          <instructions>
-+            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-+            <Bundle-SymbolicName>org.mongodb.driver-core</Bundle-SymbolicName>
-+            <Export-Package>com.mongodb.*</Export-Package>
-+            <Import-Package>
-+              org.bson.*,
-+              javax.crypto.*,
-+              javax.crypto.spec.*,
-+              javax.management.*,
-+              javax.net.*,
-+              javax.net.ssl.*,
-+              javax.security.sasl.*,
-+              javax.security.auth.callback.*,
-+              org.ietf.jgss.*,
-+              io.netty.*;resolution:=optional,
-+              org.slf4j;resolution:=optional,
-+            </Import-Package>
-+            <!-- Do not autogenerate uses clauses in Manifests -->
-+            <_nouses>true</_nouses>
-+          </instructions>
-+        </configuration>
-+      </plugin>
-     </plugins>
-   </build>
- </project>
-diff --git a/mongo-java-driver-r3.2.1/driver/pom.xml b/mongo-java-driver-r3.2.1/driver/pom.xml
-index 27dde69..7793c7a 100644
---- a/mongo-java-driver-r3.2.1/driver/pom.xml
-+++ b/mongo-java-driver-r3.2.1/driver/pom.xml
-@@ -2,6 +2,11 @@
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <modelVersion>4.0.0</modelVersion>
-+  <parent>
-+    <groupId>org.mongodb</groupId>
-+    <artifactId>aggregator-project</artifactId>
-+    <version>3.2.1</version>
-+  </parent>
-   <groupId>org.mongodb</groupId>
-   <artifactId>mongodb-driver</artifactId>
-   <version>3.2.1</version>
-diff --git a/mongo-java-driver-r3.2.1/mongo-java-driver/pom.xml b/mongo-java-driver-r3.2.1/mongo-java-driver/pom.xml
-index 844fcd8..342218e 100644
---- a/mongo-java-driver-r3.2.1/mongo-java-driver/pom.xml
-+++ b/mongo-java-driver-r3.2.1/mongo-java-driver/pom.xml
-@@ -2,12 +2,18 @@
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <modelVersion>4.0.0</modelVersion>
-+  <parent>
-+    <groupId>org.mongodb</groupId>
-+    <artifactId>aggregator-project</artifactId>
-+    <version>3.2.1</version>
-+  </parent>
-   <groupId>org.mongodb</groupId>
-   <artifactId>mongo-java-driver</artifactId>
-   <version>3.2.1</version>
-   <name>MongoDB Java Driver</name>
-   <description>The MongoDB Java Driver uber-artifact, containing mongodb-driver, mongodb-driver-core, and bson</description>
-   <url>http://www.mongodb.org</url>
-+  <packaging>bundle</packaging>
-   <licenses>
-     <license>
-       <name>The Apache Software License, Version 2.0</name>
-@@ -91,6 +97,34 @@
-           </artifactSet>
-         </configuration>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <extensions>true</extensions>
-+        <configuration>
-+          <instructions>
-+            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-+            <Bundle-SymbolicName>org.mongodb.mongo-java-driver</Bundle-SymbolicName>
-+            <Export-Package>
-+              com.mongodb.*,
-+              org.bson.*,
-+            </Export-Package>
-+            <Import-Package>
-+              javax.xml.bind.*,
-+              javax.crypto.*,
-+              javax.management.*,
-+              javax.net.*,
-+              javax.security.sasl.*,
-+              javax.security.auth.callback.*,
-+              org.ietf.jgss.*,
-+              io.netty.*;resolution:=optional,
-+              org.slf4j;resolution:=optional,
-+            </Import-Package>
-+            <!-- Do not autogenerate uses clauses in Manifests -->
-+            <_nouses>true</_nouses>
-+          </instructions>
-+        </configuration>
-+      </plugin>
-     </plugins>
-   </build>
- </project>
-diff --git a/mongo-java-driver-r3.2.1/pom.xml b/mongo-java-driver-r3.2.1/pom.xml
-index 64f1e56..eb97e32 100644
---- a/mongo-java-driver-r3.2.1/pom.xml
-+++ b/mongo-java-driver-r3.2.1/pom.xml
-@@ -13,4 +13,15 @@
-     <module>driver-async</module>
-     <module>driver</module>
-   </modules>
-+  <build>
-+    <pluginManagement>
-+      <plugins>
-+        <plugin>
-+          <groupId>org.apache.felix</groupId>
-+          <artifactId>maven-bundle-plugin</artifactId>
-+          <version>1.4.0</version>
-+        </plugin>
-+      </plugins>
-+    </pluginManagement>
-+  </build>
- </project>
diff --git a/SPECS/mongo-java-driver.spec b/SPECS/mongo-java-driver.spec
index d4f8b14..bb5deee 100644
--- a/SPECS/mongo-java-driver.spec
+++ b/SPECS/mongo-java-driver.spec
@@ -9,7 +9,7 @@
 %global buildscls %{scl_maven} %{scl}
 
 Name:		%{?scl_prefix}mongo-java-driver
-Version:	3.2.1
+Version:	3.5.0
 Release:	3%{?dist}
 Summary:	A Java driver for MongoDB
 
@@ -19,12 +19,11 @@ License:	ASL 2.0
 URL:		http://www.mongodb.org/display/DOCS/Java+Language+Center
 Source0:	https://github.com/mongodb/%{pkg_name}/archive/r%{version}.tar.gz
 
-Patch1:         add-maven-support.patch
-Patch2:         add-osgi-metadata-maven.patch
+Patch0:         0001-Maven-support.patch
+Patch1:         0002-Netty-update-workaround.patch
 
-%{!?scl:
-BuildRequires:	java-devel
-}
+# since 3.4.2 Java 8 is required
+BuildRequires:	java-1.8.0-openjdk-devel
 BuildRequires:  %{?scl_prefix_maven}maven-local
 BuildRequires:  %{?scl_prefix_java_common}mvn(io.netty:netty-buffer)
 BuildRequires:  %{?scl_prefix_java_common}mvn(io.netty:netty-transport)
@@ -32,7 +31,7 @@ BuildRequires:  %{?scl_prefix_java_common}mvn(io.netty:netty-handler)
 BuildRequires:  %{?scl_prefix_java_common}mvn(org.slf4j:slf4j-api)
 BuildRequires:  %{?scl_prefix_java_common}mvn(org.hamcrest:hamcrest-library)
 BuildRequires:  %{?scl_prefix_maven}mvn(org.apache.maven.plugins:maven-shade-plugin)
-
+BuildRequires:  %{?scl_prefix_maven}mvn(org.apache.felix:maven-bundle-plugin)
 
 %description
 This is the Java driver for MongoDB.
@@ -69,7 +68,6 @@ parties can wrap this layer to provide custom higher-level APIs
 Summary:	The MongoDB Java Async Driver
 Group:		Development/Libraries
 
-
 %description driver-async
 The MongoDB Asynchronous Driver.
 
@@ -84,8 +82,10 @@ This package contains the API documentation for %{name}.
 %{?scl:scl enable %{buildscls} - << "EOF"}
 %setup -qn %{pkg_name}-r%{version}
 
+%patch0 -p1
 %patch1 -p1
-%patch2 -p2
+
+sed -i 's/@VERSION@/%{version}/g' `find -name pom.xml`
 
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
@@ -103,14 +103,16 @@ set -ex
 %mvn_file org.mongodb:mongodb-driver:* %{pkg_name}/driver
 %{?scl:EOF}
 
+
 %build
 %{?scl:scl enable %{buildscls} - << "EOF"}
 set -ex
 export MAVEN_OPTS="-Xmx2048m"
+# not very nice hack needed in RHEL6
+export JAVA_HOME="/usr/lib/jvm/java-1.8.0"
 %mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 %{?scl:EOF}
 
-
 %install
 %{?scl:scl enable %{buildscls} - << "EOF"}
 set -ex
@@ -122,13 +124,15 @@ set -ex
 
 %files bson -f .mfiles-%{pkg_name}-bson
 %doc README.md LICENSE.txt
-%dir %{_mavenpomdir}/%{pkg_name}
-%dir %{_datadir}/java/%{pkg_name}
+%dir %{_datadir}/java/mongo-java-driver
 %dir %{_datadir}/maven-metadata
+%dir %{_datadir}/maven-poms/mongo-java-driver
 
 %files driver -f .mfiles-%{pkg_name}-driver
+%doc README.md LICENSE.txt
 
 %files driver-core -f .mfiles-%{pkg_name}-driver-core
+%doc README.md LICENSE.txt
 
 %files driver-async -f .mfiles-%{pkg_name}-driver-async
 
@@ -137,6 +141,18 @@ set -ex
 
 
 %changelog
+* Mon Oct 02 2017 Marek Skalický <mskalick@redhat.com> - 3.5.0-3
+- Fix directory ownership
+  Resolves: RHBZ#1466860
+
+* Fri Sep 22 2017 Marek Skalický <mskalick@redhat.com> - 3.5.0-2
+- Update to latest upstream version
+  Resolves: RHBZ#1466860
+
+* Mon Jul 03 2017 Tomas Repik <trepik@redhat.com> - 3.4.2-1
+- Update to 3.4.2
+  Resolves: RHBZ#1466860
+
 * Tue Mar 29 2016 Severin Gehwolf <sgehwolf@redhat.com> - 3.2.1-3
 - Add basic OSGi metadata.