Skip to content

v2.1.2 #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GTYeokh merged 30 commits into from
Dec 17, 2021
Merged

v2.1.2 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e1e5f50
for APEX 2
Oct 20, 2021
3080266
Merge pull request #1 from GovTechSG/master
blasttoys Oct 20, 2021
dc70b31
Merge branch 'dirtyUpdate' into development
blasttoys Oct 20, 2021
7c62589
Merge pull request #3 from blasttoys/development
blasttoys Oct 20, 2021
b1e35a3
clean
Oct 24, 2021
b4d553d
backup before clean, verifysupportedkeyfiletype
Nov 7, 2021
11ae3a5
readme updated
Nov 9, 2021
5c09403
clean
Nov 9, 2021
077b0c7
clean
Nov 9, 2021
7b689cc
clean
Nov 9, 2021
c619233
Merge pull request #4 from blasttoys/dirtyUpdate
blasttoys Nov 9, 2021
dfa9c88
clean
Nov 9, 2021
a6f657d
Merge branch 'master' into development
blasttoys Nov 9, 2021
a2037db
Merge pull request #5 from blasttoys/development
blasttoys Nov 9, 2021
3a8e159
Merge pull request #6 from blasttoys/dirtyUpdate
blasttoys Nov 9, 2021
3dbff9a
Merge pull request #7 from blasttoys/development
blasttoys Nov 9, 2021
8df0b90
update README.md
Nov 9, 2021
9ade817
update README.md
Nov 9, 2021
88f7294
Merge pull request #8 from blasttoys/dirtyUpdate
blasttoys Nov 9, 2021
95e1cc9
Merge pull request #9 from blasttoys/development
blasttoys Nov 9, 2021
07634ee
resolved conflict
blasttoys Dec 13, 2021
a4c4e91
Merge pull request #11 from blasttoys/master
blasttoys Dec 13, 2021
2458e39
Sync
blasttoys Dec 13, 2021
cb4da97
Merge branch 'development' of https://github.com/blasttoys/java-apex-…
blasttoys Dec 13, 2021
b1489f1
Merge branch 'GovTechSG-master' into development
blasttoys Dec 13, 2021
e87f339
v2.1.1
blasttoys Dec 13, 2021
b1ff157
Merge pull request #13 from blasttoys/development
blasttoys Dec 13, 2021
154913d
Update to log4j version 2.16.0
blasttoys Dec 17, 2021
18fbe92
Merge pull request #14 from blasttoys/development
blasttoys Dec 17, 2021
c8b26a5
Merge branch 'development' into master
blasttoys Dec 17, 2021
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

### V2.1.2

- Fixed vulnerability CVE-2021-44228
- Update to log4j version 2.16.0

### V2.1.1

- Fixed vulnerability CVE-2021-44228
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ mvn install
<dependency>
<groupId>com.api.util</groupId>
<artifactId>ApiSecurity</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
</dependency>
```

Expand All @@ -76,12 +76,12 @@ mvn install
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.15.0</version>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.15.0</version>
<version>2.16.0</version>
</dependency>
```

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}


version '2.1.1'
version '2.1.2'

tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
Expand All @@ -20,8 +20,8 @@ dependencies {

//gradle 4.0
compile group: 'commons-lang', name: 'commons-lang', version: '2.4'
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.15.0'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.15.0'
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.16.0'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.5.1'
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.69'
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.api.util</groupId>
<artifactId>ApiSecurity</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -80,12 +80,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.15.0</version>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.15.0</version>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down