Skip to content

Commit 2a2a353

Browse files
vikram-chaitanyavikram-chaitanya
authored
Merge pull request #21 from testsigmahq/dev
v1.1.0 Release
2 parents fba8f2e + 5ac0bb9 commit 2a2a353

File tree

661 files changed

+6565
-7371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

661 files changed

+6565
-7371
lines changed

‎agent-launcher/dependency-reduced-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.testsigma</groupId>
5-
<artifactId>agent-launcher</artifactId>
5+
<artifactId>testsigma-agent-launcher</artifactId>
66
<name>agent-launcher</name>
77
<version>1.0.0</version>
88
<developers>

‎agent-launcher/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.testsigma</groupId>
8-
<artifactId>agent-launcher</artifactId>
8+
<artifactId>testsigma-agent-launcher</artifactId>
99
<version>1.0.0</version>
10-
<name>agent-launcher</name>
10+
<name>Testsigma Agent Launcher</name>
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<maven.compiler.plugin>3.8.1</maven.compiler.plugin>

‎agent/pom.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.testsigma</groupId>
8-
<artifactId>agent</artifactId>
9-
<version>1.0.0</version>
8+
<artifactId>testsigma-agent</artifactId>
9+
<version>1.1.0</version>
1010
<packaging>jar</packaging>
11-
<name>agent</name>
11+
<name>Testsigma Agent</name>
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
@@ -39,6 +39,8 @@
3939
<maven.compiler.source>11</maven.compiler.source>
4040
<maven.compiler.target>11</maven.compiler.target>
4141
<json.version>20160810</json.version>
42+
<org.apache.httpcomponents.httpclient.version>4.5.13</org.apache.httpcomponents.httpclient.version>
43+
4244
</properties>
4345

4446
<organization>
@@ -110,7 +112,7 @@
110112

111113
<dependency>
112114
<groupId>com.testsigma</groupId>
113-
<artifactId>automator</artifactId>
115+
<artifactId>testsigma-automator</artifactId>
114116
<version>1.0.0</version>
115117
</dependency>
116118

@@ -166,7 +168,7 @@
166168
<dependency>
167169
<groupId>org.apache.httpcomponents</groupId>
168170
<artifactId>httpclient</artifactId>
169-
<version>4.5.12</version>
171+
<version>${org.apache.httpcomponents.httpclient.version}</version>
170172
</dependency>
171173

172174
<dependency>

‎agent/scripts/build.sh‎

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,35 @@ set -x
33
set -e
44

55
WORKING_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
6-
VERSION=$1
6+
EXPECTED_ARGS=2
7+
E_BADARGS=65
8+
9+
VERSION=v1.0.0
10+
PUBLISH_TO_GIT=true
11+
12+
if [ $# -lt $EXPECTED_ARGS ]
13+
then
14+
echo "Usage: $0 <version>"
15+
exit $E_BADARGS
16+
fi
17+
18+
while [ $# -gt 0 ]; do
19+
case "$1" in
20+
--VERSION=*)
21+
VERSION="${1#*=}"
22+
;;
23+
--PUBLISH_TO_GIT=*)
24+
PUBLISH_TO_GIT="${1#*=}"
25+
;;
26+
*)
27+
printf "***************************\n"
28+
printf "* Error: Invalid argument.*\n"
29+
printf "***************************\n"
30+
exit 1
31+
esac
32+
shift
33+
done
34+
735

836
echo "Generating complete agent builds with web and mobile"
937

@@ -13,8 +41,18 @@ sh "$WORKING_DIR/zip-build.sh" Mac mac
1341
sh "$WORKING_DIR/zip-build.sh" Linux linux
1442
sh "$WORKING_DIR/zip-build.sh" Windows windows
1543

16-
gh release upload $VERSION $WORKING_DIR/../../TestsigmaAgent-Mac.zip --clobber
17-
gh release upload $VERSION $WORKING_DIR/../../TestsigmaAgent-Windows.zip --clobber
18-
gh release upload $VERSION $WORKING_DIR/../../TestsigmaAgent-Linux.zip --clobber
44+
aws s3 cp $WORKING_DIR/../../TestsigmaAgent-Windows.zip s3://hybrid-staging.testsigma.com/community/agent/$VERSION/TestsigmaAgent-Windows.zip --acl public-read
45+
aws s3 cp $WORKING_DIR/../../TestsigmaAgent-Mac.zip s3://hybrid-staging.testsigma.com/community/agent/$VERSION/TestsigmaAgent-Mac.zip --acl public-read
46+
aws s3 cp $WORKING_DIR/../../TestsigmaAgent-Linux.zip s3://hybrid-staging.testsigma.com/community/agent/$VERSION/TestsigmaAgent-Linux.zip --acl public-read
47+
48+
if [[ "$PUBLISH_TO_GIT" == "true"* ]]; then
49+
gh release upload $VERSION $WORKING_DIR/../../TestsigmaAgent-Windows.zip --clobber
50+
gh release upload $VERSION $WORKING_DIR/../../TestsigmaAgent-Mac.zip --clobber
51+
gh release upload $VERSION $WORKING_DIR/../../TestsigmaAgent-Linux.zip --clobber
52+
fi
53+
54+
rm -f $WORKING_DIR/../../TestsigmaAgent-Windows.zip
55+
rm -f $WORKING_DIR/../../TestsigmaAgent-Mac.zip
56+
rm -f $WORKING_DIR/../../TestsigmaAgent-Linux.zip
1957

2058
exit 0

‎agent/src/main/resources/agent.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
cloud.url=${CLOUD_URL:https://local.testsigmaos.com}
1010
local.server.url=${LOCAL_SERVER_URL:http://localhost:9090}
1111
local.agent.register=${LOCAL_AGENT_REGISTER:true}
12-
agent.version=1.0.0
12+
agent.version=1.1.0

‎automator/pom.xml‎

Lines changed: 8 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.testsigma</groupId>
5-
<artifactId>automator</artifactId>
5+
<artifactId>testsigma-automator</artifactId>
66
<version>1.0.0</version>
7-
<name>automator</name>
7+
<name>Testsigma Automator</name>
88
<description>Automator for testsigma</description>
99

1010
<properties>
@@ -19,28 +19,22 @@
1919
<appium.version>7.0.0</appium.version>
2020
<selenium.version>3.141.59</selenium.version>
2121
<jetty-io.version>9.4.12.v20180830</jetty-io.version>
22-
<commons.collections.version>3.2.1</commons.collections.version>
22+
<commons.collections.version>4.4</commons.collections.version>
2323
<org.everit.json.schema>1.5.1</org.everit.json.schema>
2424
<commons.text.version>1.3</commons.text.version>
2525
<java-faker>0.15</java-faker>
2626
<java-dom>2.0.2</java-dom>
27-
<poi.version>3.15</poi.version>
2827
<aerogear-otp-java.version>1.0.0</aerogear-otp-java.version>
29-
<mysql.version>5.1.6</mysql.version>
3028
<lombok.version>1.18.20</lombok.version>
3129
<json.version>20160810</json.version>
32-
<javax.mail.version>1.4.7</javax.mail.version>
33-
<mongodb.java.driver.version>3.12.5</mongodb.java.driver.version>
3430
<skyscreamer.version>1.3.0</skyscreamer.version>
3531
<maven-toolchains-plugin>3.0.0</maven-toolchains-plugin>
3632
<javax.validation.version>2.0.1.Final</javax.validation.version>
3733
<google.cloud.vision.version>1.88.0</google.cloud.vision.version>
38-
<pdfbox.version>2.0.8</pdfbox.version>
3934
<ashot.version>1.5.3</ashot.version>
4035
<jooq.version>1.6.2</jooq.version>
4136
<jaxen.version>1.2.0</jaxen.version>
42-
<dom4j.version>1.6.1</dom4j.version>
43-
<jsoup.version>1.10.2</jsoup.version>
37+
<jsoup.version>1.14.3</jsoup.version>
4438
<beanutils.version>1.9.4</beanutils.version>
4539
<httpcomponents.httpcore>4.4.13</httpcomponents.httpcore>
4640
<httpcomponents.httpmime>4.5.12</httpcomponents.httpmime>
@@ -103,8 +97,8 @@
10397
</dependency>
10498

10599
<dependency>
106-
<groupId>commons-collections</groupId>
107-
<artifactId>commons-collections</artifactId>
100+
<groupId>org.apache.commons</groupId>
101+
<artifactId>commons-collections4</artifactId>
108102
<version>${commons.collections.version}</version>
109103
</dependency>
110104

@@ -159,18 +153,6 @@
159153
<version>${httpcomponents.httpmime}</version>
160154
</dependency>
161155

162-
<dependency>
163-
<groupId>org.apache.pdfbox</groupId>
164-
<artifactId>pdfbox</artifactId>
165-
<version>${pdfbox.version}</version>
166-
</dependency>
167-
168-
<dependency>
169-
<groupId>org.apache.pdfbox</groupId>
170-
<artifactId>fontbox</artifactId>
171-
<version>${pdfbox.version}</version>
172-
</dependency>
173-
174156
<dependency>
175157
<groupId>ru.yandex.qatools.ashot</groupId>
176158
<artifactId>ashot</artifactId>
@@ -212,18 +194,6 @@
212194
<version>${java-faker}</version>
213195
</dependency>
214196

215-
<dependency>
216-
<groupId>org.jdom</groupId>
217-
<artifactId>jdom</artifactId>
218-
<version>${java-dom}</version>
219-
</dependency>
220-
221-
<dependency>
222-
<groupId>org.apache.poi</groupId>
223-
<artifactId>poi</artifactId>
224-
<version>${poi.version}</version>
225-
</dependency>
226-
227197
<dependency>
228198
<groupId>org.jboss.aerogear</groupId>
229199
<artifactId>aerogear-otp-java</artifactId>
@@ -236,44 +206,13 @@
236206
<version>${jooq.version}</version>
237207
</dependency>
238208

239-
<dependency>
240-
<groupId>org.apache.poi</groupId>
241-
<artifactId>poi-ooxml</artifactId>
242-
<version>${poi.version}</version>
243-
<exclusions>
244-
<!-- Exclude Commons Logging in favor of SLF4j -->
245-
<exclusion>
246-
<groupId>xml-apis</groupId>
247-
<artifactId>xml-apis</artifactId>
248-
</exclusion>
249-
</exclusions>
250-
</dependency>
251-
252209
<dependency>
253210
<groupId>org.springframework.boot</groupId>
254211
<artifactId>spring-boot-starter-log4j2</artifactId>
255212
<version>2.3.0.RELEASE</version>
256213
</dependency>
257214
<!-- Customer Related packages -->
258215

259-
<dependency>
260-
<groupId>mysql</groupId>
261-
<artifactId>mysql-connector-java</artifactId>
262-
<version>${mysql.version}</version>
263-
</dependency>
264-
265-
<dependency>
266-
<groupId>javax.mail</groupId>
267-
<artifactId>mail</artifactId>
268-
<version>${javax.mail.version}</version>
269-
</dependency>
270-
271-
<dependency>
272-
<groupId>org.mongodb</groupId>
273-
<artifactId>mongo-java-driver</artifactId>
274-
<version>${mongodb.java.driver.version}</version>
275-
</dependency>
276-
277216
<dependency>
278217
<groupId>org.skyscreamer</groupId>
279218
<artifactId>jsonassert</artifactId>
@@ -312,13 +251,6 @@
312251
<version>${jaxen.version}</version>
313252
</dependency>
314253

315-
<dependency>
316-
<groupId>dom4j</groupId>
317-
<artifactId>dom4j</artifactId>
318-
<version>${dom4j.version}</version>
319-
<scope>compile</scope>
320-
</dependency>
321-
322254
<dependency>
323255
<groupId>org.jsoup</groupId>
324256
<artifactId>jsoup</artifactId>
@@ -378,6 +310,7 @@
378310
</resources>
379311
<plugins>
380312
<plugin>
313+
<groupId>org.apache.maven.plugins</groupId>
381314
<artifactId>maven-compiler-plugin</artifactId>
382315
<version>${maven.compiler.plugin}</version>
383316
<configuration>
@@ -392,6 +325,7 @@
392325
</configuration>
393326
</plugin>
394327
<plugin>
328+
<groupId>org.apache.maven.plugins</groupId>
395329
<artifactId>maven-jar-plugin</artifactId>
396330
<version>3.2.0</version>
397331
<configuration>

0 commit comments

Comments
 (0)