[Git][java-team/jruby-joni][debian/sid] 6 commits: [maven-release-plugin] prepare for next development iteration

[Hideki Yamane (@henrich)]

Hideki Yamane pushed to branch debian/sid at Debian Java Maintainers / jruby-joni


Commits:
425dd275 by Thomas E. Enebo at 2023-01-23T10:07:43-06:00
[maven-release-plugin] prepare for next development iteration

- - - - -
ccd20556 by Thomas E. Enebo at 2023-01-26T13:02:45-06:00
Revert "synchronize another label"

This reverts commit 39d8c21144de747bb9e2ba0753818dbe2cf136eb.

- - - - -
f5b330d4 by Thomas E. Enebo at 2023-01-26T17:12:51-06:00
Minor porting error noticed with onigmo

- - - - -
f8764f48 by Thomas E. Enebo at 2023-01-27T10:26:51-06:00
[maven-release-plugin] prepare release joni-2.1.46

- - - - -
5077605c by Hideki Yamane at 2023-01-31T22:18:00+09:00
Merge tag 'joni-2.1.46' into debian/sid

[maven-release-plugin]  copy for tag joni-2.1.46

- - - - -
15f40c70 by Hideki Yamane at 2023-01-31T22:18:25+09:00
new upstream release

- - - - -


3 changed files:

- debian/changelog
- pom.xml
- src/org/joni/Matcher.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+jruby-joni (2.1.46-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Hideki Yamane <henrich at debian.org>  Tue, 31 Jan 2023 22:18:22 +0900
+
 jruby-joni (2.1.45-1) unstable; urgency=medium
 
   * New upstream release


=====================================
pom.xml
=====================================
@@ -4,7 +4,7 @@
   <groupId>org.jruby.joni</groupId>
   <artifactId>joni</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.45</version>
+  <version>2.1.46</version>
   <name>Joni</name>
   <description>
     Java port of Oniguruma: http://www.geocities.jp/kosako3/oniguruma


=====================================
src/org/joni/Matcher.java
=====================================
@@ -340,11 +340,9 @@ public abstract class Matcher extends IntHolder {
                 // !begin_position:!
                 if (range > start) {
                     if (gpos > start) {
-                        if (gpos < range) {
-                            range = gpos + 1;
-                        } else {
-                            range = start + 1;
-                        }
+                        if (gpos < range) range = gpos + 1;
+                    } else {
+                        range = start + 1;
                     }
                 } else {
                     range = start;
@@ -390,11 +388,9 @@ public abstract class Matcher extends IntHolder {
                 // goto !begin_position;!
                 if (range > start) {
                     if (gpos > start) {
-                        if (gpos < range) {
-                            range = gpos + 1;
-                        } else {
-                            range = start + 1;
-                        }
+                        if (gpos < range) range = gpos + 1;
+                    } else {
+                        range = start + 1;
                     }
                 } else {
                     range = start;



View it on GitLab: https://salsa.debian.org/java-team/jruby-joni/-/compare/973e4057312fa57662b5a1d33d2ecb4964e8a295...15f40c705113bef780e0c01cffa2536743a7815e

-- 
View it on GitLab: https://salsa.debian.org/java-team/jruby-joni/-/compare/973e4057312fa57662b5a1d33d2ecb4964e8a295...15f40c705113bef780e0c01cffa2536743a7815e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230131/7a58dc64/attachment.htm>