Skip to content

Commit

Permalink
Merge pull request #13421 from tharindu1st/remove-wss4j
Browse files Browse the repository at this point in the history
fix log issue
  • Loading branch information
tharindu1st authored Mar 17, 2024
2 parents eed737f + 27b5ece commit 92bc377
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
4 changes: 4 additions & 0 deletions modules/integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
15 changes: 14 additions & 1 deletion modules/integration/tests-integration/tests-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>org.wso2.carbon.am.integration.test</artifactId>
<groupId>org.wso2.am</groupId>
Expand Down Expand Up @@ -152,6 +153,7 @@ under the License.
<workingDirectory>${basedir}/target</workingDirectory>
<classpathDependencyExcludes>
<classpathDependencyExclude>org.wso2.org.ops4j.pax.logging</classpathDependencyExclude>
<classpathDependencyExclude>org.ops4j.pax.logging</classpathDependencyExclude>
</classpathDependencyExcludes>
<systemPropertyVariables>
<okHttpLogs>false</okHttpLogs>
Expand Down Expand Up @@ -251,6 +253,7 @@ under the License.
<workingDirectory>${basedir}/target</workingDirectory>
<classpathDependencyExcludes>
<classpathDependencyExclude>org.wso2.org.ops4j.pax.logging</classpathDependencyExclude>
<classpathDependencyExclude>org.ops4j.pax.logging</classpathDependencyExclude>
</classpathDependencyExcludes>
<systemPropertyVariables>
<okHttpLogs>false</okHttpLogs>
Expand Down Expand Up @@ -633,6 +636,16 @@ under the License.
<dependency>
<groupId>org.wso2.carbon.automationutils</groupId>
<artifactId>org.wso2.carbon.integration.common.utils</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Expand Down

0 comments on commit 92bc377

Please sign in to comment.