Skip to content

Commit

Permalink
ZCS-11112 : Log4j version change to 2.17.1
Browse files Browse the repository at this point in the history 
ZCS-11112: updated the versions for slf4j and apache mina
  • Loading branch information
@abhishekdeshmukh2209 @silentsakky
abhishekdeshmukh2209 authored and silentsakky committed May 2, 2022
1 parent 3768492 commit d207e1b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
3 changes: 2 additions & 1 deletion build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
<fileset dir="../antisamy/build/lib" includes="*.jar" />
</copy>
<ivy:install organisation="zimbra" module="zm-charset" revision="latest.integration" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
<ivy:install organisation="log4j" module="log4j" revision="1.2.16" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
<ivy:install organisation="org.apache.logging.log4j" module="log4j-core" revision="2.17.1" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
<ivy:install organisation="org.apache.logging.log4j" module="log4j-api" revision="2.17.1" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
<ivy:install organisation="zimbra" module="zmzimbratozimbramig" revision="8.7" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
<delete>
<fileset dir="${dist.dir}" excludes="*.jar" />
Expand Down
9 changes: 5 additions & 4 deletions ivy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<dependency org="org.apache.lucene" name="lucene-analyzers" rev="3.5.0"/>
<dependency org="org.apache.lucene" name="lucene-core" rev="3.5.0"/>
<dependency org="org.apache.lucene" name="lucene-smartcn" rev="3.5.0"/>
<dependency org="org.apache.mina" name="mina-core" rev="2.0.4"/>
<dependency org="org.apache.mina" name="mina-core" rev="2.1.6"/>
<dependency org="org.apache.neethi" name="neethi" rev="3.0.2"/>
<dependency org="org.apache.ws.xmlschema" name="xmlschema-core" rev="2.0.3"/>
<dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.5"/>
Expand Down Expand Up @@ -119,8 +119,8 @@
<dependency org="org.mariadb.jdbc" name="mariadb-java-client" rev="2.4.3"/>
<dependency org="org.python" name="jython-standalone" rev="2.5.2"/>
<dependency org="org.scijava" name="native-lib-loader" rev="2.3.5"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.30"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.30"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.36"/>
<dependency org="org.slf4j" name="slf4j-simple" rev="1.7.36"/>
<dependency org="org.springframework" name="spring-aop" rev="5.1.10.RELEASE"/>
<dependency org="org.springframework" name="spring-beans" rev="5.1.10.RELEASE"/>
<dependency org="org.springframework" name="spring-context" rev="5.1.10.RELEASE"/>
Expand Down Expand Up @@ -177,7 +177,8 @@
<exclude org="com.noelios.restlet" module="com.noelios.restlet"/>
<exclude org="javax.sql" module="jdbc-stdext"/>
<exclude org="javax.transaction" module="jta"/>
<exclude org="log4j" module="log4j"/>
<exclude org="org.apache.logging.log4j" module="log4j-core"/>
<exclude org="org.apache.logging.log4j" module="log4j-api"/>
<exclude org="maven-plugins" module="maven-cobertura-plugin"/>
<exclude org="maven-plugins" module="maven-findbugs-plugin"/>
<exclude org="net.sf.josql" module="gentlyweb-utils"/>
Expand Down
14 changes: 8 additions & 6 deletions pkg-builder.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,14 @@ ($)
cpy_file("build/dist/jline-0.9.93.jar", "$stage_base_dir/opt/zimbra/lib/jars/jline-0.9.93.jar");
cpy_file("build/dist/jzlib-1.0.7.jar", "$stage_base_dir/opt/zimbra/lib/jars/jzlib-1.0.7.jar");
cpy_file("build/dist/libidn-1.24.jar", "$stage_base_dir/opt/zimbra/lib/jars/libidn-1.24.jar");
cpy_file("build/dist/log4j-1.2.16.jar", "$stage_base_dir/opt/zimbra/lib/jars/log4j-1.2.16.jar");
cpy_file("build/dist/log4j-api-2.17.1.jar", "$stage_base_dir/opt/zimbra/lib/jars/log4j-api-2.17.1.jar");
cpy_file("build/dist/log4j-core-2.17.1.jar", "$stage_base_dir/opt/zimbra/lib/jars/log4j-core-2.17.1.jar");
cpy_file("build/dist/lucene-analyzers-3.5.0.jar", "$stage_base_dir/opt/zimbra/lib/jars/lucene-analyzers-3.5.0.jar");
cpy_file("build/dist/lucene-core-3.5.0.jar", "$stage_base_dir/opt/zimbra/lib/jars/lucene-core-3.5.0.jar");
cpy_file("build/dist/lucene-smartcn-3.5.0.jar", "$stage_base_dir/opt/zimbra/lib/jars/lucene-smartcn-3.5.0.jar");
cpy_file("build/dist/mail-1.4.7.jar", "$stage_base_dir/opt/zimbra/lib/jars/mail-1.4.7.jar");
cpy_file("build/dist/mariadb-java-client-2.4.3.jar", "$stage_base_dir/opt/zimbra/lib/jars/mariadb-java-client-2.4.3.jar");
cpy_file("build/dist/mina-core-2.0.4.jar", "$stage_base_dir/opt/zimbra/lib/jars/mina-core-2.0.4.jar");
cpy_file("build/dist/mina-core-2.1.6.jar", "$stage_base_dir/opt/zimbra/lib/jars/mina-core-2.1.6.jar");
cpy_file("build/dist/neethi-3.0.2.jar", "$stage_base_dir/opt/zimbra/lib/jars/neethi-3.0.2.jar");
cpy_file("build/dist/nekohtml-1.9.13.1z.jar", "$stage_base_dir/opt/zimbra/lib/jars/nekohtml-1.9.13.1z.jar");
cpy_file("build/dist/oauth-20100527.jar", "$stage_base_dir/opt/zimbra/lib/jars/oauth-20100527.jar");
Expand All @@ -195,8 +196,8 @@ ($)
cpy_file("build/dist/batik-util-1.14.jar", "$stage_base_dir/opt/zimbra/lib/jars/batik-util-1.14.jar");
cpy_file("build/dist/sac-1.3.jar", "$stage_base_dir/opt/zimbra/lib/jars/sac-1.3.jar");
cpy_file("build/dist/policy-2.3.jar", "$stage_base_dir/opt/zimbra/lib/jars/policy-2.3.jar");
cpy_file("build/dist/slf4j-api-1.7.30.jar", "$stage_base_dir/opt/zimbra/lib/jars/slf4j-api-1.7.30.jar");
cpy_file("build/dist/slf4j-log4j12-1.7.30.jar", "$stage_base_dir/opt/zimbra/lib/jars/slf4j-log4j12-1.7.30.jar");
cpy_file("build/dist/slf4j-api-1.7.36.jar", "$stage_base_dir/opt/zimbra/lib/jars/slf4j-api-1.7.36.jar");
cpy_file("build/dist/slf4j-simple-1.7.36.jar", "$stage_base_dir/opt/zimbra/lib/jars/slf4j-simple-1.7.36.jar");
cpy_file("build/dist/spring-aop-5.1.10.RELEASE.jar", "$stage_base_dir/opt/zimbra/lib/jars/spring-aop-5.1.10.RELEASE.jar");
cpy_file("build/dist/spring-beans-5.1.10.RELEASE.jar", "$stage_base_dir/opt/zimbra/lib/jars/spring-beans-5.1.10.RELEASE.jar");
cpy_file("build/dist/spring-context-5.1.10.RELEASE.jar", "$stage_base_dir/opt/zimbra/lib/jars/spring-context-5.1.10.RELEASE.jar");
Expand Down Expand Up @@ -262,7 +263,7 @@ ($)
cpy_file("build/dist/sshd-common-2.6.1.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/sshd-common-2.6.1.jar");
cpy_file("build/dist/sshd-core-2.6.1.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/sshd-core-2.6.1.jar");
cpy_file("build/dist/eddsa-0.3.0.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/eddsa-0.3.0.jar");
cpy_file("build/dist/slf4j-api-1.7.30.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/slf4j-api-1.7.30.jar");
cpy_file("build/dist/slf4j-api-1.7.36.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/slf4j-api-1.7.36.jar");
cpy_file("build/dist/guava-28.1-jre.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/guava-28.1-jre.jar");
cpy_file("build/dist/httpasyncclient-4.1.4.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/httpasyncclient-4.1.4.jar");
cpy_file("build/dist/httpclient-4.5.8.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/httpclient-4.5.8.jar");
Expand All @@ -282,7 +283,8 @@ ($)
cpy_file("build/dist/junixsocket-rmi-2.3.2.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/junixsocket-rmi-2.3.2.jar");
cpy_file("build/dist/jzlib-1.0.7.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/jzlib-1.0.7.jar");
cpy_file("build/dist/libidn-1.24.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/libidn-1.24.jar");
cpy_file("build/dist/log4j-1.2.16.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/log4j-1.2.16.jar");
cpy_file("build/dist/log4j-api-2.17.1.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/log4j-api-2.17.1.jar");
cpy_file("build/dist/log4j-core-2.17.1.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/log4j-core-2.17.1.jar");
cpy_file("build/dist/mail-1.4.7.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/mail-1.4.7.jar");
cpy_file("build/dist/mariadb-java-client-2.4.3.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/mariadb-java-client-2.4.3.jar");
cpy_file("build/dist/oauth-20100527.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/oauth-20100527.jar");
Expand Down

0 comments on commit d207e1b

Please sign in to comment.