Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2e3e73f
UPOS 1.16 support
mjpcger Sep 26, 2023
23bd30b
UPOS 1.16 support
mjpcger Sep 26, 2023
8662f9f
Interface Additions and Header Changes
mjpcger Sep 28, 2023
4fecf23
Switched to Gradle 8.4
kuniss Oct 11, 2023
5d2b531
Added missing PINPad constant PPAD_TIMEOUT
kuniss Oct 14, 2023
5e4cad2
Corrected indentation.
kuniss Oct 14, 2023
5263569
Added general constants `JPOS_FALSE` and `JPOS_FALSE` to `JposConst`.
kuniss Oct 14, 2023
46bbebd
Improved format of older change notes.
kuniss Oct 14, 2023
e5bce63
Update dependencies to get rid of Gradle deprecations
kuniss Oct 14, 2023
2db3ade
Get rid of other Gradle deprecations in build script.
kuniss Oct 14, 2023
9563b7c
Bug Fix GraphicDisplayControl116.java
mjpcger Oct 15, 2023
a1c5a7d
Bug Fix GraphicDisplayService116.java
mjpcger Oct 15, 2023
bbc204e
Update build.gradle
mjpcger Oct 16, 2023
e60a2c2
Update build.gradle
mjpcger Oct 16, 2023
fd2c70d
Update GestureControlService116.java
mjpcger Oct 16, 2023
99e6c4f
Update GestureControlControl116.java
mjpcger Oct 16, 2023
57ee408
Layout Rework
mjpcger Oct 17, 2023
3d3c68a
Layout Rework
mjpcger Oct 17, 2023
cd28e3b
Layout Rework
mjpcger Oct 17, 2023
211ca24
Meaningless Constants Removal
mjpcger Nov 2, 2023
d01fcba
Useless Constants Re-Added
mjpcger Nov 3, 2023
e895489
Update build.gradle
mjpcger Dec 7, 2023
54e6073
Update build.gradle
mjpcger Dec 7, 2023
7c996a8
Missing UPOS 1.15.1 constants
mjpcger Feb 4, 2025
3197f8c
Merge branch 'master' of https://github.com/mjpcger/javapos-contracts
mjpcger Feb 4, 2025
10eb790
Revert "Merge branch 'master' of https://github.com/mjpcger/javapos-c…
mjpcger Feb 5, 2025
5988b2e
Revert "Missing UPOS 1.15.1 constants"
mjpcger Feb 5, 2025
8a2c20e
Changes due to UPOS 1.15.1
mjpcger Feb 5, 2025
25569bb
Merge branch 'master' of https://github.com/mjpcger/javapos-contracts
mjpcger Feb 5, 2025
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
11 changes: 8 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# Change Log for javapos-contracts

## 1.15.1
## 1.15.2 Maintenance Release

- added ElectronicValueRW constants EVRW_TAG_NIT_ALL and EVRW_TAG_NIT_UPDATED; solves GH issue #17
- added ElectronicValueRW constants EVRW_TAG_TT_COMPLETION and EVRW_TAG_TT_PRE_SALES; solves GH issue #16
- added general constants `JPOS_FALSE` and `JPOS_FALSE` to `JposConst`, as workaround for a type error in `PointCardRW.CapCardEntranceSensor`; solves GH issues #20
- added missing *PINPad* constant `PPAD_TIMEOUT`; solves GH issues #19

## 1.15.1 Maintenance Release

- added *ElectronicValueRW* constants `EVRW_TAG_NIT_ALL` and `EVRW_TAG_NIT_UPDATED`; solves GH issue #17
- added *ElectronicValueRW* constants `EVRW_TAG_TT_COMPLETION` and `EVRW_TAG_TT_PRE_SALES`; solves GH issue #16

## 1.15.0

Expand Down
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ plugins {
id 'signing'
id 'eclipse'
id 'maven-publish'
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id 'project-report'
}

wrapper {
gradleVersion = '7.1.1'
gradleVersion = '8.4'
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -27,7 +27,7 @@ def artifactName = 'javapos-contracts'
group='org.javapos'
def uposVersion = '1.15' // if this version is going to be changed, first add "-SNAPSHOT"
// to the 'version' variable below for publishing to MavenCentral's Snapshot repo first as test
version="${uposVersion}.1" // the last part after dot is the build/release version
version="${uposVersion}.2" // the last part after dot is the build/release version

///////////////////////////////////////////////////////////////////////////////
// Project Configurations
Expand All @@ -38,7 +38,7 @@ eclipse.jdt.file.withProperties { properties ->
properties['org.eclipse.jdt.core.compiler.codegen.methodParameters'] = 'generate'
}

def javaposManifest = manifest {
def javaposManifest = java.manifest {
attributes('Specification-Title': 'UnifiedPOS Standard',
'Specification-Vendor': 'UnifiedPOS Committee',
'Specification-Version': uposVersion,
Expand All @@ -47,15 +47,14 @@ def javaposManifest = manifest {
'Implementation-Version': version)
}

sourceCompatibility = 8

///////////////////////////////////////////////////////////////////////////////
// Build Tasks
///////////////////////////////////////////////////////////////////////////////

java {
withSourcesJar()
withJavadocJar()
sourceCompatibility = JavaVersion.VERSION_1_8
}

jar {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
33 changes: 15 additions & 18 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 7 additions & 18 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// for enabling Gradle scan at GitHub Actions
plugins {
id("com.gradle.enterprise") version("3.9")
id("com.gradle.enterprise") version("3.15")
}

rootProject.name = 'javapos-contracts'
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/jpos/ElectronicValueRWConst.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@
// EVRW_TE_NOTIFY_LOCK
// EVRW_TE_NOTIFY_CENTER_CHECK_COMPLETE
// EVRW_TE_CONFIRM_PIN_ENTRY_BY_OUTER_PINPAD
// 2025-Feb-04 JavaPOS Release 1.15.2 MC
// Added new constants:
// EVRW_TAG_VR_VOID
// EVRW_TAG_VR_RETURN
// EVRW_TAG_VTT_SALES
// EVRW_TAG_VTT_CHARGE
// EVRW_TAG_VTT_CANCEL
// EVRW_TAG_VTT_RETURN
//
/////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -314,6 +322,14 @@ public interface ElectronicValueRWConst
public static final int EVRW_TAG_TT_COMPLETION = 10; // Added in release 1.15
public static final int EVRW_TAG_TT_PRE_SALES = 11; // Added in release 1.15

public static final int EVRW_TAG_VR_VOID = 1; // Added in release 1.15.2
public static final int EVRW_TAG_VR_RETURN = 2; // Added in release 1.15.2

public static final int EVRW_TAG_VTT_SALES = 1; // Added in release 1.15.2
public static final int EVRW_TAG_VTT_CHARGE = 2; // Added in release 1.15.2
public static final int EVRW_TAG_VTT_CANCEL = 3; // Added in release 1.15.2
public static final int EVRW_TAG_VTT_RETURN = 4; // Added in release 1.15.2

/////////////////////////////////////////////////////////////////////
// "transactionAccess" Method: "Control" Parameter Constants
/////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/jpos/FiscalPrinterConst.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
// FPTR_RT_EOD_ORDINAL
// Added new ErrorCodeExtended constant:
// JPOS_EFPTR_DAY_END_REQUIRED
// 2025-Feb-04 JavaPOS Release 1.15.2 MC
// Added new GetData constant:
// FPTR_GD_VAT_ID_LIST
//
/////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -284,6 +287,7 @@ public interface FiscalPrinterConst
public static final int FPTR_GD_TENDER = 26;
public static final int FPTR_GD_LINECOUNT = 27;
public static final int FPTR_GD_DESCRIPTION_LENGTH = 28;
public static final int FPTR_GD_VAT_ID_LIST = 29; // Added in release 1.15.2

public static final int FPTR_PDL_CASH = 1;
public static final int FPTR_PDL_CHEQUE = 2;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/jpos/JposConst.java
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,8 @@ public interface JposConst
/////////////////////////////////////////////////////////////////////

public static final int JPOS_FOREVER = -1;

// boolean constants, mainly as workaround for a type error at PointCardRW.CapCardEntranceSensor
public static final int JPOS_FALSE = 0;
public static final int JPOS_TRUE = 1;
}
8 changes: 4 additions & 4 deletions src/main/java/jpos/PINPadConst.java
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ public interface PINPadConst
/////////////////////////////////////////////////////////////////////
public static final int PPAD_SUCCESS = 1;
public static final int PPAD_CANCEL = 2;
public static final int PPAD_TIMEOUT = 3;


/////////////////////////////////////////////////////////////////////
// "ErrorCodeExtended" Property Constants for PINPad
/////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////
// "ErrorCodeExtended" Property Constants for PINPad
/////////////////////////////////////////////////////////////////////

public static final int JPOS_EPPAD_BAD_KEY = 1 + JposConst.JPOSERREXT;
}
14 changes: 14 additions & 0 deletions src/main/java/jpos/POSPrinterConst.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@
// Re-added dropped, misspelled slip cartridge constant for backwards
// compatibility.
// PTR_SUE_SLP_CARTDRIGE_OK
// 2025-Feb-04 JavaPOS Release 1.15.2 MC
// Marked Bar Code Symbology value as deprecated:
// PTR_BCS_EAN128
// Added Bar Code Symbology value as replacement for PTR_BCS_EAN128:
// PTR_BCS_GS1128
// Added Bar Code Symbology values:
// PTR_BCS_DOTCODE
// PTR_BCS_HANXIN
//
/////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -275,6 +283,7 @@ public interface POSPrinterConst
// barcode
public static final int PTR_BCS_EAN13_S = 119; // EAN 13 with supplemental
// barcode
@deprecated // Deprecated JavaPOS 1.15.2
public static final int PTR_BCS_EAN128 = 120; // EAN 128
public static final int PTR_BCS_OCRA = 121; // OCR "A"
public static final int PTR_BCS_OCRB = 122; // OCR "B"
Expand All @@ -290,6 +299,11 @@ public interface POSPrinterConst
public static final int PTR_BCS_GS1DATABAR_E = 132; // GS1 DataBar Expanded
public static final int PTR_BCS_GS1DATABAR_S = 133; // GS1 DataBar Stacked Omnidirectional
public static final int PTR_BCS_GS1DATABAR_E_S = 134; // GS1 DataBar Expanded Stacked

// Added in Release 1.15.2
public static final int PTR_BCS_GS1128 = 120; // GS1-128
public static final int PTR_BCS_DOTCODE = 124; // Dot Code
public static final int PTR_BCS_HANXIN = 125; // Han Xin Code

// Two dimensional symbologies
public static final int PTR_BCS_PDF417 = 201;
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/jpos/ScannerConst.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@
// SCAN_SDT_UsIntelligent
// SCAN_SDT_UsPlanet
// SCAN_SDT_PostNet
// 2025-Feb-04 JavaPOS Release 1.15.2 MC
// Marked ScanDataType constant as deprecated:
// SCAN_SDT_EAN128
// Added ScanDataType constant as replacement for SCAN_SDT_EAN128:
// SCAN_SDT_GS1128
// Added new ScanDataType constant:
// SCAN_SDT_DWCODE
//
/////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -124,6 +131,7 @@ public interface ScannerConst
// supplemental barcode
public static final int SCAN_SDT_EAN13_S = 119; // EAN 13 with
// supplemental barcode
@deprecated // Deprecated JavaPOS 1.15.2
public static final int SCAN_SDT_EAN128 = 120; // EAN 128
public static final int SCAN_SDT_OCRA = 121; // OCR "A"
public static final int SCAN_SDT_OCRB = 122; // OCR "B"
Expand Down Expand Up @@ -153,6 +161,10 @@ public interface ScannerConst
public static final int SCAN_SDT_PLESSEY = 144; // Plessey Code
public static final int SCAN_SDT_TELEPEN = 145; // Telepen

// One dimensional symbologies (added in Release 1.15.2)
public static final int SCAN_SDT_GS1128 = 120; // GS1-128
public static final int SCAN_SDT_DWCODE = 146; // Digital Watermarking

// Composite Symbologies (Added in Release 1.8)
public static final int SCAN_SDT_CCA = 151; // Composite Component A.
public static final int SCAN_SDT_CCB = 152; // Composite Component B.
Expand Down
Loading