From f0fa6bc1ce94aa6e866804a1d06945849d2501a0 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: May 18 2017 11:49:32 +0000 Subject: Update to latest upstream 3.4.2 release. Resolves: RHBZ#1438088 --- diff --git a/.gitignore b/.gitignore index b252fd4..78dd8c1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /r2.13.2.tar.gz /r3.2.1.tar.gz /mongo-java-driver-r3.2.1 +/r3.4.2.tar.gz +/mongo-java-driver-r3.4.2 diff --git a/mongo-java-driver-gradle-local-fixes.patch b/mongo-java-driver-gradle-local-fixes.patch index 3623caa..909fe1c 100644 --- a/mongo-java-driver-gradle-local-fixes.patch +++ b/mongo-java-driver-gradle-local-fixes.patch @@ -1,8 +1,8 @@ -diff --git a/mongo-java-driver-r3.2.1/bson/build.gradle b/mongo-java-driver-r3.2.1/bson/build.gradle -index 9eb2441..d6ace64 100644 ---- a/mongo-java-driver-r3.2.1/bson/build.gradle -+++ b/mongo-java-driver-r3.2.1/bson/build.gradle -@@ -15,17 +15,10 @@ +diff --git a/mongo-java-driver-r3.4.2/bson/build.gradle b/mongo-java-driver-r3.4.2/bson/build.gradle +index 24e594c..9c8a8fc 100644 +--- a/mongo-java-driver-r3.4.2/bson/build.gradle ++++ b/mongo-java-driver-r3.4.2/bson/build.gradle +@@ -15,30 +15,19 @@ */ apply plugin: 'osgi' @@ -16,11 +16,13 @@ index 9eb2441..d6ace64 100644 - baseline 'org.mongodb:bson:3.2.0' - failOnErrors = true -} -- + jar { manifest { +- instruction 'Build-Version', getGitVersion() instruction 'Import-Package', -@@ -34,10 +27,6 @@ jar { + 'javax.xml.bind.*', + 'org.slf4j;resolution:=optional' } } @@ -33,10 +35,10 @@ index 9eb2441..d6ace64 100644 +sourceSets { + main { java.srcDirs = ['src/main'] } } -diff --git a/mongo-java-driver-r3.2.1/build.gradle b/mongo-java-driver-r3.2.1/build.gradle -index 87a3f7c..8fdfca5 100644 ---- a/mongo-java-driver-r3.2.1/build.gradle -+++ b/mongo-java-driver-r3.2.1/build.gradle +diff --git a/mongo-java-driver-r3.4.2/build.gradle b/mongo-java-driver-r3.4.2/build.gradle +index 475937d..b97425e 100644 +--- a/mongo-java-driver-r3.4.2/build.gradle ++++ b/mongo-java-driver-r3.4.2/build.gradle @@ -27,11 +27,6 @@ buildscript { mavenCentral() mavenLocal() @@ -66,10 +68,23 @@ index 87a3f7c..8fdfca5 100644 } /* Compiling */ -@@ -111,139 +105,6 @@ configure(subprojects.findAll { it.name != 'util' }) { +@@ -131,152 +125,7 @@ configure(subprojects.findAll { it.name != 'util' }) { } } +-def getGitVersion() { +- def outputAsString +- new ByteArrayOutputStream().withStream { os -> +- def result = exec { +- executable 'git' +- args 'describe', '--tags', '--always', '--dirty' +- standardOutput = os +- } +- outputAsString = os.toString().substring(1).trim() +- } +- return outputAsString +-} +- -configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driver' }) { - apply plugin: 'checkstyle' - apply plugin: 'findbugs' @@ -148,7 +163,7 @@ index 87a3f7c..8fdfca5 100644 - } - - jacoco { enabled = false } -- + - beforeTest { descr -> - logger.info("[Test ${descr.className} > ${descr.name}]") - } @@ -206,16 +221,16 @@ index 87a3f7c..8fdfca5 100644 task docs(type: Javadoc) { source subprojects.grep({ it.name != 'util' }).collect {project -> project.sourceSets.main.allJava } -@@ -268,5 +129,4 @@ gradle.buildFinished { BuildResult result -> +@@ -301,5 +150,4 @@ gradle.buildFinished { BuildResult result -> } } -apply from: 'gradle/deploy.gradle' -diff --git a/mongo-java-driver-r3.2.1/driver-async/build.gradle b/mongo-java-driver-r3.2.1/driver-async/build.gradle +diff --git a/mongo-java-driver-r3.4.2/driver-async/build.gradle b/mongo-java-driver-r3.4.2/driver-async/build.gradle index 67c3f14..6b22a90 100644 ---- a/mongo-java-driver-r3.2.1/driver-async/build.gradle -+++ b/mongo-java-driver-r3.2.1/driver-async/build.gradle +--- a/mongo-java-driver-r3.4.2/driver-async/build.gradle ++++ b/mongo-java-driver-r3.4.2/driver-async/build.gradle @@ -15,7 +15,6 @@ */ @@ -248,11 +263,11 @@ index 67c3f14..6b22a90 100644 +sourceSets { + main { java.srcDirs = ['src/main'] } } -diff --git a/mongo-java-driver-r3.2.1/driver-core/build.gradle b/mongo-java-driver-r3.2.1/driver-core/build.gradle -index cddae6e..aa6228d 100644 ---- a/mongo-java-driver-r3.2.1/driver-core/build.gradle -+++ b/mongo-java-driver-r3.2.1/driver-core/build.gradle -@@ -15,23 +15,16 @@ +diff --git a/mongo-java-driver-r3.4.2/driver-core/build.gradle b/mongo-java-driver-r3.4.2/driver-core/build.gradle +index 851fb74..aa6228d 100644 +--- a/mongo-java-driver-r3.4.2/driver-core/build.gradle ++++ b/mongo-java-driver-r3.4.2/driver-core/build.gradle +@@ -15,30 +15,22 @@ */ apply plugin: 'osgi' @@ -279,7 +294,14 @@ index cddae6e..aa6228d 100644 testCompile project(':bson').sourceSets.test.output } -@@ -53,11 +46,6 @@ jar { + + jar { + manifest { +- instruction 'Build-Version', getGitVersion() + instruction 'Import-Package', + 'org.bson.*', // unfortunate that this is necessary, but if it's left out then it's not included + 'javax.crypto.*', +@@ -54,11 +46,6 @@ jar { } } @@ -293,10 +315,10 @@ index cddae6e..aa6228d 100644 +sourceSets { + main { java.srcDirs = ['src/main'] } } -diff --git a/mongo-java-driver-r3.2.1/driver/build.gradle b/mongo-java-driver-r3.2.1/driver/build.gradle +diff --git a/mongo-java-driver-r3.4.2/driver/build.gradle b/mongo-java-driver-r3.4.2/driver/build.gradle index 43391f8..31922a5 100644 ---- a/mongo-java-driver-r3.2.1/driver/build.gradle -+++ b/mongo-java-driver-r3.2.1/driver/build.gradle +--- a/mongo-java-driver-r3.4.2/driver/build.gradle ++++ b/mongo-java-driver-r3.4.2/driver/build.gradle @@ -14,8 +14,6 @@ * limitations under the License. */ @@ -330,10 +352,10 @@ index 43391f8..31922a5 100644 +sourceSets { + main { java.srcDirs = ['src/main'] } } -diff --git a/mongo-java-driver-r3.2.1/mongo-java-driver/build.gradle b/mongo-java-driver-r3.2.1/mongo-java-driver/build.gradle -index f6d86d4..7f83388 100644 ---- a/mongo-java-driver-r3.2.1/mongo-java-driver/build.gradle -+++ b/mongo-java-driver-r3.2.1/mongo-java-driver/build.gradle +diff --git a/mongo-java-driver-r3.4.2/mongo-java-driver/build.gradle b/mongo-java-driver-r3.4.2/mongo-java-driver/build.gradle +index 336db8c..99c0a1e 100644 +--- a/mongo-java-driver-r3.4.2/mongo-java-driver/build.gradle ++++ b/mongo-java-driver-r3.4.2/mongo-java-driver/build.gradle @@ -29,9 +29,9 @@ idea { // dependencies copied from driver-core @@ -347,7 +369,15 @@ index f6d86d4..7f83388 100644 } // srcDirs copied as well, so everything is compiled twice -@@ -59,12 +59,5 @@ jar { +@@ -46,7 +46,6 @@ sourceSets { + // copied from driver-core + jar { + manifest { +- instruction 'Build-Version', getGitVersion() + instruction 'Import-Package', + 'javax.xml.bind.*', + 'javax.crypto.*', +@@ -61,12 +60,4 @@ jar { 'io.netty.*;resolution:=optional', 'org.slf4j;resolution:=optional' } @@ -360,11 +390,10 @@ index f6d86d4..7f83388 100644 - url 'http://www.mongodb.org' - } } -+ -diff --git a/mongo-java-driver-r3.2.1/util/build.gradle b/mongo-java-driver-r3.2.1/util/build.gradle +diff --git a/mongo-java-driver-r3.4.2/util/build.gradle b/mongo-java-driver-r3.4.2/util/build.gradle index ba3d0e4..da4b4c7 100644 ---- a/mongo-java-driver-r3.2.1/util/build.gradle -+++ b/mongo-java-driver-r3.2.1/util/build.gradle +--- a/mongo-java-driver-r3.4.2/util/build.gradle ++++ b/mongo-java-driver-r3.4.2/util/build.gradle @@ -19,6 +19,9 @@ apply plugin: 'java' sourceCompatibility = '1.6' targetCompatibility = '1.6' diff --git a/mongo-java-driver.spec b/mongo-java-driver.spec index 8a476b1..055228e 100644 --- a/mongo-java-driver.spec +++ b/mongo-java-driver.spec @@ -7,8 +7,8 @@ %endif Name: %{?scl_prefix}mongo-java-driver -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Summary: A Java driver for MongoDB Group: Development/Libraries @@ -148,6 +148,9 @@ set -ex %doc README.md LICENSE.txt %changelog +* Thu May 11 2017 Joshua Matsuoka - 3.4.2-1 +- Upgrade to upstream 3.4.2 version. + * Fri Feb 10 2017 Fedora Release Engineering - 3.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 11d5314..9272133 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -459a4c53ec716c1cd47cc3390dbd0732 r3.2.1.tar.gz +SHA512 (r3.4.2.tar.gz) = 85826d5f23573be70cfd639d61dbfbaa38562c7cf48223fa7453f3155e827de5ef41fcae891968d5e99318c73c51ecde3d5159ec6171a12d24019c692b9ec89f