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

Fix dependency issues

Browse Source
fix-compile-failure
Pasindu Rupasinghe 10 months ago
parent d938195373
commit 1a9782c3f3
6 changed files with 117 additions and 37 deletions
Show Stats Download Patch File Download Diff File

10
components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.admin.api/pom.xml
Unescape View File

@ -156,11 +156,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon</groupId> <!-- <groupId>org.wso2.carbon</groupId>-->
<artifactId>org.wso2.carbon.logging</artifactId> <!-- <artifactId>org.wso2.carbon.logging</artifactId>-->
<scope>provided</scope> <!-- <scope>provided</scope>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId> <artifactId>swagger-jaxrs</artifactId>

34
components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.common/pom.xml
Unescape View File

@ -35,6 +35,14 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
@ -59,6 +67,32 @@
</instructions> </instructions>
</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>
</plugins> </plugins>
</build> </build>

24
components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.core/pom.xml
Unescape View File

@ -38,6 +38,14 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -73,14 +81,14 @@
</build> </build>
<dependencies> <dependencies>
<dependency> <!-- <dependency>-->
<groupId>org.eclipse.osgi</groupId> <!-- <groupId>org.eclipse.osgi</groupId>-->
<artifactId>org.eclipse.osgi</artifactId> <!-- <artifactId>org.eclipse.osgi</artifactId>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.eclipse.osgi</groupId> <!-- <groupId>org.eclipse.osgi</groupId>-->
<artifactId>org.eclipse.osgi.services</artifactId> <!-- <artifactId>org.eclipse.osgi.services</artifactId>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>

50
components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.enforce/pom.xml
Unescape View File

@ -38,6 +38,14 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -68,18 +76,44 @@
</instructions> </instructions>
</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>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <!-- <dependency>-->
<groupId>org.eclipse.osgi</groupId> <!-- <groupId>org.eclipse.osgi</groupId>-->
<artifactId>org.eclipse.osgi</artifactId> <!-- <artifactId>org.eclipse.osgi</artifactId>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.eclipse.osgi</groupId> <!-- <groupId>org.eclipse.osgi</groupId>-->
<artifactId>org.eclipse.osgi.services</artifactId> <!-- <artifactId>org.eclipse.osgi.services</artifactId>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>

6
components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/pom.xml
Unescape View File

@ -180,8 +180,8 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -315,7 +315,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId> <artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

30
components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization/pom.xml
Unescape View File

@ -130,16 +130,16 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.eclipse.osgi</groupId> <!-- <groupId>org.eclipse.osgi</groupId>-->
<artifactId>org.eclipse.osgi</artifactId> <!-- <artifactId>org.eclipse.osgi</artifactId>-->
<scope>provided</scope> <!-- <scope>provided</scope>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.eclipse.osgi</groupId> <!-- <groupId>org.eclipse.osgi</groupId>-->
<artifactId>org.eclipse.osgi.services</artifactId> <!-- <artifactId>org.eclipse.osgi.services</artifactId>-->
<scope>provided</scope> <!-- <scope>provided</scope>-->
</dependency> <!-- </dependency>-->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>org.wso2.carbon</groupId>--> <!-- <groupId>org.wso2.carbon</groupId>-->
<!-- <artifactId>org.wso2.carbon.core</artifactId>--> <!-- <artifactId>org.wso2.carbon.core</artifactId>-->
@ -265,7 +265,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId> <artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -309,7 +309,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -320,6 +320,10 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
@ -371,7 +375,7 @@
com.fasterxml.jackson.core.*, com.fasterxml.jackson.core.*,
com.fasterxml.jackson.databind.*, com.fasterxml.jackson.databind.*,
com.fasterxml.jackson.annotation.*, com.fasterxml.jackson.annotation.*,
com.google.common.cache.*, com.google.common.cache.*
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

Write Preview
Loading…
Cancel
Save