This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
commit be4f767f205f0db150cd01817a26e3e4ea0dbd55 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Jul 30 12:50:45 2023 -0400 Bump commons-lang3 from 3.12.0 to 3.13.0 --- .../org/apache/commons/vfs2/util/FluentBitSet.java | 83 ---------------------- .../org/apache/commons/vfs2/util/URIBitSets.java | 1 + .../org/apache/commons/vfs2/util/URIUtils.java | 1 + pom.xml | 2 +- src/changes/changes.xml | 3 + 5 files changed, 6 insertions(+), 84 deletions(-) diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FluentBitSet.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FluentBitSet.java deleted file mode 100644 index 3dcce5ef..00000000 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/FluentBitSet.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.commons.vfs2.util; - -import java.util.BitSet; - -/** Move to Apache Commons Lang. */ -final class FluentBitSet { - - private final BitSet bitSet; - - FluentBitSet(final BitSet bitSet) { - this.bitSet = bitSet; - } - - FluentBitSet(final int nbits) { - this(new BitSet(nbits)); - } - - FluentBitSet andNot(final FluentBitSet fBitSet) { - this.bitSet.andNot(fBitSet.bitSet); - return this; - } - - BitSet bitSet() { - return bitSet; - } - - FluentBitSet clear(final int... bitIndexArray) { - for (final int e : bitIndexArray) { - this.bitSet.clear(e); - } - return this; - } - - boolean get(final int bitIndex) { - return bitSet.get(bitIndex); - } - - FluentBitSet or(final FluentBitSet... fBitSets) { - for (final FluentBitSet e : fBitSets) { - this.bitSet.or(e.bitSet); - } - return this; - } - - FluentBitSet or(final FluentBitSet fBitSet) { - this.bitSet.or(fBitSet.bitSet); - return this; - } - - FluentBitSet set(final int... bitIndexArray) { - for (final int e : bitIndexArray) { - bitSet.set(e); - } - return this; - } - - FluentBitSet set(final int bitIndex) { - bitSet.set(bitIndex); - return this; - } - - FluentBitSet setInclusive(final int startIncl, final int endIncl) { - bitSet.set(startIncl, endIncl + 1); - return this; - } - -} diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java index d60a8cd7..35900189 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIBitSets.java @@ -18,6 +18,7 @@ package org.apache.commons.vfs2.util; import java.util.BitSet; +import org.apache.commons.lang3.util.FluentBitSet; import org.apache.commons.vfs2.provider.GenericURLFileName; /** diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java index bc0768de..5999b8d6 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/URIUtils.java @@ -22,6 +22,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.util.FluentBitSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.provider.GenericURLFileName; diff --git a/pom.xml b/pom.xml index 73e517c8..d77600bb 100644 --- a/pom.xml +++ b/pom.xml @@ -533,7 +533,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.12.0</version> + <version>3.13.0</version> </dependency> <!-- HDFS --> <dependency> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 91346f0c..4cb5c0b2 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -282,6 +282,9 @@ The <action> type attribute can be add,update,fix,remove. <action type="update" dev="ggregory" due-to="Gary Gregory"> Bump commons-codec:commons-codec from 1.15 to 1.16.0. </action> + <action type="update" dev="ggregory" due-to="Gary Gregory"> + Bump commons-lang3 from 3.12.0 to 3.13.0. + </action> </release> <release version="2.9.0" date="2021-06-16" description="Maintenance release. Requires Java 8."> <!-- ADDS -->