Skip to content

Commit

Permalink
Improve dependencies definition.
Browse files Browse the repository at this point in the history
  • Loading branch information
Inthirakumaaran committed Jun 3, 2024
1 parent d4857c7 commit 9e82f15
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 120 deletions.
140 changes: 39 additions & 101 deletions modules/integration/tests-integration/tests-backend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<inherited>false</inherited>
<version>2.22.1</version>
<configuration>
<!-- <argLine>-Xmx1024m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
<!--<argLine>-Xmx1024m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
<argLine>-Xmx1024m
-Dorg.apache.jasper.compiler.disablejsr199=true
--add-opens=java.base/java.lang=ALL-UNNAMED
Expand Down Expand Up @@ -203,13 +203,6 @@
</profile>
</profiles>

<properties>
<java.version>11</java.version>
<activemq.version>5.16.3</activemq.version>
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.6</logback.version>
</properties>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -417,18 +410,18 @@
<artifactItem>
<groupId>org.wso2.carbon.cache.sync.manager</groupId>
<artifactId>org.wso2.carbon.cache.sync.jms.manager</artifactId>
<version>2.0.14-SNAPSHOT</version>
<version>${cache.sync.jms.manager.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>
${basedir}/target/test-classes/samples/cache
</outputDirectory>
<destFileName>org.wso2.carbon.cache.sync.jms.manager-2.0.14-SNAPSHOT.jar</destFileName>
<destFileName>org.wso2.carbon.cache.sync.jms.manager-2.0.14.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<version>1.0.1</version>
<version>${geronimo-j2ee-management_1.1_spec.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>
Expand All @@ -439,7 +432,7 @@
<artifactItem>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.3</version>
<version>${activemq.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>
Expand All @@ -450,7 +443,7 @@
<artifactItem>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.16.3</version>
<version>${activemq.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>
Expand All @@ -461,7 +454,7 @@
<artifactItem>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.1.1</version>
<version>${geronimo-jms_1.1_spec.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>
Expand All @@ -472,7 +465,7 @@
<artifactItem>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
<version>1.11</version>
<version>${hawtbuf.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>
Expand All @@ -483,7 +476,7 @@
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.31</version>
<version>${slf4j-api-server.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>
Expand All @@ -494,7 +487,7 @@
<artifactItem>
<groupId>org.wso2.orbit.javax.jms</groupId>
<artifactId>jms-api</artifactId>
<version>2.0.1.wso2v1</version>
<version>${jms-api.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>
Expand Down Expand Up @@ -730,18 +723,13 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>5.16.3</version>
<version>${activemq.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>5.7.0</version>
<version>${old-activemq-core.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -755,15 +743,6 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>

<!-- Logback implementation for SLF4J -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>

<!-- Log4j to SLF4J bridge -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
Expand Down Expand Up @@ -800,11 +779,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
Expand Down Expand Up @@ -1102,22 +1076,22 @@
<dependency>
<groupId>org.wso2.carbon.cache.sync.manager</groupId>
<artifactId>org.wso2.carbon.cache.sync.jms.manager</artifactId>
<version>2.0.14-SNAPSHOT</version>
<version>${cache.sync.jms.manager.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.3</version>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.16.3</version>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>5.16.3</version>
<version>${activemq.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
Expand All @@ -1129,102 +1103,51 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>5.7.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>

<!-- Logback implementation for SLF4J -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>

<!-- Log4j to SLF4J bridge -->
<!-- <dependency>-->
<!-- <groupId>org.slf4j</groupId>-->
<!-- <artifactId>log4j-over-slf4j</artifactId>-->
<!-- <version>${slf4j.version}</version>-->
<!-- </dependency>-->

<!-- JUnit for testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>${logging.log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.1</version>
<version>${logging.log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>javax.management</groupId>-->
<!-- <artifactId>jmx</artifactId>-->
<!-- <version>1.2.1</version>-->
<!-- </dependency>-->

<!-- JavaEE API for javax.management -->
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>8.0</version>
<scope>provided</scope>
<version>${logging.log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<version>1.0.1</version>
<version>${geronimo-j2ee-management_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.1.1</version>
<version>${geronimo-jms_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
<version>1.11</version>
<version>${hawtbuf.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.31</version>
<version>${slf4j-api-server.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.orbit.javax.jms</groupId>
<artifactId>jms-api</artifactId>
<version>2.0.1.wso2v1</version>
<version>${jms-api.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.activemq</groupId>-->
<!-- <artifactId>activemq-broker</artifactId>-->
<!-- <version>5.16.3</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.wso2.samples.is</groupId>
<artifactId>org.wso2.carbon.identity.sample.extension.authenticators</artifactId>
Expand Down Expand Up @@ -1352,4 +1275,19 @@
<scope>test</scope>
</dependency>
</dependencies>

<properties>
<java.version>11</java.version>
<activemq.version>5.16.3</activemq.version>
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.6</logback.version>
<geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
<geronimo-j2ee-management_1.1_spec.version>1.0.1</geronimo-j2ee-management_1.1_spec.version>
<hawtbuf.version>1.11</hawtbuf.version>
<slf4j-api-server.version>1.7.31</slf4j-api-server.version>
<jms-api.version>2.0.1.wso2v1</jms-api.version>
<cache.sync.jms.manager.version>2.0.14</cache.sync.jms.manager.version>
<logging.log4j.version>2.17.1</logging.log4j.version>
<old-activemq-core.version>5.7.0</old-activemq-core.version>
</properties>
</project>
2 changes: 1 addition & 1 deletion ...-backend/src/test/java/org/wso2/identity/integration/test/cache/JMSCacheSyncTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class JMSCacheSyncTestCase extends SelfRegisterTestBase {
private static final String RECEIVED_MESSAGE = "Received cache invalidation message from other cluster nodes";
private static final String SENT_MESSAGE = "Sending cache invalidation message to other cluster nodes";
public static final String CACHE_SYNC_JMS_MANAGER_JAR =
"org.wso2.carbon.cache.sync.jms.manager-2.0.14-SNAPSHOT.jar";
"org.wso2.carbon.cache.sync.jms.manager-2.0.14.jar";
public static final String JMS_API_JAR = "jms-api_2-2.0.1.wso2v1.jar";

private static Connection connection;
Expand Down
18 changes: 0 additions & 18 deletions ...egration/tests-backend/src/test/resources/artifacts/IS/cache/cache_sync_log4j2.properties
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
#
# Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
#
# WSO2 Inc. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

# list of all appenders
#add entry "syslog" to use the syslog appender
appenders = CARBON_CONSOLE, CARBON_LOGFILE, AUDIT_LOGFILE, ATOMIKOS_LOGFILE, CARBON_TRACE_LOGFILE, DELETE_EVENT_LOGFILE, TRANSACTION_LOGFILE, osgi, DIAGNOSTICS
Expand Down

0 comments on commit 9e82f15

Please sign in to comment.