Updated bintray url

erezn5 · Jan 16, 2020 · 35547ea · 35547ea
1 parent f3281e6
commit 35547ea
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -27,7 +27,7 @@ xstreamVersion = 1.4.9
 jodaTimeVersion = 2.7
 gsonVersion = 2.8.4
 typesafeConfigVersion = 1.3.1
-freemarkerVersion = 2.3.28
+freemarkerVersion = 2.3.29
 wiremockCoreVersion = 1.58
 cucumberVersion = 2.4.0
 commonsLoggingVersion = 1.2

diff --git a/serenity-appium-screenplay-poc/pom.xml b/serenity-appium-screenplay-poc/pom.xml
@@ -24,7 +24,7 @@
         </snapshots>
         <id>central</id>
         <name>bintray</name>
-        <url>http://jcenter.bintray.com</url>
+        <url>https://jcenter.bintray.com</url>
       </repository>
     </repositories>
     <pluginRepositories>
@@ -34,7 +34,7 @@
         </snapshots>
         <id>central</id>
         <name>bintray-plugins</name>
-        <url>http://jcenter.bintray.com</url>
+        <url>https://jcenter.bintray.com</url>
       </pluginRepository>
     </pluginRepositories>
 

diff --git a/serenity-appium/pom.xml b/serenity-appium/pom.xml
@@ -24,7 +24,7 @@
             </snapshots>
             <id>central</id>
             <name>bintray</name>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </repository>
     </repositories>
     <pluginRepositories>
@@ -34,7 +34,7 @@
             </snapshots>
             <id>central</id>
             <name>bintray-plugins</name>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </pluginRepository>
     </pluginRepositories>
 

diff --git a/...nity-browserstack/src/main/java/net/serenitybdd/browserstack/BrowserStackTestSession.java b/...nity-browserstack/src/main/java/net/serenitybdd/browserstack/BrowserStackTestSession.java
@@ -49,6 +49,9 @@ public void updateTestResultFor(TestOutcome testOutcome) throws URISyntaxExcepti
     }
 
     public String getPublicUrl() throws URISyntaxException, IOException {
+        if ((browserStackUsername == null) || (browserStackKey == null)) {
+            return "";
+        }
         HttpGet querySessionInfo = new HttpGet(getSessionUri());
         HttpEntity sessionDetails = HttpClientBuilder.create().build().execute(querySessionInfo).getEntity();
         String sessionBody = EntityUtils.toString(sessionDetails, charsetOf(sessionDetails));

diff --git a/serenity-gradle-plugin/src/main/groovy/net/serenitybdd/plugins/gradle/SerenityPlugin.groovy b/serenity-gradle-plugin/src/main/groovy/net/serenitybdd/plugins/gradle/SerenityPlugin.groovy
@@ -78,7 +78,7 @@ class SerenityPlugin implements Plugin<Project> {
                 List<String> extendedReportTypes = project.serenity.reports
                 if (extendedReportTypes) {
                     for (ExtendedReport report : ExtendedReports.named(extendedReportTypes)) {
-                        generatedReport = report.generateReportFrom(reportDirectory)
+                        generatedReport = report.generateReportFrom(reportDirectory).toPath()
                         logger.lifecycle("  - ${report.description}: ${generatedReport.toURI()}")
                     }
                 }

diff --git a/serenity-mobile-screenplay-example/pom.xml b/serenity-mobile-screenplay-example/pom.xml
@@ -29,7 +29,7 @@
 			</snapshots>
 			<id>central</id>
 			<name>bintray</name>
-			<url>http://jcenter.bintray.com</url>
+			<url>https://jcenter.bintray.com</url>
 		</repository>
 	</repositories>
 	<pluginRepositories>
@@ -39,7 +39,7 @@
 			</snapshots>
 			<id>central</id>
 			<name>bintray-plugins</name>
-			<url>http://jcenter.bintray.com</url>
+			<url>https://jcenter.bintray.com</url>
 		</pluginRepository>
 	</pluginRepositories>
 	<dependencies>

diff --git a/serenity-report-resources/src/main/resources/freemarker/default.ftl b/serenity-report-resources/src/main/resources/freemarker/default.ftl
@@ -506,7 +506,8 @@
                                     </#if>
                                     <#if step.hasData()>
                                         <#list step.reportData as recordedData>
-                                            <#assign restDataNumber = "EVIDENCE-${step.number}-${recordedData?index}">
+                                            <#assign stepIndex=recordedData?index>
+                                            <#assign restDataNumber = "EVIDENCE-${step.number}-${stepIndex}">
                                             <span class="piece-of-evidence">
                                                 <@reportData reportData=recordedData number=restDataNumber />
                                             </span>

diff --git a/serenity-reports/src/main/java/net/thucydides/core/reports/html/Reporter.java b/serenity-reports/src/main/java/net/thucydides/core/reports/html/Reporter.java
@@ -16,7 +16,7 @@
 
 class Reporter {
 
-    private static final TimeoutValue DEFAULT_TIMEOUT = new TimeoutValue(60, TimeUnit.SECONDS);
+    private static final TimeoutValue DEFAULT_TIMEOUT = new TimeoutValue(600, TimeUnit.SECONDS);
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HtmlAggregateStoryReporter.class);
 

diff --git a/serenity-smoketests/pom.xml b/serenity-smoketests/pom.xml
@@ -29,7 +29,7 @@
             </snapshots>
             <id>central</id>
             <name>bintray</name>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </repository>
     </repositories>
     <pluginRepositories>
@@ -39,7 +39,7 @@
             </snapshots>
             <id>central</id>
             <name>bintray-plugins</name>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </pluginRepository>
     </pluginRepositories>