Add Android CE agent to the build

revert-dabc3590
Charitha Goonetilleke 5 years ago
parent a733947c9e
commit d59ce8260a

@ -46,8 +46,8 @@ class Constants {
static final String DOWNLOADED_PLATFORM_NAME = "downloaded.platform.name"; static final String DOWNLOADED_PLATFORM_NAME = "downloaded.platform.name";
static final String TARGET_VERSION = "target.version"; static final String TARGET_VERSION = "target.version";
static final String OS_TARGET = "os.target"; static final String OS_TARGET = "os.target";
// WSO2 AVD specific variables // Entgra AVD specific variables
static final String WSO2_AVD_NAME = "ENTGRA_AVD"; static final String WSO2_AVD_NAME = "ENTGRA_AVD";
static final String APK_LOCATION = File.separator + "resources" + File.separator + "client-debug.apk"; static final String APK_LOCATION = File.separator + "resources" + File.separator + "android-agent.apk";
static final String WSO2_CONFIG_LOCATION = File.separator + "resources" + File.separator + "config.ini"; static final String WSO2_CONFIG_LOCATION = File.separator + "resources" + File.separator + "config.ini";
} }

@ -38,11 +38,6 @@
<artifactId>io.entgra.emm.android.agent.release</artifactId> <artifactId>io.entgra.emm.android.agent.release</artifactId>
<type>apk</type> <type>apk</type>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.emm</groupId>
<artifactId>io.entgra.emm.android.agent.debug</artifactId>
<type>apk</type>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -79,12 +74,12 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>io.entgra.emm</groupId> <groupId>io.entgra.emm</groupId>
<artifactId>io.entgra.emm.android.agent.debug</artifactId> <artifactId>io.entgra.emm.android.agent.release</artifactId>
<type>apk</type> <type>apk</type>
<version>${android.agent.version}</version> <version>${android.agent.version}</version>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${project.basedir}/target/</outputDirectory> <outputDirectory>${project.basedir}/target/</outputDirectory>
<destFileName>client-debug.apk</destFileName> <destFileName>android-agent.apk</destFileName>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>

@ -1143,12 +1143,6 @@
<type>apk</type> <type>apk</type>
<version>${android.agent.version}</version> <version>${android.agent.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.emm</groupId>
<artifactId>io.entgra.emm.android.agent.debug</artifactId>
<type>apk</type>
<version>${android.agent.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.apis</groupId> <groupId>com.google.apis</groupId>
<artifactId>google-api-services-androidenterprise</artifactId> <artifactId>google-api-services-androidenterprise</artifactId>
@ -1167,7 +1161,7 @@
<carbon.devicemgt.plugins.version>5.0.7-SNAPSHOT</carbon.devicemgt.plugins.version> <carbon.devicemgt.plugins.version>5.0.7-SNAPSHOT</carbon.devicemgt.plugins.version>
<!-- Android Agent Artifact Version--> <!-- Android Agent Artifact Version-->
<android.agent.version>4.0.3</android.agent.version> <android.agent.version>4.0.0</android.agent.version>
<!-- Java Version Compatibility --> <!-- Java Version Compatibility -->
<wso2.maven.compiler.source>1.8</wso2.maven.compiler.source> <wso2.maven.compiler.source>1.8</wso2.maven.compiler.source>

Loading…
Cancel
Save