added a flag to switch between jython and python in conf file of CLI …

…& builder. Upated the version of cloudslang (#1307) * added a flag in conf file and packaged python-3 along with cslang-cli * Removed the python from cli zip file. python.path system property is configurable. * updated the cslang version to 2.0.0 * updated the cslang-builder to have external python while running tests. * Updating the score version as in master.
CloudSlang · Jun 15, 2021 · 7eb99df · 7eb99df
1 parent 7dbfeaf
commit 7eb99df
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 16 deletions.
diff --git a/cloudslang-all/pom.xml b/cloudslang-all/pom.xml
@@ -11,7 +11,7 @@ http://www.apache.org/licenses/LICENSE-2.0
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cloudslang-api-commons/pom.xml b/cloudslang-api-commons/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cloudslang-cli/pom.xml b/cloudslang-cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudslang-cli</artifactId>
@@ -257,7 +257,6 @@
                             <id>cslang</id>
                         </program>
                     </programs>
-                    <extraJvmArguments>-Dpython.path=@BASEDIR@/python-lib</extraJvmArguments>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/cloudslang-cli/src/main/resources/configuration/cslang.properties b/cloudslang-cli/src/main/resources/configuration/cslang.properties
@@ -7,4 +7,6 @@ maven.settings.xml.path=${app.home}/maven/conf/settings.xml
 maven.m2.conf.path=${app.home}/maven/conf/m2.conf
 cloudslang.maven.repo.local=${app.home}/maven/repo
 cloudslang.maven.repo.remote.url=http://repo1.maven.org/maven2
-cloudslang.maven.plugins.remote.url=http://repo1.maven.org/maven2
+cloudslang.maven.plugins.remote.url=http://repo1.maven.org/maven2
+use.jython.expressions=true
+#python.path=provide the python 3.8.7 path here
diff --git a/cloudslang-commons/pom.xml b/cloudslang-commons/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cloudslang-compiler/pom.xml b/cloudslang-compiler/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cloudslang-content-maven-compiler/pom.xml b/cloudslang-content-maven-compiler/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cloudslang-content-verifier/pom.xml b/cloudslang-content-verifier/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudslang-content-verifier</artifactId>
@@ -199,7 +199,6 @@
                             <id>cslang-builder</id>
                         </program>
                     </programs>
-                    <extraJvmArguments>-Dpython.path=@BASEDIR@/python-lib</extraJvmArguments>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/cloudslang-content-verifier/src/main/resources/configuration/cslang.properties b/cloudslang-content-verifier/src/main/resources/configuration/cslang.properties
@@ -9,3 +9,5 @@ cloudslang.maven.repo.local=${app.home}/maven/repo
 cloudslang.maven.repo.remote.url=http://repo1.maven.org/maven2
 cloudslang.maven.plugins.remote.url=http://repo1.maven.org/maven2
 cloudslang.test.case.report.location=${app.home}/report
+use.jython.expressions=true
+#python.path=provide the python 3.8.7 path here
diff --git a/cloudslang-enforcer/pom.xml b/cloudslang-enforcer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cloudslang-entities/pom.xml b/cloudslang-entities/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/cloudslang-runtime/pom.xml b/cloudslang-runtime/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cloudslang-spi/pom.xml b/cloudslang-spi/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cloudslang-tests/pom.xml b/cloudslang-tests/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>cloudslang</artifactId>
         <groupId>io.cloudslang.lang</groupId>
-        <version>1.0.262-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     -->
     <groupId>io.cloudslang.lang</groupId>
     <artifactId>cloudslang</artifactId>
-    <version>1.0.262-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>