Skip to content

Commit

Permalink
Merge pull request #585 from WeBankFinTech/develop-2.4.5
Browse files Browse the repository at this point in the history
fix security bug
  • Loading branch information
dylan-fan authored Aug 30, 2022
2 parents 07f4062 + b5fc319 commit 7bf1abb
Show file tree
Hide file tree
Showing 20 changed files with 955 additions and 4,249 deletions.
2 changes: 1 addition & 1 deletion BUILD_INFO
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eggroll.version=2.4.4
eggroll.version=2.4.5
4 changes: 2 additions & 2 deletions jvm/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

<properties>
<commons-cli.version>1.4</commons-cli.version>
<commons-dbcp2.version>2.7.0</commons-dbcp2.version>
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
<mybatis-generator-plugin.version>1.3.7</mybatis-generator-plugin.version>
<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
<mysql-connector-java.version>8.0.28</mysql-connector-java.version>
<mybatis.generator.config.basedir>${project.basedir}/main</mybatis.generator.config.basedir>
<jna.platform.version>5.0.0</jna.platform.version>
</properties>
Expand Down
9 changes: 5 additions & 4 deletions jvm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<modelVersion>4.0.0</modelVersion>

<properties>
<eggroll.version>2.4.4</eggroll.version>
<eggroll.version>2.4.5</eggroll.version>

<!-- Languages -->
<code.cache.size>512m</code.cache.size>
Expand All @@ -219,17 +219,18 @@
<commons-io.version>2.11.0</commons-io.version>
<commons-lang3.version>3.8.1</commons-lang3.version>
<guava.version>30.1.1-jre</guava.version>
<grpc.version>1.27.2</grpc.version>
<grpc.version>1.31.2</grpc.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<junit4.version>4.13.2</junit4.version>
<junit.jupiter.version>5.5.1</junit.jupiter.version>
<junit.platform.version>1.5.1</junit.platform.version>
<log4j2.version>2.17.1</log4j2.version>
<netty.version>4.1.63.Final</netty.version>
<protobuf.version>3.16.1</protobuf.version>
<!-- <protobuf.version>3.16.1</protobuf.version>-->
<protobuf.version>3.21.5</protobuf.version>
<rocksdb.version>6.8.1</rocksdb.version>
<scalatest.version>3.0.8</scalatest.version>
<spark.version>2.4.3</spark.version>
<spark.version>2.4.8</spark.version>

<!-- Plugins -->
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion jvm/roll_frame/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<name>Eggroll RollFrame</name>

<properties>
<jackson.version>2.13.2</jackson.version>
<jackson.version>2.13.3</jackson.version>
<jep.version>3.9.1</jep.version>
</properties>

Expand Down
14 changes: 11 additions & 3 deletions jvm/roll_site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</parent>

<properties>
<spring.version>5.3.18</spring.version>
<spring.version>5.3.20</spring.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -101,6 +101,14 @@
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>




<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -111,7 +119,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160810</version>
<version>20220320</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -149,4 +157,4 @@
</plugins>
</build>

</project>
</project>
3 changes: 2 additions & 1 deletion jvm/roll_site_2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160810</version>
<!-- <version>20160810</version>-->
<version>20220320</version>
</dependency>


Expand Down
2 changes: 1 addition & 1 deletion python/eggroll/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# limitations under the License.
#

__version__ = "2.4.4"
__version__ = "2.4.5"
Loading

0 comments on commit 7bf1abb

Please sign in to comment.