Merge pull request #1203 from ApolloFoundation/stage

1.50.32-RC
ApolloFoundation · Dec 22, 2021 · cc4bc7d · cc4bc7d
2 parents ba07d0b + edf4e91
commit cc4bc7d
Show file tree

Hide file tree

Showing 309 changed files with 17,766 additions and 1,562 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ classes
 classes*
 classes/*.*
 .idea/
+.run/
 addons/classes
 apl_db/
 classes/

diff --git a/README.md b/README.md
@@ -85,7 +85,8 @@ OS name: "linux", version: "5.9.12-200.fc33.x86_64", arch: "amd64", family: "uni
 
 ### Installation artefacts
 
-Final artefact that is ready to install and run is loacated in the ___apl-exec/target___ directory and has name like  ___apollo-blockchain-1.47.25-NoOS-NoArch.zip___.
+Final artefact that is ready to install and run is loacated in the ___apl-exec/target___ directory and has name like  ___apollo-blockchain-1.50.32-NoOS-NoArch.zip___.
+
 Unzip it to some location and run by scripts in ___ApolloWallet/apollo-blockchain/bin___ directory.
 
 You'll probably need __Apollo-web-ui__ and __Apollo-desktop__ components to use Apollo wallet.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.48.11
+1.50.32
diff --git a/apl-api/pom.xml b/apl-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.apollocurrency</groupId>
     <artifactId>apollo-blockchain</artifactId>
-    <version>1.48.11</version>
+    <version>1.50.32</version>
   </parent>
 
   <artifactId>apl-api</artifactId>
@@ -114,9 +114,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Duser.language=en</argLine>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/apl-api/src/main/java/com/apollocurrency/aplwallet/api/dto/auth/Status2FA.java b/apl-api/src/main/java/com/apollocurrency/aplwallet/api/dto/auth/Status2FA.java
@@ -13,7 +13,7 @@ public enum Status2FA {
     ALREADY_ENABLED,
     NOT_CONFIRMED;
 
-    public boolean isOK(){
+    public boolean isOK() {
         return this.equals(Status2FA.OK);
     }
 }
diff --git a/apl-api2/pom.xml b/apl-api2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.apollocurrency</groupId>
     <artifactId>apollo-blockchain</artifactId>
-    <version>1.48.11</version>
+    <version>1.50.32</version>
   </parent>
 
   <artifactId>apl-api2</artifactId>
@@ -78,7 +78,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>${maven-clean-plugin.version}</version>
         <executions>
           <execution>
             <id>clean-webapp</id>
@@ -116,7 +115,6 @@
       <plugin>
         <groupId>io.swagger.codegen.v3</groupId>
         <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>${swagger-codegen-maven-plugin.version}</version>
         <executions>
           <execution>
             <goals>
@@ -137,7 +135,7 @@
               <supportingFilesToGenerate>ApiException.java,NotFoundException.java</supportingFilesToGenerate>
 <!--              IMPORTANT! NO SPACES ALLOWED BETWEEN modelsToGenerate values-->
               <modelsToGenerate>
-                AccountInfo,AccountInfoResp,AccountReq,AccountReqTest,AccountReqSendMoney,BlockchainInfo,BlockInfo,BlockchainState,CountResponse,CreateChildAccountResp,EmptyResponse,HealthResponse,ListResponse,QueryCountResult,QueryObject,QueryResult,TransactionInfo,TransactionInfoArrayResp,TransactionInfoResp,TxReceipt,TxRequest,CurrencyBurningTxCreationRequest,TransactionCreationRequest,TransactionCreationResponse,UnconfirmedTransactionInfo,CurrencyBurningTxParams,TransactionVerificationResponse,LastTransactionVerificationResponse,TransactionVerification
+                AccountInfo,AccountInfoResp,AccountReq,AccountReqTest,AccountReqSendMoney,BlockchainInfo,BlockInfo,BlockchainState,CountResponse,CreateChildAccountResp,EmptyResponse,HealthResponse,ListResponse,QueryCountResult,QueryObject,QueryResult,TransactionInfo,TransactionInfoArrayResp,TransactionInfoResp,TxReceipt,TxRequest,PublishContractReq,CallContractMethodReq,ContractListResponse,ContractDetails,ContractDetailsResponse,ContractStateResponse,ContractMethod,CallMethodResult,TransactionArrayResp,CallViewMethodReq,ResultValueResponse,MemberSpec,PropertySpec,ArgSpec,ContractSpecResponse,CurrencyBurningTxCreationRequest,TransactionCreationRequest,TransactionCreationResponse,UnconfirmedTransactionInfo,CurrencyBurningTxParams,AddressSpec,AddressSpecResponse,TransactionVerificationResponse,LastTransactionVerificationResponse,TransactionVerification,StringListResponse,ModuleSourceResponse,ModuleListResponse,AsrSpec,AsrSpecResponse,AsrMemberSpec,ContractEventsRequest,ContractEventsResponse,ContractEventDetails
               </modelsToGenerate>
               <configHelp>false</configHelp>
               <configOptions>