[Git][java-team/jcodings][debian/sid] 9 commits: [maven-release-plugin] prepare for next development iteration

Hideki Yamane gitlab at salsa.debian.org
Fri May 1 11:43:01 BST 2020



Hideki Yamane pushed to branch debian/sid at Debian Java Maintainers / jcodings


Commits:
3000f8c8 by Charles Oliver Nutter at 2020-04-20T14:36:56-05:00
[maven-release-plugin] prepare for next development iteration

- - - - -
af4cd406 by kiichi at 2020-04-28T23:15:07+09:00
avoid Java ArrayIndex error
  e.g. "a\0".force_encoding(utf-32le).chomp

update isNewLine condition(port from MRI 2.6.6)
  see https://github.com/ruby/ruby/blob/v2_6_6/enc/utf_32le.c

- - - - -
170f819b by kiichi at 2020-04-28T23:16:54+09:00
format code and add missing increment operator

- - - - -
231974d3 by kiichi at 2020-04-28T23:16:54+09:00
update isNewLine condition(port from MRI 2.6.6).
 see https://github.com/ruby/ruby/blob/v2_6_6/enc/utf_32be.c

- - - - -
8e5c660d by Charles Oliver Nutter at 2020-04-28T20:11:06-05:00
Merge pull request #33 from k77ch7/update-utf32-encoding

Update UTF32Encoding
- - - - -
6396381d by Charles Oliver Nutter at 2020-04-28T20:16:45-05:00
[maven-release-plugin] prepare release jcodings-1.0.50

- - - - -
9482a393 by Hideki Yamane at 2020-05-01T19:34:56+09:00
Merge tag 'jcodings-1.0.50' into debian/sid

[maven-release-plugin]  copy for tag jcodings-1.0.50

- - - - -
2866638c by Hideki Yamane at 2020-05-01T19:38:08+09:00
set "allow_failure: true" for reprotest

- - - - -
e3cc638c by Hideki Yamane at 2020-05-01T19:39:26+09:00
note to changelog

- - - - -


5 changed files:

- debian/changelog
- debian/salsa-ci.yml
- pom.xml
- src/org/jcodings/specific/UTF32BEEncoding.java
- src/org/jcodings/specific/UTF32LEEncoding.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jcodings (1.0.50-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/salsa-ci.yml
+    - set "allow_failure: true" for reprotest
+
+ -- Hideki Yamane <henrich at debian.org>  Fri, 01 May 2020 19:39:21 +0900
+
 jcodings (1.0.49-1) unstable; urgency=medium
 
   * New upstream release 1.0.49


=====================================
debian/salsa-ci.yml
=====================================
@@ -6,3 +6,6 @@ include:
 variables:
   SALSA_CI_DISABLE_BLHC: 1
   SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 1
+
+reprotest:
+  allow_failure: true


=====================================
pom.xml
=====================================
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jruby.jcodings</groupId>
   <artifactId>jcodings</artifactId>
-  <version>1.0.49</version>
+  <version>1.0.50</version>
   <name>JCodings</name>
   <description>Byte based encoding support library for java</description>
   <parent>


=====================================
src/org/jcodings/specific/UTF32BEEncoding.java
=====================================
@@ -36,8 +36,8 @@ public final class UTF32BEEncoding extends FixedWidthUnicodeEncoding {
             if (bytes[p + 3] == (byte)0x0a && bytes[p + 2] == 0 && bytes[p + 1] == 0 && bytes[p] == 0) return true;
 
             if (Config.USE_UNICODE_ALL_LINE_TERMINATORS) {
-                if ((Config.USE_CRNL_AS_LINE_TERMINATOR && bytes[p + 3] == (byte)0x0d) ||
-                   bytes[p + 3] == (byte)0x85 && bytes[p + 2] == 0 && bytes[p + 1] == 0 && bytes[p] == 0) return true;
+                if ((bytes[p + 3] == (byte)0x0b || bytes[p + 3] == (byte)0x0c || bytes[p + 3] == (byte)0x0d || bytes[p + 3] == (byte)0x85) 
+                    && bytes[p + 2] == 0 && bytes[p + 1] == 0 && bytes[p] == 0) return true;
 
                 if (bytes[p + 2] == (byte)0x20 &&
                    (bytes[p + 3] == (byte)0x29 || bytes[p + 3] == (byte)0x28) &&


=====================================
src/org/jcodings/specific/UTF32LEEncoding.java
=====================================
@@ -33,15 +33,14 @@ public final class UTF32LEEncoding extends FixedWidthUnicodeEncoding {
     @Override
     public boolean isNewLine(byte[]bytes, int p, int end) {
         if (p + 3 < end) {
-            if (bytes[p] == (byte)0x0a && bytes[p + 1] == 0 && bytes[p + 2] == 0 && bytes[p + 3] == 0) return true;
+            if (bytes[p + 3] == 0 && bytes[p + 2] == 0 && bytes[p + 1] == 0 && bytes[p] == (byte)0x0a) return true;
 
             if (Config.USE_UNICODE_ALL_LINE_TERMINATORS) {
-                if ((Config.USE_CRNL_AS_LINE_TERMINATOR && bytes[p] == (byte)0x0d) ||
-                   bytes[p] == (byte)0x85 && bytes[p + 1] == 0 && bytes[p + 2] == 0 && bytes[3] == 0) return true;
+                if (bytes[p + 3] == 0 && bytes[p + 2] == 0 && bytes[p + 1] == 0 &&
+                    (bytes[p] == (byte)0x0b || bytes[p] == (byte)0x0c || bytes[p] == (byte)0x0d || bytes[p] == (byte)0x85)) return true;
 
-                if (bytes[p + 1] == (byte)0x20 &&
-                   (bytes[p] == (byte)0x29 || bytes[p] == (byte)0x28) &&
-                    bytes[p + 2] == 0 && bytes[p + 3] == 0) return true;
+                if (bytes[p + 3] == 0 && bytes[p + 2] == 0 && bytes[p + 1] == (byte)0x20 &&
+                   (bytes[p] == (byte)0x29 || bytes[p] == (byte)0x28)) return true;
             } // USE_UNICODE_ALL_LINE_TERMINATORS
         }
         return false;
@@ -68,10 +67,12 @@ public final class UTF32LEEncoding extends FixedWidthUnicodeEncoding {
         int foldP = 0;
         if (isAscii(bytes[p] & 0xff) && bytes[p + 1] == 0 && bytes[p + 2] == 0 && bytes[p + 3] == 0) {
 
-            if (Config.USE_UNICODE_CASE_FOLD_TURKISH_AZERI && (flag & Config.CASE_FOLD_TURKISH_AZERI) != 0) {
-                if (bytes[p] == (byte)0x49) {
-                    fold[foldP++] = (byte)0x31;
-                        fold[foldP] = (byte)0x01;
+            if (Config.USE_UNICODE_CASE_FOLD_TURKISH_AZERI) {
+                if ((flag & Config.CASE_FOLD_TURKISH_AZERI) != 0) {
+                    if (bytes[p] == (byte)0x49) {
+                        fold[foldP++] = (byte)0x31;
+                        fold[foldP++] = (byte)0x01;
+                    }
                 }
             } else {
                 fold[foldP++] = AsciiTables.ToLowerCaseTable[bytes[p] & 0xff];



View it on GitLab: https://salsa.debian.org/java-team/jcodings/-/compare/5c4ac8cb547c779a393beebb24105807c41d3bba...e3cc638c9cf78ea3ddc8a0f5b1454e7163a1b465

-- 
View it on GitLab: https://salsa.debian.org/java-team/jcodings/-/compare/5c4ac8cb547c779a393beebb24105807c41d3bba...e3cc638c9cf78ea3ddc8a0f5b1454e7163a1b465
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/20200501/b463ebe9/attachment.html>


More information about the pkg-java-commits mailing list