Skip to content

Commit 7f62ad8

Browse files
author
Jean Deruelle
committed
Fixing build
1 parent a52fee8 commit 7f62ad8

File tree

8 files changed

+39
-8
lines changed

8 files changed

+39
-8
lines changed

‎containers/sip-servlets-as10-drop-in/build-restcomm-modules/build.xml

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
<maven-resource group="io.dropwizard.metrics" artifact="metrics-core"/>
7171
<maven-resource group="com.google.code.gson" artifact="gson"/>
7272
<maven-resource group="org.apache.httpcomponents" artifact="httpclient"/>
73+
<maven-resource group="org.apache.httpcomponents" artifact="httpcore"/>
74+
<maven-resource group="org.slf4j" artifact="slf4j-api"/>
7375
<maven-resource group="org.slf4j" artifact="slf4j-simple"/>
7476
</module-def>
7577
</target>

‎containers/sip-servlets-as10-drop-in/build-restcomm-modules/pom.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,17 @@
221221
<artifactId>metrics-core</artifactId>
222222
<version>${metrics.version}</version>
223223
</dependency>
224+
225+
<dependency>
226+
<groupId>org.slf4j</groupId>
227+
<artifactId>slf4j-api</artifactId>
228+
<version>${slf4j.version}</version>
229+
</dependency>
224230

225231
<dependency>
226232
<groupId>org.slf4j</groupId>
227233
<artifactId>slf4j-simple</artifactId>
228-
<version>1.5.5</version>
234+
<version>${slf4j.version}</version>
229235
</dependency>
230236

231237
<dependency>

‎containers/sip-servlets-as7-drop-in/build-restcomm-modules/build.xml

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
<maven-resource group="io.dropwizard.metrics" artifact="metrics-core"/>
7171
<maven-resource group="com.google.code.gson" artifact="gson"/>
7272
<maven-resource group="org.apache.httpcomponents" artifact="httpclient"/>
73+
<maven-resource group="org.apache.httpcomponents" artifact="httpcore"/>
74+
<maven-resource group="org.slf4j" artifact="slf4j-api"/>
7375
<maven-resource group="org.slf4j" artifact="slf4j-simple"/>
7476
</module-def>
7577

‎containers/sip-servlets-as7-drop-in/build-restcomm-modules/pom.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,16 @@
223223
<version>${metrics.version}</version>
224224
</dependency>
225225

226+
<dependency>
227+
<groupId>org.slf4j</groupId>
228+
<artifactId>slf4j-api</artifactId>
229+
<version>${slf4j.version}</version>
230+
</dependency>
231+
226232
<dependency>
227233
<groupId>org.slf4j</groupId>
228234
<artifactId>slf4j-simple</artifactId>
229-
<version>1.5.5</version>
235+
<version>${slf4j.version}</version>
230236
</dependency>
231237

232238
<dependency>

‎containers/sip-servlets-as8-drop-in/build-restcomm-modules/build.xml

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
<maven-resource group="io.dropwizard.metrics" artifact="metrics-core"/>
7171
<maven-resource group="com.google.code.gson" artifact="gson"/>
7272
<maven-resource group="org.apache.httpcomponents" artifact="httpclient"/>
73+
<maven-resource group="org.apache.httpcomponents" artifact="httpcore"/>
74+
<maven-resource group="org.slf4j" artifact="slf4j-api"/>
7375
<maven-resource group="org.slf4j" artifact="slf4j-simple"/>
7476
</module-def>
7577
</target>

‎containers/sip-servlets-as8-drop-in/build-restcomm-modules/pom.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,16 @@
222222
<version>${metrics.version}</version>
223223
</dependency>
224224

225+
<dependency>
226+
<groupId>org.slf4j</groupId>
227+
<artifactId>slf4j-api</artifactId>
228+
<version>${slf4j.version}</version>
229+
</dependency>
230+
225231
<dependency>
226232
<groupId>org.slf4j</groupId>
227233
<artifactId>slf4j-simple</artifactId>
228-
<version>1.5.5</version>
234+
<version>${slf4j.version}</version>
229235
</dependency>
230236

231237
<dependency>

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<restcomm.commons.version>2.0.145</restcomm.commons.version>
9898
<tomcat-7.version>7.0.64</tomcat-7.version>
9999
<metrics.version>3.1.0</metrics.version>
100+
<slf4j.version>1.5.5</slf4j.version>
100101
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
101102
</properties>
102103

‎sip-servlets-impl/pom.xml

+11-5
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,16 @@
113113
<version>${metrics.version}</version>
114114
</dependency>
115115

116+
<dependency>
117+
<groupId>org.slf4j</groupId>
118+
<artifactId>slf4j-api</artifactId>
119+
<version>${slf4j.version}</version>
120+
</dependency>
121+
116122
<dependency>
117123
<groupId>org.slf4j</groupId>
118124
<artifactId>slf4j-simple</artifactId>
119-
<version>1.5.5</version>
125+
<version>${slf4j.version}</version>
120126
</dependency>
121127

122128
<!-- javax.mail deps for multipart support -->
@@ -232,7 +238,7 @@
232238
<goal> copy-dependencies </goal>
233239
</goals>
234240
<configuration>
235-
<includeArtifactIds>jain-sip-api,jain-sip-ri,concurrent,log4j,commons-logging,dnsjava,stun4j,activation,mail,restcomm-jain-sip-ha-core,restcomm-jain-sip-ext,commons-codec,restcomm-statistics,metrics-core,gson,slf4j-simple,httpclient</includeArtifactIds>
241+
<includeArtifactIds>jain-sip-api,jain-sip-ri,concurrent,log4j,commons-logging,dnsjava,stun4j,activation,mail,restcomm-jain-sip-ha-core,restcomm-jain-sip-ext,commons-codec,restcomm-statistics,metrics-core,gson,slf4j-api,slf4j-simple,httpcore,httpclient</includeArtifactIds>
236242
<outputDirectory>${CATALINA_HOME}/lib</outputDirectory>
237243
</configuration>
238244
</execution>
@@ -283,7 +289,7 @@
283289
<goal> copy-dependencies </goal>
284290
</goals>
285291
<configuration>
286-
<includeArtifactIds>jain-sip-api,jain-sip-ri,concurrent,log4j,commons-logging,dnsjava,stun4j,activation,mail,restcomm-jain-sip-ha-core,restcomm-jain-sip-ext,commons-codec,restcomm-statistics,metrics-core,gson,slf4j-simple,httpclient</includeArtifactIds>
292+
<includeArtifactIds>jain-sip-api,jain-sip-ri,concurrent,log4j,commons-logging,dnsjava,stun4j,activation,mail,restcomm-jain-sip-ha-core,restcomm-jain-sip-ext,commons-codec,restcomm-statistics,metrics-core,gson,slf4j-api,slf4j-simple,httpcore,httpclient</includeArtifactIds>
287293
<outputDirectory>${env.CATALINA_HOME}/lib</outputDirectory>
288294
</configuration>
289295
</execution>
@@ -334,7 +340,7 @@
334340
<goal> copy-dependencies </goal>
335341
</goals>
336342
<configuration>
337-
<includeArtifactIds>jain-sip-api,jain-sip-ri,concurrent,log4j,commons-logging,dnsjava,stun4j,activation,mail,restcomm-jain-sip-ha-core,restcomm-jain-sip-ext,commons-codec,commons-statistics,metrics-core,gson,slf4j-simple,httpclient</includeArtifactIds>
343+
<includeArtifactIds>jain-sip-api,jain-sip-ri,concurrent,log4j,commons-logging,dnsjava,stun4j,activation,mail,restcomm-jain-sip-ha-core,restcomm-jain-sip-ext,commons-codec,commons-statistics,metrics-core,gson,slf4j-api,slf4j-simple,httpcore,httpclient</includeArtifactIds>
338344
<outputDirectory>${CATALINA_HOME}/lib</outputDirectory>
339345
</configuration>
340346
</execution>
@@ -385,7 +391,7 @@
385391
<goal> copy-dependencies </goal>
386392
</goals>
387393
<configuration>
388-
<includeArtifactIds>jain-sip-api,jain-sip-ri,concurrent,log4j,commons-logging,dnsjava,stun4j,activation,mail,restcomm-jain-sip-ha-core,restcomm-jain-sip-ext,commons-codec,restcomm-statistics,metrics-core,gson,slf4j-simple,httpclient</includeArtifactIds>
394+
<includeArtifactIds>jain-sip-api,jain-sip-ri,concurrent,log4j,commons-logging,dnsjava,stun4j,activation,mail,restcomm-jain-sip-ha-core,restcomm-jain-sip-ext,commons-codec,restcomm-statistics,metrics-core,gson,slf4j-api,slf4j-simple,httpcore,httpclient</includeArtifactIds>
389395
<outputDirectory>${env.CATALINA_HOME}/lib</outputDirectory>
390396
</configuration>
391397
</execution>

0 commit comments

Comments
 (0)