inosh
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix sms handler test break

See merge request entgra/carbon-device-mgt!732
4.x.x
Saad Sahibjan 4 years ago
parent 303ce1717e 143816c1e6
commit 617f8acba5
9 changed files with 14 additions and 73 deletions
Show Stats Download Patch File Download Diff File

2
components/transport-mgt/pom.xml
Unescape View File

@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>transport-mgt</artifactId> <artifactId>transport-mgt</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Entgra IoT - Transport Component</name> <name>Entgra - Transport Management Component</name>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<modules> <modules>

63
components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml
Unescape View File

@ -31,8 +31,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>io.entgra.transport.mgt.sms.handler.api</artifactId> <artifactId>io.entgra.transport.mgt.sms.handler.api</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Entgra IoT - SMS Management Core</name> <name>Entgra - SMS Handler API</name>
<description>Entgra IoT - SMS Management API</description> <description>Entgra - SMS Handler API</description>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<build> <build>
@ -51,44 +51,6 @@
<warName>api#sms-handler#v1.0</warName> <warName>api#sms-handler#v1.0</warName>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
</configuration>
<executions>
<execution>
<id>jacoco-initialize</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>jacoco-site</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
<outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
</systemPropertyVariables>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
@ -123,27 +85,6 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>client</id>
<build>
<defaultGoal>test</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions>
<execution>
<phase>test</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
<dependencies> <dependencies>

4
components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml
Unescape View File

@ -31,8 +31,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId> <artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Entgra IoT - SMS Management Common</name> <name>Entgra - SMS Handler Common</name>
<description>Entgra IoT - SMS Management Common</description> <description>Entgra - SMS Handler Common</description>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<build> <build>

4
components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml
Unescape View File

@ -31,8 +31,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId> <artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Entgra IoT - SMS Management Core</name> <name>Entgra - SMS Handler Core</name>
<description>Entgra IoT - SMS Management Core</description> <description>Entgra - SMS Handler Core</description>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<build> <build>

2
components/transport-mgt/sms-handler/pom.xml
Unescape View File

@ -31,7 +31,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sms-handler</artifactId> <artifactId>sms-handler</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Entgra IoT - SMS Management Component</name> <name>Entgra - SMS Handler Component</name>
<url>http://entgra.io</url> <url>http://entgra.io</url>

2
features/transport-mgt/pom.xml
Unescape View File

@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>transport-mgt-feature</artifactId> <artifactId>transport-mgt-feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Entgra IoT - Transport Feature</name> <name>Entgra - Transport Management Feature</name>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<modules> <modules>

4
features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/pom.xml
Unescape View File

@ -32,9 +32,9 @@
<artifactId>io.entgra.transport.mgt.sms.handler.api.feature</artifactId> <artifactId>io.entgra.transport.mgt.sms.handler.api.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>4.1.12-SNAPSHOT</version> <version>4.1.12-SNAPSHOT</version>
<name>Entgra IoT - SMS Management API Feature</name> <name>Entgra - SMS Handler API Feature</name>
<url>https://entgra.io</url> <url>https://entgra.io</url>
<description>This feature contains the APIs required for SMS Management</description> <description>This feature contains the APIs required for SMS Handler</description>
<build> <build>
<plugins> <plugins>

4
features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/pom.xml
Unescape View File

@ -32,9 +32,9 @@
<artifactId>io.entgra.transport.mgt.sms.handler.server.feature</artifactId> <artifactId>io.entgra.transport.mgt.sms.handler.server.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>4.1.12-SNAPSHOT</version> <version>4.1.12-SNAPSHOT</version>
<name>Entgra IoT - SMS Management Server Feature</name> <name>Entgra - SMS Handler Server Feature</name>
<url>https://entgra.io</url> <url>https://entgra.io</url>
<description>This feature contains the core bundles required for Back-end SMS Management functionality <description>This feature contains the core bundles required for Back-end SMS Handler functionality
</description> </description>
<dependencies> <dependencies>

2
features/transport-mgt/sms-handler/pom.xml
Unescape View File

@ -31,7 +31,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sms-handler-feature</artifactId> <artifactId>sms-handler-feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Entgra IoT - SMS Management Feature</name> <name>Entgra - SMS Handler Feature</name>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<modules> <modules>

Write Preview
Loading…
Cancel
Save