updated for apim 420

integration-test/pom.xml

@@ -106,7 +106,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
                 <executions>
                     <execution>
                         <goals>
@@ -117,7 +116,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
                 <executions>
                     <execution>
                         <id>copy-resources-jks</id>

iot-core/pom.xml

@@ -51,7 +51,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>extract-pack</id>
@@ -67,7 +66,7 @@
                                     <version>${wso2am-nexus-artifact-version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.basedir}/target/wso2am-${wso2am-nexus-artifact-version}</outputDirectory>
+                                    <outputDirectory>${project.basedir}/target</outputDirectory>
                                     <destFileName>wso2am-${wso2am-nexus-artifact-version}</destFileName>
                                 </artifactItem>
                             </artifactItems>
@@ -253,7 +252,6 @@
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>2-p2-repo-generation</id>
@@ -588,7 +586,6 @@
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
-                <version>1.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

iot-core/src/assembly/bin.xml

@@ -51,7 +51,7 @@
             <directory>${basedir}/target/${wso2am}</directory>
             <outputDirectory>${entgra-iot-core}</outputDirectory>
             <excludes>
-<!--                <exclude>**/repository/conf/tomcat/context.xml</exclude>-->
+                <exclude>**/repository/conf/tomcat/context.xml</exclude>
                 <exclude>**/repository/conf/deployment.toml</exclude>
             </excludes>
         </fileSet>
@@ -92,10 +92,6 @@
             <source>src/core/conf/input-event-adapters.xml</source>
             <outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory>
         </file>
-        <file>
-            <source>src/core/conf/output-event-adapters.xml.j2</source>
-            <outputDirectory>${entgra-iot-core}/repository/resources/conf/templates/repository/conf</outputDirectory>
-        </file>
         <file>
             <source>src/core/keystores/wso2carbon.jks</source>
             <outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory>
@@ -115,7 +111,6 @@
             <outputDirectory>${entgra-iot-core}/repository/components/dropins</outputDirectory>
             <includes>
                 <include>io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.oauth.extensions</include>
-                <include>io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension</include>
             </includes>
             <!--<useProjectArtifact>false</useProjectArtifact>-->
             <!--<useTransitiveDependencies>true</useTransitiveDependencies>-->

iot-core/src/core/bin/iot-server.bat

@@ -172,13 +172,13 @@ set CMD=RUN %*
 :checkJdk17
 PATH %PATH%;%JAVA_HOME%\bin\
 for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "JAVA_VERSION=%%j%%k"
-if %JAVA_VERSION% LSS 17 goto unknownJdk
+if %JAVA_VERSION% LSS 110 goto unknownJdk
-if %JAVA_VERSION% GTR 110 goto unknownJdk
+if %JAVA_VERSION% GTR 170 goto unknownJdk
 goto jdk17
 
 :unknownJdk
 echo Starting WSO2 Carbon (in unsupported JDK)
-echo [ERROR] CARBON is supported only on JDK 1.7, 1.8, 9, 10 and 11
+echo [ERROR] CARBON is supported only between JDK 11 and JDK 17
 goto jdk17
 
 :jdk17
@@ -203,7 +203,7 @@ set CARBON_CLASSPATH=".\lib\*";%CARBON_CLASSPATH%
 if %JAVA_VERSION% GEQ 110 set CARBON_CLASSPATH=".\lib\endorsed\*";%CARBON_CLASSPATH%
 
 if %JAVA_VERSION% LEQ 18 set JAVA_VER_BASED_OPTS=-Djava.endorsed.dirs=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
-if %JAVA_VERSION% GEQ 110 set JAVA_VER_BASED_OPTS=--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED
+if %JAVA_VERSION% GEQ 110 set JAVA_VER_BASED_OPTS=--add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED  --add-opens=java.base/java.io=ALL-UNNAMED
 
 set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% %JAVA_VER_BASED_OPTS%
@@ -217,6 +217,9 @@ set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dcom.atomikos.icatch.hide_init_file_path="tru
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -DworkerNode=false -Dcarbon.new.config.dir.path="%CARBON_HOME%\repository\resources\conf"
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Dhttpclient.hostnameVerifier="DefaultAndLocalhost"
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dlog4j2.contextSelector="org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.ops4j.pax.logging.logReaderEnabled="false"
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.ops4j.pax.logging.eventAdminEnabled="false"
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.core.http.port="9763" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.gateway.carbon.https.port="9443" -Diot.gateway.carbon.http.port="9763" -Diot.gateway.websocket.ws.port="9099" -Diot.gateway.websocket.wss.port="8099" -Diot.remotesession.server.host="localhost" -Diot.remotesession.server.https.port="9443"
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1883"
 

iot-core/src/core/bin/iot-server.sh

@@ -235,9 +235,9 @@ fi
 # ---------- Handle the SSL Issue with proper JDK version --------------------
 java_version=$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}')
 java_version_formatted=$(echo "$java_version" | awk -F. '{printf("%02d%02d",$1,$2);}')
-if [ $java_version_formatted -lt 0107 ] || [ $java_version_formatted -gt 1100 ]; then
+if [ $java_version_formatted -lt 1100 ] || [ $java_version_formatted -gt 1700 ]; then
    echo " Starting WSO2 Carbon (in unsupported JDK)"
-   echo " [ERROR] CARBON is supported only on JDK 1.7, 1.8, 9, 10 and 11"
+   echo " [ERROR] CARBON is supported only between JDK 11 and JDK 17"
 fi
 
 CARBON_XBOOTCLASSPATH=""
@@ -307,11 +307,10 @@ echo "Using Java memory options: $JVM_MEM_OPTS"
 #To monitor a Carbon server in remote JMX mode on linux host machines, set the below system property.
 #   -Djava.rmi.server.hostname="your.IP.goes.here"
 
-JAVA_VER_BASED_OPTS=""
+JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED"
 
-
+if [ $java_version_formatted -ge 1700 ]; then
-if [ $java_version_formatted -ge 1100 ]; then
+    JAVA_VER_BASED_OPTS="$JAVA_VER_BASED_OPTS --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
-    JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"
 fi
 
 while [ "$status" = "$START_EXIT_STATUS" ]
@@ -354,6 +353,9 @@ do
     -DenableCorrelationLogs=false \
     -Dcarbon.new.config.dir.path="$CARBON_HOME/repository/resources/conf" \
     -Djavax.xml.xpath.XPathFactory:http://java.sun.com/jaxp/xpath/dom=net.sf.saxon.xpath.XPathFactoryImpl \
+    -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector \
+    -Dorg.ops4j.pax.logging.logReaderEnabled=false \
+    -Dorg.ops4j.pax.logging.eventAdminEnabled=false \
     -Diot.core.host="localhost" \
     -Diot.core.https.port="9443" \
     -Diot.core.http.port="9763" \

iot-core/src/core/conf/deployment.toml

@@ -283,3 +283,19 @@ renew_refresh_token=false
 
 [device_mgt_conf.pull_notification_conf]
 enabled=false
+
+[[output_adapter.custom_output_adapter]]
+adapter.type = "oauth-mqtt"
+[adapter.properties]
+minThread = 8
+maxThread = 100
+keepAliveTimeInMillis = 20000
+jobQueueSize = 10000
+connectionKeepAliveInterval = 60
+dcrUrl = "https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register"
+tokenUrl = "https://${iot.gateway.host}:${iot.gateway.https.port}/token"
+url = "tcp://${mqtt.broker.host}:${mqtt.broker.port}"
+username = "${admin.username}"
+password = "${admin.password}"
+qos = 2
+clearSession = true

iot-core/src/core/conf/input-event-adapters.xml

@@ -18,21 +18,6 @@
 
 <inputEventAdaptersConfig>
 
-    <adapterConfig type="oauth-mqtt">
-        <!-- Thread Pool Related Properties -->
-        <property key="minThread">8</property>
-        <property key="maxThread">100</property>
-        <property key="keepAliveTimeInMillis">20000</property>
-        <property key="jobQueueSize">10000</property>
-        <property key="connectionKeepAliveInterval">60</property>
-        <property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register</property>
-        <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
-        <property key="username">admin</property>
-        <property key="password">admin</property>
-        <property key="contentValidator">deviceid-topic-content-validator</property>
-        <property key="cleanSession">true</property>
-    </adapterConfig>
-
     <adapterConfig type="http">
         <property key="minThread">8</property>
         <property key="maxThread">100</property>
@@ -53,4 +38,18 @@
         <property key="jobQueueSize">10000</property>
     </adapterConfig>
 
+    <adapterConfig type="oauth-mqtt">
+        <!-- Thread Pool Related Properties -->
+        <property key="minThread">8</property>
+        <property key="maxThread">100</property>
+        <property key="keepAliveTimeInMillis">20000</property>
+        <property key="jobQueueSize">10000</property>
+        <property key="connectionKeepAliveInterval">60</property>
+        <property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register</property>
+        <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
+        <property key="username">admin</property>
+        <property key="password">admin</property>
+        <property key="contentValidator">deviceid-topic-content-validator</property>
+        <property key="cleanSession">true</property>
+    </adapterConfig>
 </inputEventAdaptersConfig>

iot-core/src/core/samples/device-plugins-deployer.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2</groupId>
         <artifactId>wso2</artifactId>
-        <version>1</version>
+        <version>1.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.entgra.community.iots</groupId>
     <artifactId>iot-devicetype-feature-installation</artifactId>
-    <version>5.2.1-SNAPSHOT</version>
+    <version>5.2.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Install Virtual Fire Alarm Device Types - IoT Core</name>
 

p2-profile/pom.xml

@@ -105,7 +105,6 @@
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>2-p2-repo-generation</id>
@@ -178,7 +177,6 @@
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
-                <version>1.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

pom.xml

@@ -85,27 +85,7 @@
             <dependency>
                 <groupId>org.wso2.carbon.automation</groupId>
                 <artifactId>org.wso2.carbon.automation.test.utils</artifactId>
-                <version>${test.framework.version}</version>
+                <version>${platform.integration.utils.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpcore</artifactId>
-                    </exclusion>
-                </exclusions>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.automationutils</groupId>
-                <artifactId>org.wso2.carbon.integration.common.utils</artifactId>
-                <version>${test.framework.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
@@ -270,42 +250,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.automationutils</groupId>
-                <artifactId>org.wso2.carbon.integration.common.admin.client</artifactId>
-                <version>${automation.utils.version}</version>
-                <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpcore</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.commons</groupId>
-                        <artifactId>org.wso2.carbon.user.mgt.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.commons</groupId>
-                        <artifactId>org.wso2.carbon.ndatasource.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.commons</groupId>
-                        <artifactId>org.wso2.carbon.authenticator.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.utils</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
@@ -316,8 +260,8 @@
 
     <properties>
 
-        <wso2am-nexus-artifact-version>4.0.0</wso2am-nexus-artifact-version>
+        <wso2am-nexus-artifact-version>4.2.0</wso2am-nexus-artifact-version>
-        <wso2am>wso2am-4.0.0</wso2am>
+        <wso2am>wso2am-4.2.0</wso2am>
 
         <entgra-iot-core>io.entgra.community.iots.core-${project.version}</entgra-iot-core>
         <entgra-iot-community>entgra-iots-community-${project.version}</entgra-iot-community>
@@ -325,18 +269,17 @@
         <!-- Carbon Device Management-->
         <io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version>
 
-        <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
+        <carbon.p2.plugin.version>5.2.42</carbon.p2.plugin.version>
 
         <!--Orbit versions-->
-        <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
+        <orbit.h2.engine.version>2.1.210.wso2v1</orbit.h2.engine.version>
 
         <io.entgra.device.mgt.plugins.version>6.0.17-SNAPSHOT</io.entgra.device.mgt.plugins.version>
 
         <!--Testing-->
-        <google.gson.version>2.8.5</google.gson.version>
+        <google.gson.version>2.9.1</google.gson.version>
-        <platform.integration.utils.version>4.4.3</platform.integration.utils.version>
+        <platform.integration.utils.version>4.4.10</platform.integration.utils.version>
-        <automation.utils.version>4.4.2</automation.utils.version>
+        <automation.utils.version>4.5.3</automation.utils.version>
-        <test.framework.version>4.4.2</test.framework.version>
 
     </properties>
 
@@ -372,11 +315,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>3.8.1</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>1.8</source>
+                    <source>11</source>
-                    <target>1.8</target>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -394,23 +337,10 @@
         </plugins>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.5</version>
+                    <version>5.1.1</version>
                     <extensions>true</extensions>
                     <configuration>
                         <obrRepository>NONE</obrRepository>
@@ -457,6 +387,21 @@
                         <testFailureIgnore>true</testFailureIgnore>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>com.google.code.maven-replacer-plugin</groupId>
+                    <artifactId>replacer</artifactId>
+                    <version>1.5.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.wso2.maven</groupId>
+                    <artifactId>carbon-p2-plugin</artifactId>
+                    <version>${carbon.p2.plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>