aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-04-03[automerger skipped] [automerged blank] Add OwaspJavaEncoderTestCases and ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseAndrew Vuong
TEST_MAPPING 2p: 616fc402e2 am: b6d8419060 -s ours am skip reason: Merged-In Ie63b019dde762257df5c1c9eefbd471d67808432 with SHA-1 d86fa4e886 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/22426435 Change-Id: If3d1eaefb7451463163fecb33d84f7d25ac5b8a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03[automerger skipped] [automerged blank] Initial import of owasp-java-encoder ↵Andrew Vuong
from upstream main 2p: 6a30958ac7 am: 2cf43d3194 -s ours am skip reason: Merged-In I89d97ac6be9533b10d9add01706d59260b686cdd with SHA-1 3566f56059 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/22389311 Change-Id: Ieba50e4becd8928f8a417b6bb6ead24370bf5c15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03[automerged blank] Add OwaspJavaEncoderTestCases and TEST_MAPPING 2p: 616fc402e2android14-devAndrew Vuong
Blank merge reason: Change-Id Ie63b019dde762257df5c1c9eefbd471d67808432 with SHA-1 d86fa4e886 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/22426435 Bug: 262898801 Change-Id: I4d966b3458547ebe6b2137ab44531387dd40ba19 Merged-In: Ie63b019dde762257df5c1c9eefbd471d67808432
2023-04-03Add OwaspJavaEncoderTestCases and TEST_MAPPINGaml_wif_331910020aml_tz4_332714010Andrew Vuong
Bug: 262898801 Test: atest (cherry picked from https://android-review.googlesource.com/q/commit:d86fa4e886eda62c4718b24d0feff83868c72fb8) Merged-In: Ie63b019dde762257df5c1c9eefbd471d67808432 Change-Id: Ie63b019dde762257df5c1c9eefbd471d67808432
2023-03-31[automerged blank] Initial import of owasp-java-encoder from upstream main ↵Andrew Vuong
2p: 6a30958ac7 Blank merge reason: Change-Id I89d97ac6be9533b10d9add01706d59260b686cdd with SHA-1 3566f56059 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/22389311 Bug: 262898801 Change-Id: Iaf30143811a6860a3d2ba82a7428bf01b7411189 Merged-In: I89d97ac6be9533b10d9add01706d59260b686cdd
2023-03-31Initial import of owasp-java-encoder from upstream mainAndrew Vuong
Bug: 262898801 Test: mma (cherry picked from https://android-review.googlesource.com/q/commit:3566f560590f91ac4e11b6b7494c9a4831804c3f) Merged-In: I89d97ac6be9533b10d9add01706d59260b686cdd Change-Id: I89d97ac6be9533b10d9add01706d59260b686cdd
2023-03-14Add OwaspJavaEncoderTestCases and TEST_MAPPING am: d86fa4e886 am: b21fbade4c ↵Andrew Vuong
am: 2c2c8105b6 am: aa8399f7c5 Original change: https://android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/2486396 Change-Id: Iafe44d63b85675aab6133228aeb92daaa13f18f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Add OwaspJavaEncoderTestCases and TEST_MAPPING am: d86fa4e886 am: b21fbade4c ↵Andrew Vuong
am: 2c2c8105b6 Original change: https://android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/2486396 Change-Id: Icc31c68ef83f8f7cf232a48b8f358ad3d83295c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Add OwaspJavaEncoderTestCases and TEST_MAPPING am: d86fa4e886 am: b21fbade4cAndrew Vuong
Original change: https://android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/2486396 Change-Id: I752655622c6fda0f4c204ab780aef37c14766b80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Add OwaspJavaEncoderTestCases and TEST_MAPPING am: d86fa4e886Andrew Vuong
Original change: https://android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/2486396 Change-Id: I5406ad81f8b716163a11e4e12c783b48aa5e5c02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Initial import of owasp-java-encoder from upstream main am: 3566f56059 am: ↵Andrew Vuong
6899028edc am: 121cf10279 am: 0bbf152e6b Original change: https://android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/2486318 Change-Id: I9306ee8c9eb2d4fa9710e521a6705b69d18c1576 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Initial import of owasp-java-encoder from upstream main am: 3566f56059 am: ↵Andrew Vuong
6899028edc am: 121cf10279 Original change: https://android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/2486318 Change-Id: Ifba07bd54720ad291b895c2b92d315983667e529 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Add OwaspJavaEncoderTestCases and TEST_MAPPINGplatform-tools-34.0.3android-u-beta-1-gplAndrew Vuong
Bug: 262898801 Test: atest Change-Id: Ie63b019dde762257df5c1c9eefbd471d67808432
2023-03-14Initial import of owasp-java-encoder from upstream main am: 3566f56059 am: ↵Andrew Vuong
6899028edc Original change: https://android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/2486318 Change-Id: I48a7df5ae5a7339e32dfe844cff90ab5bd31c7c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Initial import of owasp-java-encoder from upstream main am: 3566f56059Andrew Vuong
Original change: https://android-review.googlesource.com/c/platform/external/owasp/java-encoder/+/2486318 Change-Id: I1f9cd22887666b64992c9246958d0c6bd9e3e72e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Initial import of owasp-java-encoder from upstream mainAndrew Vuong
Bug: 262898801 Test: mma Change-Id: I89d97ac6be9533b10d9add01706d59260b686cdd
2023-03-07Initial empty repositorymain-16kFrank Piva
2022-05-04Merge pull request #61 from OWASP/updateJim Manico
General Maintenance
2022-05-04Merge pull request #59 from ↵Jeremy Long
OWASP/dependabot/maven/jsp/org.springframework-spring-core-5.3.19 Bump spring-core from 5.1.3.RELEASE to 5.3.19 in /jsp
2022-05-04fix copy paste errorJeremy Long
2022-05-04updated plugin version, updated min ESAPI version, switched to jacoco for ↵Jeremy Long
code coverage
2022-05-04fix typoJeremy Long
2022-04-22Bump spring-core from 5.1.3.RELEASE to 5.3.19 in /jspdependabot[bot]
Bumps [spring-core](https://github.com/spring-projects/spring-framework) from 5.1.3.RELEASE to 5.3.19. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.1.3.RELEASE...v5.3.19) --- updated-dependencies: - dependency-name: org.springframework:spring-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
2022-04-15Merge pull request #58 from loris-s-sonarsource/patch-1Jim Manico
Tiny typo Fix
2022-04-15Tiny typo FixLoris S
2022-03-08Merge pull request #55 from seanf/patch-1Jim Manico
Add badge for javadoc
2022-03-08Add badge for javadocSean Flanigan
2021-09-13Merge pull request #52 from kwwall/mainJim Manico
Close issue #51. Correct javadoc for Encode class.
2021-09-13Close issue #51. Correct javadoc for Encode class.kwwall
2021-08-31Update README.mdJim Manico
2021-08-31Update README.mdJim Manico
2021-07-20Merge pull request #45 from casid/patch-1Jim Manico
Add automatic module name
2021-02-07Add Automatic-Modulue-Name via apache felix bundle plugin for each module.Andreas Hager
2021-02-07Revert adding Automatic-Modulue-Name to root MANIFEST.MFAndreas Hager
2021-02-07Add automatic module nameAndreas Hager
2020-11-08updated to 1.2.3Jeremy Long
2020-11-08updated for 1.2.3Jeremy Long
2020-11-08v1.2.3Jeremy Long
2020-11-08update checkstyle checksJeremy Long
2020-11-08fix checkstyle configJeremy Long
2020-11-08fix javadocJeremy Long
2020-11-08Merge pull request #37 from kwwall/masterJeremy Long
Changes to get owasp-java-encoder to work with ESAPI 2.2.0.0 and later
2020-11-08Merge branch 'master' into masterJeremy Long
2020-11-08Merge pull request #40 from OWASP/release123Jeremy Long
Fix build & Merge #39
2020-11-07release versionJeremy Long
2020-11-07specify dist so both jdk8 are availableJeremy Long
2020-10-13Generate OSGi-compliant MANIFEST.MF filesPhilipp Berger
2020-10-13Fixes org.owasp.encoder.esapi.ESAPIEncoder.Impl that does not overridePhilipp Berger
all abstract methods
2020-08-02Change from using SLF4J to JUL for logging.kwwall
2020-07-29Minimal properties to get JUnit tests working for ESAPIEncoderTest.kwwall