diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 09b0012..d0a820e 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -1,13 +1,13 @@ - org.wso2.iot.integration.common.extensions.IOTServerExtension - + + io.entgra.community.iots.integration.test.common.extensions.IOTServerExtension + diff --git a/integration-test/src/test/resources/automationSchema.xsd b/integration-test/src/test/resources/automationSchema.xsd index 429b14c..5ba7b15 100644 --- a/integration-test/src/test/resources/automationSchema.xsd +++ b/integration-test/src/test/resources/automationSchema.xsd @@ -1,12 +1,12 @@ - - io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version} @@ -433,10 +431,6 @@ - - io.entgra.device.mgt.core.application.mgt.api.feature.group - ${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core.application.mgt.server.feature.group ${io.entgra.device.mgt.core.version} @@ -469,6 +463,10 @@ io.entgra.device.mgt.core.apimgt.webapp.publisher.feature.group ${io.entgra.device.mgt.core.version} + + io.entgra.device.mgt.core.apimgt.extension.rest.api.feature.group + ${io.entgra.device.mgt.core.version} + io.entgra.device.mgt.core.apimgt.keymgt.extension.feature.group ${io.entgra.device.mgt.core.version} @@ -594,7 +592,6 @@ com.google.code.maven-replacer-plugin replacer - 1.5.3 package diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml index b78177f..f146e04 100644 --- a/iot-core/src/assembly/bin.xml +++ b/iot-core/src/assembly/bin.xml @@ -1,12 +1,12 @@ diff --git a/iot-core/src/core/bin/iot-server.bat b/iot-core/src/core/bin/iot-server.bat index 2bee15e..1149f02 100755 --- a/iot-core/src/core/bin/iot-server.bat +++ b/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% GTR 110 goto unknownJdk +if %JAVA_VERSION% LSS 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" diff --git a/iot-core/src/core/bin/iot-server.sh b/iot-core/src/core/bin/iot-server.sh index 238ba73..6854e2d 100755 --- a/iot-core/src/core/bin/iot-server.sh +++ b/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 1100 ]; then - 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_formatted -ge 1700 ]; then + JAVA_VER_BASED_OPTS="$JAVA_VER_BASED_OPTS --add-opens=java.naming/com.sun.jndi.ldap=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" \ @@ -378,4 +380,4 @@ do -Diot.reporting.webapp.host="" \ org.wso2.carbon.bootstrap.Bootstrap $* status=$? -done +done \ No newline at end of file diff --git a/iot-core/src/core/conf/deployment.toml b/iot-core/src/core/conf/deployment.toml index 738fdb0..141b4fe 100644 --- a/iot-core/src/core/conf/deployment.toml +++ b/iot-core/src/core/conf/deployment.toml @@ -105,7 +105,7 @@ config_endpoint = "https://localhost:8080/auth/v1" auth_token = "" [web_app.listener] -class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] +class_name = ["io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] [apim.key_manager] #service_url = "https://localhost:${mgt.transport.https.port}/services/" @@ -115,7 +115,7 @@ class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPub #pool.max_idle = 100 #key_validation_handler_type = "default" #key_validation_handler_type = "custom" -key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler" +key_validation_handler_impl = "io.entgra.device.mgt.core.apimgt.keymgt.extension.KeyValidationHandler" #[apim.idp] #server_url = "https://localhost:${mgt.transport.https.port}" @@ -282,4 +282,20 @@ grant_validator="io.entgra.device.mgt.core.device.mgt.oauth.extensions.validator renew_refresh_token=false [device_mgt_conf.pull_notification_conf] -enabled=false \ No newline at end of file +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 diff --git a/iot-core/src/core/conf/input-event-adapters.xml b/iot-core/src/core/conf/input-event-adapters.xml index 25052b2..382c94b 100644 --- a/iot-core/src/core/conf/input-event-adapters.xml +++ b/iot-core/src/core/conf/input-event-adapters.xml @@ -1,38 +1,23 @@ - - - 8 - 100 - 20000 - 10000 - 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register - tcp://${mqtt.broker.host}:${mqtt.broker.port} - admin - admin - deviceid-topic-content-validator - true - - 8 100 @@ -53,4 +38,18 @@ 10000 + + + 8 + 100 + 20000 + 10000 + 60 + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register + tcp://${mqtt.broker.host}:${mqtt.broker.port} + admin + admin + deviceid-topic-content-validator + true + \ No newline at end of file diff --git a/iot-core/src/core/conf/output-event-adapters.xml.j2 b/iot-core/src/core/conf/output-event-adapters.xml.j2 deleted file mode 100644 index 883a6d6..0000000 --- a/iot-core/src/core/conf/output-event-adapters.xml.j2 +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - tcp://localhost:7612 - ssl://localhost:7712 - tcp://localhost:9612 - ssl://localhost:9712 - - - - VARCHAR(255) - DOUBLE - INT - BIGINT - FLOAT - BOOL - CREATE TABLE $TABLE_NAME ($COLUMN_TYPES) - INSERT INTO $TABLE_NAME ($COLUMNS) VALUES ($VALUES) - SELECT * FROM $TABLE_NAME limit 1 - UPDATE $TABLE_NAME SET $COLUMN_VALUES WHERE $CONDITION - , - ? - = - AND - SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$TABLE_NAME' - SELECT $COLUMNS FROM $TABLE_NAME - varchar2(255) - CLOB - BINARY_DOUBLE - SELECT * FROM $TABLE_NAME WHERE ROWNUM = 1 - SELECT COLUMN_NAME, DATA_TYPE FROM USER_TAB_COLS WHERE TABLE_NAME = '$TABLE_NAME' - varchar2(255) - SELECT TOP 1 * FROM $TABLE_NAME - SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$TABLE_NAME' - varchar2(255) - REAL - SHOW COLUMNS FROM $TABLE_NAME - - - - - 8 - 100 - 20000 - 10000 - - 50 - 1000 - - - - - {{output_adapter.jms.min_thread}} - {{output_adapter.jms.max_thread}} - {{output_adapter.jms.keep_alive_time}} - {{output_adapter.jms.job_queue_size}} - - - - - 8 - 100 - 20000 - 10000 - 60 - - - - - 8 - 100 - 20000 - 10000 - - - - - {{output_adapter.email.from_address}} - {{output_adapter.email.username}} - {{output_adapter.email.password}} - {{output_adapter.email.hostname}} - {{output_adapter.email.port}} - {{output_adapter.email.enable_start_tls}} - {{output_adapter.email.enable_authentication}} - {{output_adapter.email.signature}} - {{output_adapter.email.reply_to}} - {% if output_adapter.email.custom_properties is defined %} - - {% for property_name,property_value in output_adapter.email.custom_properties.items() %} - {{property_value}} - {% endfor %} - {% endif %} - - 8 - 100 - 20000 - 10000 - - - - 30 - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - 10000 - true - true - 50 - - - - - 8 - 100 - 20000 - 10000 - 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register - https://${iot.gateway.host}:${iot.gateway.https.port}/token - tcp://${mqtt.broker.host}:${mqtt.broker.port} - admin - admin - 2 - true - - - \ No newline at end of file diff --git a/iot-core/src/core/conf/tomcat/context.xml b/iot-core/src/core/conf/tomcat/context.xml index e91129c..b0c3dcb 100644 --- a/iot-core/src/core/conf/tomcat/context.xml +++ b/iot-core/src/core/conf/tomcat/context.xml @@ -47,7 +47,7 @@ 'managed-api-isSecured' - Indicates if the 'Managed API' needs to be exposed over a secured channel. 'managed-api-transports' - Transports through which the 'Managed API' is exposed. --> - +
diff --git a/iot-core/src/core/resources/extensions/header.jsp b/iot-core/src/core/resources/extensions/header.jsp index 52b8ff6..a316258 100644 --- a/iot-core/src/core/resources/extensions/header.jsp +++ b/iot-core/src/core/resources/extensions/header.jsp @@ -1,20 +1,20 @@ <%-- -~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -~ -~ WSO2 Inc. licenses this file to you under the Apache License, -~ Version 2.0 (the "License"); you may not use this file except -~ in compliance with the License. -~ You may obtain a copy of the License at -~ -~ http://www.apache.org/licenses/LICENSE-2.0 -~ -~ Unless required by applicable law or agreed to in writing, -~ software distributed under the License is distributed on an -~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -~ KIND, either express or implied. See the License for the -~ specific language governing permissions and limitations -~ under the License. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. + ~ + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + ~ Version 2.0 (the "License"); you may not use this file except + ~ in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. --%> diff --git a/iot-core/src/core/resources/extensions/privacy-policy-content.jsp b/iot-core/src/core/resources/extensions/privacy-policy-content.jsp index 76b6b09..4a4cf5c 100644 --- a/iot-core/src/core/resources/extensions/privacy-policy-content.jsp +++ b/iot-core/src/core/resources/extensions/privacy-policy-content.jsp @@ -1,7 +1,7 @@ <%-- - ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. ~ - ~ WSO2 Inc. licenses this file to you under the Apache License, + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, ~ Version 2.0 (the "License"); you may not use this file except ~ in compliance with the License. ~ You may obtain a copy of the License at @@ -11,10 +11,10 @@ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the + ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. ---%> + --%>
diff --git a/iot-core/src/core/resources/extensions/product-title.jsp b/iot-core/src/core/resources/extensions/product-title.jsp index 3fa1a4b..81bb0a2 100644 --- a/iot-core/src/core/resources/extensions/product-title.jsp +++ b/iot-core/src/core/resources/extensions/product-title.jsp @@ -1,17 +1,17 @@ <%-- - ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. ~ - ~ WSO2 Inc. licenses this file to you under the Apache License, - ~ Version 2.0 (the "License"); you may not use this file except - ~ in compliance with the License. - ~ You may obtain a copy of the License at + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + ~ Version 2.0 (the "License"); you may not use this file except + ~ in compliance with the License. + ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the + ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. --%> diff --git a/iot-core/src/core/resources/extensions/title.jsp b/iot-core/src/core/resources/extensions/title.jsp index 574086b..eceea89 100644 --- a/iot-core/src/core/resources/extensions/title.jsp +++ b/iot-core/src/core/resources/extensions/title.jsp @@ -1,18 +1,18 @@ <%-- - ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. ~ - ~ WSO2 Inc. licenses this file to you under the Apache License, - ~ Version 2.0 (the "License"); you may not use this file except - ~ in compliance with the License. - ~ You may obtain a copy of the License at + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + ~ Version 2.0 (the "License"); you may not use this file except + ~ in compliance with the License. + ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the + ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. --%> diff --git a/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties index e7ed4df..fc022c5 100644 --- a/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties +++ b/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties @@ -1,12 +1,12 @@ # -# Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +# Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. # -# WSO2 Inc. licenses this file to you under the Apache License, +# Entgra (Pvt) Ltd. licenses this file to you under the Apache License, # Version 2.0 (the "License"); you may not use this file except # in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an diff --git a/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties index 28a4dd0..671c690 100644 --- a/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties +++ b/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties @@ -1,12 +1,12 @@ # -# Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +# Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. # -# WSO2 Inc. licenses this file to you under the Apache License, +# Entgra (Pvt) Ltd. licenses this file to you under the Apache License, # Version 2.0 (the "License"); you may not use this file except # in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an diff --git a/iot-core/src/core/samples/device-plugins-deployer.xml b/iot-core/src/core/samples/device-plugins-deployer.xml index 9e4657b..430d02b 100644 --- a/iot-core/src/core/samples/device-plugins-deployer.xml +++ b/iot-core/src/core/samples/device-plugins-deployer.xml @@ -1,12 +1,12 @@ - 5.0.26-SNAPSHOT + 5.2.4-SNAPSHOT 5.1.2 - 1.4.199.wso2v1 + 2.1.210.wso2v1 - 6.0.17-SNAPSHOT + 6.1.1-SNAPSHOT - 2.8.5 - 4.4.3 - 4.4.2 - 4.4.2 + 2.9.1 + 4.4.10 + 4.5.3 @@ -372,11 +315,11 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.1 + 3.8.1 UTF-8 - 1.8 - 1.8 + 11 + 11 @@ -394,23 +337,10 @@ - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - org.apache.felix maven-bundle-plugin - 2.3.5 + 3.2.0 true NONE @@ -457,6 +387,21 @@ true + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} +