Pulled this up (adding CHANGES.txt) to release-2.22-branch. Unless proven otherwise, I think the CXF issue is not an actual problem; it sounds like human error (failure to do ant clean-core-deps). So I will spin a new RC.
Karl On Wed, Apr 27, 2022 at 8:46 AM <piergior...@apache.org> wrote: > Author: piergiorgio > Date: Wed Apr 27 12:46:26 2022 > New Revision: 1900317 > > URL: http://svn.apache.org/viewvc?rev=1900317&view=rev > Log: > fix for the build process of MongoDB Output Connector: updated > dependencies and changed some deprecated methods (CONNECTORS-1708) > > Modified: > manifoldcf/trunk/build.xml > manifoldcf/trunk/connectors/mongodb/build.xml > > manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java > > manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java > manifoldcf/trunk/connectors/mongodb/pom.xml > > Modified: manifoldcf/trunk/build.xml > URL: > http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1900317&r1=1900316&r2=1900317&view=diff > > ============================================================================== > --- manifoldcf/trunk/build.xml (original) > +++ manifoldcf/trunk/build.xml Wed Apr 27 12:46:26 2022 > @@ -37,7 +37,7 @@ > <property name="httpcore.version" value="4.4.15"/> > <property name="xerces.version" value="2.10.0"/> > <property name="zookeeper.version" value="3.4.10"/> > - <property name="mongodb.version" value="2.11.3"/> > + <property name="mongodb.version" value="2.14.3"/> > <property name="postgresql.version" value="42.1.3"/> > <property name="axis.version" value="1.4"/> > <property name="saaj-api.version" value="1.3"/> > > Modified: manifoldcf/trunk/connectors/mongodb/build.xml > URL: > http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/mongodb/build.xml?rev=1900317&r1=1900316&r2=1900317&view=diff > > ============================================================================== > --- manifoldcf/trunk/connectors/mongodb/build.xml (original) > +++ manifoldcf/trunk/connectors/mongodb/build.xml Wed Apr 27 12:46:26 2022 > @@ -60,23 +60,35 @@ > </antcall> > </target> > > - <property name="embedded-mongodb.version.label" value="2.2.0"/> > + <property name="embedded-mongodb.version.label" value="3.4.5"/> > <property name="embedded-mongodb.artifactId" > value="de.flapdoodle.embed.mongo"/> > <property name="embedded-mongodb-package" > value="de/flapdoodle/embed"/> > <property name="embedded-mongodb.snapshot-jar" > value="${embedded-mongodb.artifactId}-${embedded-mongodb.version.label}.jar"/> > > - <property name="embedded-mongodb.process.version.label" > value="2.0.5"/> > + <property name="embedded-mongodb.process.version.label" > value="3.1.10"/> > <property name="embedded-mongodb.process.artifactId" > value="de.flapdoodle.embed.process"/> > <property name="embedded-mongodb.process-package" > value="de/flapdoodle/embed"/> > <property name="embedded-mongodb.process.jar" > value="${embedded-mongodb.process.artifactId}-${embedded-mongodb.process.version.label}.jar"/> > > + <property name="embedded-mongodb.packageresolver.version.label" > value="1.0.3"/> > + <property name="embedded-mongodb.packageresolver.artifactId" > value="de.flapdoodle.embed.mongo.packageresolver"/> > + <property name="embedded-mongodb-packageresolver-package" > value="de/flapdoodle/embed"/> > + <property name="embedded-mongodb.packageresolver.jar" > value="${embedded-mongodb.packageresolver.artifactId}-${embedded-mongodb.packageresolver.version.label}.jar"/> > + > + <property name="embedded-mongodb.os.version.label" value="1.1.8"/> > + <property name="embedded-mongodb.os.artifactId" > value="de.flapdoodle.os"/> > + <property name="embedded-mongodb-os-package" value="de/flapdoodle"/> > > + <property name="embedded-mongodb.os.jar" > value="${embedded-mongodb.os.artifactId}-${embedded-mongodb.os.version.label}.jar"/> > + > <target name="calculate-testcode-condition"> > <available file="test-materials/${embedded-mongodb.snapshot-jar}" > property="tests-present"/> > <available file="test-materials/${embedded-mongodb.process.jar}" > property="tests-present"/> > + <available > file="test-materials/${embedded-mongodb.packageresolver.jar}" > property="tests-present"/> > + <available file="test-materials/${embedded-mongodb.os.jar}" > property="tests-present"/> > > <copy todir="${mcf-dist}/test-lib"> > <fileset dir="test-materials"> > - <include name="de.flapdoodle.embed*.jar"/> > + <include name="de.flapdoodle*.jar"/> > </fileset> > </copy> > </target> > @@ -89,6 +101,9 @@ > <property name="sonatype-maven-repo-releases" value=" > https://oss.sonatype.org/content/repositories/public"; /> > <get > src="${sonatype-maven-repo-releases}/${embedded-mongodb-package}/${embedded-mongodb.artifactId}/${embedded-mongodb.version.label}/${embedded-mongodb.snapshot-jar}" > dest="test-materials/${embedded-mongodb.snapshot-jar}"/> > <get > src="${sonatype-maven-repo-releases}/${embedded-mongodb.process-package}/${embedded-mongodb.process.artifactId}/${embedded-mongodb.process.version.label}/${embedded-mongodb.process.jar}" > dest="test-materials/${embedded-mongodb.process.jar}"/> > + <get > src="${sonatype-maven-repo-releases}/${embedded-mongodb-packageresolver-package}/${embedded-mongodb.packageresolver.artifactId}/${embedded-mongodb.packageresolver.version.label}/${embedded-mongodb.packageresolver.jar}" > dest="test-materials/${embedded-mongodb.packageresolver.jar}"/> > + <get > src="${sonatype-maven-repo-releases}/${embedded-mongodb-os-package}/${embedded-mongodb.os.artifactId}/${embedded-mongodb.os.version.label}/${embedded-mongodb.os.jar}" > dest="test-materials/${embedded-mongodb.os.jar}"/> > + > </target> > > </project> > > Modified: > manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java > URL: > http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java?rev=1900317&r1=1900316&r2=1900317&view=diff > > ============================================================================== > --- > manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java > (original) > +++ > manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/APISanityHSQLDBIT.java > Wed Apr 27 12:46:26 2022 > @@ -305,12 +305,12 @@ public class APISanityHSQLDBIT extends B > count = getJobDocumentsProcessed(jobIDString); > > if (count != 3) > - throw new ManifoldCFException("Wrong number of documents > processed - expected 3, saw " + new Long(count).toString()); > + throw new ManifoldCFException("Wrong number of documents > processed - expected 3, saw " + Long.valueOf(count).toString()); > > //Tests if these three documents are stored in the target repo > long targetRepoNumberOfContents = > queryTestContents(testCollection); > if (targetRepoNumberOfContents != 3) > - throw new ManifoldCFException("Wrong number of documents > stored in the MongoDB Target repo - expected 3, saw " + new > Long(targetRepoNumberOfContents).toString()); > + throw new ManifoldCFException("Wrong number of documents > stored in the MongoDB Target repo - expected 3, saw " + > Long.valueOf(targetRepoNumberOfContents).toString()); > > // Now, delete the job. > deleteJob(jobIDString); > @@ -390,7 +390,7 @@ public class APISanityHSQLDBIT extends B > } > if (documentsProcessed == null) > throw new Exception("Expected a documents_processed field, > didn't find it"); > - return new Long(documentsProcessed).longValue(); > + return Long.valueOf(documentsProcessed).longValue(); > } > > protected void waitJobInactive(String jobIDString, long maxTime) > @@ -409,7 +409,7 @@ public class APISanityHSQLDBIT extends B > ManifoldCF.sleep(1000L); > continue; > } > - throw new ManifoldCFException("ManifoldCF did not terminate in > the allotted time of " + new Long(maxTime).toString() + " milliseconds"); > + throw new ManifoldCFException("ManifoldCF did not terminate in > the allotted time of " + Long.valueOf(maxTime).toString() + " > milliseconds"); > } > > > @@ -422,7 +422,7 @@ public class APISanityHSQLDBIT extends B > return; > ManifoldCF.sleep(1000L); > } > - throw new ManifoldCFException("ManifoldCF did not delete in the > allotted time of " + new Long(maxTime).toString() + " milliseconds"); > + throw new ManifoldCFException("ManifoldCF did not delete in the > allotted time of " + Long.valueOf(maxTime).toString() + " milliseconds"); > } > > > > Modified: > manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java > URL: > http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java?rev=1900317&r1=1900316&r2=1900317&view=diff > > ============================================================================== > --- > manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java > (original) > +++ > manifoldcf/trunk/connectors/mongodb/connector/src/test/java/org/apache/manifoldcf/agents/output/mongodboutput/tests/BaseITHSQLDB.java > Wed Apr 27 12:46:26 2022 > @@ -23,8 +23,7 @@ import org.junit.Before; > > import de.flapdoodle.embed.mongo.MongodExecutable; > import de.flapdoodle.embed.mongo.MongodStarter; > -import de.flapdoodle.embed.mongo.config.IMongodConfig; > -import de.flapdoodle.embed.mongo.config.MongodConfigBuilder; > +import de.flapdoodle.embed.mongo.config.MongodConfig; > import de.flapdoodle.embed.mongo.config.Net; > import de.flapdoodle.embed.mongo.distribution.Version; > import de.flapdoodle.embed.process.runtime.Network; > @@ -63,8 +62,11 @@ public class BaseITHSQLDB extends org.ap > MongodStarter starter = MongodStarter.getDefaultInstance(); > String bindIp = "localhost"; > int port = 27017; > - IMongodConfig mongodConfig = new > MongodConfigBuilder().version(Version.V2_6_8) > - .net(new Net(bindIp, port, > Network.localhostIsIPv6())).build(); > + MongodConfig mongodConfig = > MongodConfig.builder().version(Version.Main.PRODUCTION) > + .net(new Net(bindIp, port, > Network.localhostIsIPv6())).build(); > + > +// IMongodConfig mongodConfig = new > MongodConfigBuilder().version(Version.Main.PRODUCTION) > +// .net(new Net(bindIp, port, > Network.localhostIsIPv6())).build(); > > mongodExecutable = starter.prepare(mongodConfig); > mongodExecutable.start(); > > Modified: manifoldcf/trunk/connectors/mongodb/pom.xml > URL: > http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/mongodb/pom.xml?rev=1900317&r1=1900316&r2=1900317&view=diff > > ============================================================================== > --- manifoldcf/trunk/connectors/mongodb/pom.xml (original) > +++ manifoldcf/trunk/connectors/mongodb/pom.xml Wed Apr 27 12:46:26 2022 > @@ -29,7 +29,7 @@ > <properties> > <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> > > <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> > - <mongo.java.driver.version>2.11.3</mongo.java.driver.version> > + <mongo.java.driver.version>2.14.3</mongo.java.driver.version> > </properties> > > <developers> > @@ -38,8 +38,8 @@ > </developer> > <developer> > <name>Piergiorgio Lucidi</name> > - <organization>TAI Solutions</organization> > - <organizationUrl>https://www.taisolutions.com/ > </organizationUrl> > + <organization>Zia Consulting</organization> > + <organizationUrl>https://www.ziaconsulting.com > </organizationUrl> > <url>https://www.open4dev.com</url> > </developer> > </developers> > @@ -90,7 +90,7 @@ > <dependency> > <groupId>de.flapdoodle.embed</groupId> > <artifactId>de.flapdoodle.embed.mongo</artifactId> > - <version>2.2.0</version> > + <version>3.4.5</version> > <scope>test</scope> > </dependency> > <dependency> > > >
