Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,23 @@ jobs:
container:
image: ${{ matrix.os }}
steps:


- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Install dependencies on Ubuntu 22.04
if: matrix.os == 'ubuntu:22.04'
run: |
apt update -y
apt install -y default-jdk build-essential bison flex gettext texinfo automake autoconf
apt install -y build-essential bison flex gettext texinfo automake autoconf

- name: Install dependencies on AlmaLinux 9
if: matrix.os == 'almalinux:9'
run: |
dnf -y update
dnf install -y java-17-openjdk-devel gcc make bison flex automake autoconf diffutils gettext
dnf install -y gcc make bison flex automake autoconf diffutils gettext

- name: Checkout opensource COBOL 4J
uses: actions/checkout@v3
Expand Down Expand Up @@ -90,7 +95,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '11'

- name: Install static analysis tools
run: |
Expand Down
93 changes: 0 additions & 93 deletions .github/workflows/coverage.yml

This file was deleted.

9 changes: 7 additions & 2 deletions .github/workflows/test-nist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,22 @@ jobs:
with:
name: opensourcecobol4j-${{ env.ARTIFACT_NAME }}

- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Install dependencies on Ubuntu 22.04
if: matrix.os == 'ubuntu:22.04'
run: |
apt update -y
apt install -y default-jdk build-essential
apt install -y build-essential

- name: Install dependencies on AlmaLinux 9
if: matrix.os == 'almalinux:9'
run: |
dnf -y update
dnf install -y java-17-openjdk-devel gcc make perl
dnf install -y gcc make perl

- name: Install opensource COBOL 4J
run: |
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/test-other.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,22 @@ jobs:
with:
name: opensourcecobol4j-${{ env.ARTIFACT_NAME }}

- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Install dependencies on Ubuntu 22.04
if: matrix.os == 'ubuntu:22.04'
run: |
apt update -y
apt install -y default-jdk build-essential
apt install -y build-essential

- name: Install dependencies on AlmaLinux 9
if: matrix.os == 'almalinux:9'
run: |
dnf -y update
dnf install -y java-17-openjdk-devel gcc make diffutils
dnf install -y gcc make diffutils

- name: Install opensource COBOL 4J
run: |
Expand Down
23 changes: 21 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [1.0.17] - 2023-11-28
### Added
* Implement sorting a table (#251)
* Implement functions SUBSTITUTE and SUBSTITUTE-CASE (#246)
### Changed
* Support JDK 11 (#249)
* Older versions are tested with JDK 17 and 1.0.17 is tested with JDK 11.
* Plan to support JDK 8 in the future.
## [1.0.16] - 2023-10-31
## Added
### Added
* Publish libcobj.jar in GitHub Packages
* Implement intrinsic functions
* ORD-MAX (#228)
Expand All @@ -13,7 +22,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
* SIGN (#231)
* STORED-CHAR-LENGTH (#231)
* TRIM (#244)
## Fixed
## [1.0.16] - 2023-10-31
### Added
* Publish libcobj.jar in GitHub Packages
* Implement intrinsic functions
* ORD-MAX (#228)
* ORD-MIN (#228)
* SECONDS-FROM-FORMATTED-TIME (#231)
* SIGN (#231)
* STORED-CHAR-LENGTH (#231)
* TRIM (#244)
### Fixed
* Fix `DECIMAL POINT IS COMMA` in `SPECIAL NAMES` clause. (#233)
## [1.0.15] - 2023-09-29
### Added
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2023-11-28 OSS Consortium <[email protected]>

* opensource COBOL 4J v1.0.17 released.

2023-10-31 OSS Consortium <[email protected]>

* opensource COBOL 4J v1.0.16 released.
Expand Down
12 changes: 12 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@ NEWS - user visible changes -*- outline -*-

-----------------------------------------------------------------------

* opensource COBOL 4J 1.0.17

** New Features
(1) Implement sorting a table
(2) Implement functions SUBSTITUTE and SUBSTITUTE-CASE
** Miscellaneous
(1) Support JDK 11
(a) Older versions are tested with JDK 17 and 1.0.17 is tested with JDK 11.
(b) Plan to support JDK 8 in the future.

-----------------------------------------------------------------------

* opensource COBOL 4J 1.0.16

** New Features
Expand Down
26 changes: 13 additions & 13 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.0.16.
# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.0.17.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -620,9 +620,9 @@ MAKEFLAGS=

# Identity of this package.
PACKAGE_NAME='opensource COBOL 4J'
PACKAGE_TARNAME='opensource-cobol-4j-1.0.16'
PACKAGE_VERSION='1.0.16'
PACKAGE_STRING='opensource COBOL 4J 1.0.16'
PACKAGE_TARNAME='opensource-cobol-4j-1.0.17'
PACKAGE_VERSION='1.0.17'
PACKAGE_STRING='opensource COBOL 4J 1.0.17'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1414,7 +1414,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures opensource COBOL 4J 1.0.16 to adapt to many kinds of systems.
\`configure' configures opensource COBOL 4J 1.0.17 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1464,7 +1464,7 @@ Fine tuning of the installation directories:
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root
[DATAROOTDIR/doc/opensource-cobol-4j-1.0.16]
[DATAROOTDIR/doc/opensource-cobol-4j-1.0.17]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
Expand All @@ -1486,7 +1486,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of opensource COBOL 4J 1.0.16:";;
short | recursive ) echo "Configuration of opensource COBOL 4J 1.0.17:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1617,7 +1617,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
opensource COBOL 4J configure 1.0.16
opensource COBOL 4J configure 1.0.17
generated by GNU Autoconf 2.71

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2105,7 +2105,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by opensource COBOL 4J $as_me 1.0.16, which was
It was created by opensource COBOL 4J $as_me 1.0.17, which was
generated by GNU Autoconf 2.71. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3403,8 +3403,8 @@ fi


# Define the identity of the package.
PACKAGE='opensource-cobol-4j-1.0.16'
VERSION='1.0.16'
PACKAGE='opensource-cobol-4j-1.0.17'
VERSION='1.0.17'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -25367,7 +25367,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by opensource COBOL 4J $as_me 1.0.16, which was
This file was extended by opensource COBOL 4J $as_me 1.0.17, which was
generated by GNU Autoconf 2.71. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -25435,7 +25435,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
opensource COBOL 4J config.status 1.0.16
opensource COBOL 4J config.status 1.0.17
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

AC_PREREQ(2.59)

AC_INIT([opensource COBOL 4J],[1.0.16],[[email protected]],[opensource-cobol-4j-1.0.16])
AC_INIT([opensource COBOL 4J],[1.0.17],[[email protected]],[opensource-cobol-4j-1.0.17])
AC_CONFIG_SRCDIR([libcobj.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
Expand Down
16 changes: 14 additions & 2 deletions libcobj/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ repositories {
mavenCentral()
}

tasks {
javadoc {
options.encoding = "UTF-8"
}
compileJava {
options.encoding = "UTF-8"
}
compileTestJava {
options.encoding = "UTF-8"
}
}

dependencies {
implementation("com.google.guava:guava:31.1-jre")
implementation("org.xerial:sqlite-jdbc:3.30.1")
Expand All @@ -22,7 +34,7 @@ dependencies {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(8))
}
}

Expand All @@ -47,7 +59,7 @@ publishing {
register<MavenPublication>("gpr") {
groupId = "jp.osscons.opensourcecobol"
artifactId = "libcobj"
version = "1.0.16"
version = "1.0.17"
from(components["java"])
}
}
Expand Down
Loading