Fix distribution issues

merge-requests/57/head
Charitha Goonetilleke 5 years ago
parent 4e1b26402d
commit fcee8e4306

@ -1,5 +1,5 @@
variables:
MAVEN_CLI_OPTS: "--batch-mode"
MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
cache:
@ -11,5 +11,10 @@ build:
stage: build
script:
- mvn $MAVEN_CLI_OPTS clean install
tags:
- OracleJDK1.8
deploy:
stage: deploy
script:
- mvn $MAVEN_CLI_OPTS deploy -Dmaven.test.skip=true
only:
- master@entgra/product-iots

@ -0,0 +1,12 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
https://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>maven-snapshots</id>
<username>${env.MAVEN_REPO_USER}</username>
<password>${env.MAVEN_REPO_PASS}</password>
</server>
</servers>
</settings>

@ -795,14 +795,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

@ -1,18 +1,18 @@
WSO2 IoT Server @product.version@
Entgra IoT Server @product.version@
==============================================================
Welcome to the WSO2 IoT Server (IoTS) @product.version@ release.
Welcome to the Entgra IoT Server (IoTS) @product.version@ release.
WSO2 IoT Server (IoTS) provides the essential capabilities required to implement a scalable server-side IoT Platform. These capabilities
Entgra IoT Server (IoTS) provides the essential capabilities required to implement a scalable server-side IoT Platform. These capabilities
involve device management, API/App management for devices, analytics, customizable web portals, transport extensions for MQTT, XMPP
and much more. WSO2 IoTS contains sample device agent implementations for well-known development boards, such as Arduino UNO, Raspberry Pi,
Android, iOS, Windows and Virtual agents that demonstrate various capabilities. Furthermore, WSO2 IoTS is released under
and much more. Entgra IoTS contains sample device agent implementations for well-known development boards, such as Arduino UNO, Raspberry Pi,
Android and Virtual agents that demonstrate various capabilities. Furthermore, Entgra IoTS Community Edition is released under
the Apache Software License Version 2.0, one of the most business-friendly licenses available today.
Key Features
==================================
See the online WSO2 IoT documentation for more information on product features:
https://docs.wso2.com/display/IoTS@product.doc.version@/About+this+Release
See the online Entgra IoT documentation for more information on product features:
https://entgra-documentation.gitlab.io/v@product.doc.version@
Installation & Running
@ -45,7 +45,7 @@ System Requirements
2. The portal app requires full Javascript enablement on the Web browser
WSO2 IoT distribution directory
Entgra IoT distribution directory
=============================================
- bin
@ -62,7 +62,7 @@ WSO2 IoT distribution directory
in standalone mode
- repository
The repository where services and modules deployed in WSO2 IoT.
The repository where services and modules deployed in Entgra IoT.
are stored.
- conf
@ -77,7 +77,7 @@ WSO2 IoT distribution directory
- samples
Contains some sample services and client applications that demonstrate
the functionality and capabilities of WSO2 IoT.
the functionality and capabilities of Entgra IoT.
- tmp
Used for storing temporary files, and is pointed to by the
@ -85,13 +85,13 @@ WSO2 IoT distribution directory
- LICENSE.txt
Apache License 2.0 and the relevant other licenses under which
WSO2 IoT is distributed.
Entgra IoT is distributed.
- README.txt
This document.
- release-notes.html
Release information for WSO2 IoT @product.version@
Release information for Entgra IoT @product.version@
- patches
Used to add patches related for all runtimes.
@ -107,28 +107,28 @@ WSO2 IoT distribution directory
-webapp-mode
-wso2/components
-Entgra/components
Contains profiles for all runtimes and the plugins folder
-wso2/lib
-Entgra/lib
Contains jars that are required/shared by all runtimes.
-wso2/analytics
-Entgra/analytics
Contains analytics runtime related files/folders.
-wso2/analytics/conf
-Entgra/analytics/conf
Analytics runtime specific configuration files.
-wso2/analytics/repository
-Entgra/analytics/repository
Where deployments of Analytics runtime is stored.
-wso2/broker
-Entgra/broker
Contains broker runtime related files/folders.
-wso2/broker/conf
-Entgra/broker/conf
Broker runtime specific configuration files.
-wso2/broker/repository
-Entgra/broker/repository
Where deployments of broker runtime is stored.
@ -154,9 +154,9 @@ This script automates the following configurations that you would normally need
cipher-tool.properties, cipher-text.properties and secret-conf.properties files
can be found in the <IoT_HOME>/conf/security directory.
2. Start the server by running the wso2server script, which is in the <IoT_HOME>/bin directory.
2. Start the server by running the iotserver script, which is in the <IoT_HOME>/bin directory.
> wso2server.sh (in UNIX)
> iotserver.sh (in UNIX)
When running the default mode, it asks you to enter the master password
(By default, the master password is the password of the Carbon keystore and private key)
@ -171,8 +171,8 @@ https://docs.wso2.com/display/ADMIN44x/Carbon+Secure+Vault+Implementation
Training
--------
WSO2 Inc. offers a variety of professional Training Programs for WSO2 products.
For additional support on training information please goto http://wso2.com/training/
Entgra (Pvt) Ltd. offers a variety of professional Training Programs for Entgra products.
For additional support on training information please goto https://entgra.io/contact
Support
@ -180,7 +180,7 @@ Support
We are committed to ensuring that your enterprise middleware deployment is completely supported from evaluation to production. Our unique approach ensures that all support leverages our open development methodology and is provided by the very same engineers who build the technology.
For additional support information please refer to http://wso2.com/support/
For additional support information please refer to https://entgra.io/contact
---------------------------------------------------------------------------
(c) Copyright 2017 WSO2 Inc.
(c) Copyright 2020 Entgra (Pvt) Ltd.

@ -882,6 +882,13 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<properties>

@ -339,6 +339,13 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

@ -3081,6 +3081,13 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

Loading…
Cancel
Save