version 2.2.0 remove log4j files

IBMStreams · Jul 24, 2022 · 20d5179 · 20d5179
1 parent ab4ca6b
commit 20d5179
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 3 deletions.
diff --git a/com.ibm.streamsx.topology/CHANGELOG.md b/com.ibm.streamsx.topology/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## develop/latest
 * [#2643](https://github.com/IBMStreams/streamsx.topology/issues/2643) Documentation: Specifying a space in a notebook
 
+## v2.2.0
+remove log4j jar files from toolkit
+
 ## v2.1.0
 * [#2649](https://github.com/IBMStreams/streamsx.topology/issues/2649) Python scripts: Print diagnostic info in verbose mode when spl-python-extract skips python modules
 * [#2646](https://github.com/IBMStreams/streamsx.topology/issues/2646) Python: Support new consumingReads parameter of spl.endpoint::EndpointSink

diff --git a/com.ibm.streamsx.topology/info.xml b/com.ibm.streamsx.topology/info.xml
@@ -38,7 +38,7 @@ tuple processing using Python.
 See the documentation under [namespace:com.ibm.streamsx.topology.python|com.ibm.streamsx.topology.python] for details.
 
     </description>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <requiredProductVersion>4.2</requiredProductVersion>
     </identity>
   <dependencies/>

diff --git a/com.ibm.streamsx.topology/opt/python/packages/streamsx/_streams/_version.py b/com.ibm.streamsx.topology/opt/python/packages/streamsx/_streams/_version.py
@@ -3,7 +3,7 @@
 # Copyright IBM Corp. 2018,2019
 
 ## Common PEP396 version for modules shipped with streamsx packages
-__version__='2.1.0'
+__version__='2.2.0'
 
 import pkg_resources
 import sys

diff --git a/...amsx.topology/opt/slf4j-1.7.5/LICENSE.txt → ...msx.topology/opt/slf4j-1.7.36/LICENSE.txt b/...amsx.topology/opt/slf4j-1.7.5/LICENSE.txt → ...msx.topology/opt/slf4j-1.7.36/LICENSE.txt
diff --git a/com.ibm.streamsx.topology/opt/slf4j-1.7.36/slf4j-api-1.7.36.jar b/com.ibm.streamsx.topology/opt/slf4j-1.7.36/slf4j-api-1.7.36.jar
diff --git a/com.ibm.streamsx.topology/opt/slf4j-1.7.36/slf4j-reload4j-1.7.36.jar b/com.ibm.streamsx.topology/opt/slf4j-1.7.36/slf4j-reload4j-1.7.36.jar
diff --git a/com.ibm.streamsx.topology/opt/slf4j-1.7.5/slf4j-api-1.7.5.jar b/com.ibm.streamsx.topology/opt/slf4j-1.7.5/slf4j-api-1.7.5.jar
diff --git a/com.ibm.streamsx.topology/opt/slf4j-1.7.5/slf4j-log4j12-1.7.5.jar b/com.ibm.streamsx.topology/opt/slf4j-1.7.5/slf4j-log4j12-1.7.5.jar
diff --git a/java/build.xml b/java/build.xml
@@ -119,7 +119,7 @@
   <manifestclasspath property="jar.classpath" jarfile="${jar}">
      <classpath>
        <path refid="tk.classpath"/>
-       <fileset dir="${tk.opt}/slf4j-1.7.5">
+       <fileset dir="${tk.opt}/slf4j-1.7.36">
           <include name="*.jar"/>
        </fileset>
      </classpath>