From 9e3c55f587156a8f7fec0eed0179d2f6b8212c87 Mon Sep 17 00:00:00 2001
From: Jason Allen <jsa34@cam.ac.uk>
Date: Mon, 15 Nov 2021 16:40:09 +0000
Subject: [PATCH 1/6] Replace jdbc template and unnecessary spring usage to
Yank (using Apache DBUtils and HikariCP)
---
pom.xml | 12 ++++----
.../seleniumframework/database/BaseDao.java | 28 ------------------
.../database/ConnectionManager.java | 29 +++++++++++++++++++
.../guice/TestAutomationInjectorSource.java | 3 ++
.../properties/PropertyLoader.java | 4 +--
5 files changed, 40 insertions(+), 36 deletions(-)
delete mode 100644 src/main/java/uk/ac/cam/automation/seleniumframework/database/BaseDao.java
create mode 100644 src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
diff --git a/pom.xml b/pom.xml
index d8e541b..89febce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,9 +60,9 @@
<java.mail.version>1.6.2</java.mail.version>
<log4j2.version>2.14.1</log4j2.version>
<selenium.version>4.0.0</selenium.version>
- <spring.version>5.3.12</spring.version>
- <testng.version>7.4.0</testng.version>
+ <testng.version>7.3.0</testng.version>
<webdriver.manager.version>5.0.2</webdriver.manager.version>
+ <yank.version>3.4.0</yank.version>
<gpg.version>1.6</gpg.version>
<javadoc.version>3.1.1</javadoc.version>
@@ -161,11 +161,11 @@
<type>pom</type>
</dependency>
- <!-- Spring -->
+ <!-- DB Utils -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
+ <groupId>org.knowm</groupId>
+ <artifactId>yank</artifactId>
+ <version>${yank.version}</version>
</dependency>
<dependency>
diff --git a/src/main/java/uk/ac/cam/automation/seleniumframework/database/BaseDao.java b/src/main/java/uk/ac/cam/automation/seleniumframework/database/BaseDao.java
deleted file mode 100644
index e4220ae..0000000
--- a/src/main/java/uk/ac/cam/automation/seleniumframework/database/BaseDao.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package uk.ac.cam.automation.seleniumframework.database;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import javax.sql.DataSource;
-import java.sql.SQLException;
-import java.util.Objects;
-
-public abstract class BaseDao {
-
- public BaseDao() {
- }
-
- public abstract DataSource constructDatasource();
-
- protected JdbcTemplate getJdbcTemplate() {
- JdbcTemplate jdbcTemplate = new JdbcTemplate(this.constructDatasource());
- try {
- return jdbcTemplate;
- } finally {
- try {
- Objects.requireNonNull(jdbcTemplate.getDataSource()).getConnection().close();
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
- }
-}
diff --git a/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java b/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
new file mode 100644
index 0000000..e6ff227
--- /dev/null
+++ b/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
@@ -0,0 +1,29 @@
+package uk.ac.cam.automation.seleniumframework.database;
+
+import org.knowm.yank.Yank;
+import uk.ac.cam.automation.seleniumframework.properties.PropertyLoader;
+
+import java.util.Properties;
+
+public class ConnectionManager {
+ private static final String jdbcUrl = PropertyLoader.getProperty("automation.jdbc.url");
+ private static final String jdbcUsername = PropertyLoader.getProperty("automation.jdbc.username");
+ private static final String jdbcPassword = PropertyLoader.getProperty("automation.jdbc.password");
+
+ public static void initYank() {
+ // Connection Pool Properties
+ Properties dbProps = new Properties();
+ dbProps.setProperty("jdbcUrl", jdbcUrl);
+ dbProps.setProperty("username", jdbcUsername);
+ dbProps.setProperty("password", jdbcPassword);
+
+ // Setup connection pool
+ Yank.setupDefaultConnectionPool(dbProps);
+ }
+
+ public static void closeYank() {
+ Yank.releaseDefaultConnectionPool();
+ }
+
+
+}
diff --git a/src/main/java/uk/ac/cam/automation/seleniumframework/guice/TestAutomationInjectorSource.java b/src/main/java/uk/ac/cam/automation/seleniumframework/guice/TestAutomationInjectorSource.java
index afd3aa7..2a24c24 100644
--- a/src/main/java/uk/ac/cam/automation/seleniumframework/guice/TestAutomationInjectorSource.java
+++ b/src/main/java/uk/ac/cam/automation/seleniumframework/guice/TestAutomationInjectorSource.java
@@ -10,6 +10,7 @@ import io.cucumber.guice.CucumberModules;
import io.cucumber.guice.CucumberScopes;
import io.cucumber.guice.InjectorSource;
import io.cucumber.guice.ScenarioScope;
+import uk.ac.cam.automation.seleniumframework.database.ConnectionManager;
import uk.ac.cam.automation.seleniumframework.driver.DriverManager;
import uk.ac.cam.automation.seleniumframework.properties.guice.PropertiesModule;
@@ -27,12 +28,14 @@ public class TestAutomationInjectorSource implements InjectorSource {
@Override
public void enterScope() {
delegate.enterScope();
+ ConnectionManager.initYank();
DriverManager.getDriver();
}
@Override
public void exitScope() {
DriverManager.clearDriver();
+ ConnectionManager.closeYank();
delegate.exitScope();
}
diff --git a/src/main/java/uk/ac/cam/automation/seleniumframework/properties/PropertyLoader.java b/src/main/java/uk/ac/cam/automation/seleniumframework/properties/PropertyLoader.java
index b93faf1..b6bef1a 100644
--- a/src/main/java/uk/ac/cam/automation/seleniumframework/properties/PropertyLoader.java
+++ b/src/main/java/uk/ac/cam/automation/seleniumframework/properties/PropertyLoader.java
@@ -5,6 +5,7 @@ import uk.ac.cam.automation.seleniumframework.log.Log;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
@@ -47,7 +48,6 @@ public class PropertyLoader {
/**
* Register additional properties files with the PropertyLoader class
*
- * @param propertiesFileConfig
*/
public static void registerPropertiesFileConfig(PropertiesFileConfig propertiesFileConfig) {
propertiesFileConfigs.add(propertiesFileConfig);
@@ -63,7 +63,7 @@ public class PropertyLoader {
System.out.println("Sorry, unable to find " + config.getFileName());
return null;
}
- Log.Debug("Loaded resource from " + PropertyLoader.class.getClassLoader().getResource(config.getFileName()).getPath());
+ Log.Debug("Loaded resource from " + Objects.requireNonNull(PropertyLoader.class.getClassLoader().getResource(config.getFileName())).getPath());
properties.load(inputStream);
return properties.getProperty(propertyKey);
} catch (IOException ex) {
--
GitLab
From 2c361f9d88b8841f43782b50693514329b200050 Mon Sep 17 00:00:00 2001
From: Jason Allen <jsa34@cam.ac.uk>
Date: Mon, 15 Nov 2021 19:13:11 +0000
Subject: [PATCH 2/6] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fc4749..24e5e00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: maven:3-jdk-8-alpine
+image: maven:3.8.3-ibmjava-8-alpine
stages:
- deploy
--
GitLab
From eeccbcf88e94b7c59fc15f143003f4af59334509 Mon Sep 17 00:00:00 2001
From: Jason Allen <jsa34@cam.ac.uk>
Date: Mon, 15 Nov 2021 19:15:02 +0000
Subject: [PATCH 3/6] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24e5e00..b825f23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,6 @@ ossrh:
script:
- 'which gnupg || ( apk add --update gnupg && rm -rf /var/cache/apk/*)'
- apk add expect
- - gpg -v --list-keys
- echo "pinentry-mode loopback" > /root/.gnupg/gpg.conf
- echo "allow-loopback-pinentry" > /root/.gnupg/gpg-agent.conf
- gpg --batch --import <(echo "$SIGN_KEY" | base64 -d)
@@ -29,5 +28,4 @@ ossrh:
- expect -c 'spawn gpg --edit-key $::env(ENV_SIGN_KEY_ID) trust quit; send "5\ry\r"; expect eof'
- unset ENV_SIGN_KEY_ID
- gpgconf --kill gpg-agent
- - gpg -v --list-keys
- mvn $MAVEN_CLI_OPTS -Drevision=$RELEASE_VERSION compile install deploy -P release -Dmaven.gpg.skip=false -Dgpg.keyname=$SIGN_KEY_ID -Dgpg.passphrase=$SIGN_KEY_PASS -Drepository.username=$NEXUS_REPO_USER -Drepository.password=$NEXUS_REPO_PASS
--
GitLab
From 4a0c2c30d0f025cfea49b9f21eb70a703ff75dbf Mon Sep 17 00:00:00 2001
From: Jason Allen <jsa34@cam.ac.uk>
Date: Mon, 15 Nov 2021 19:20:02 +0000
Subject: [PATCH 4/6] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b825f23..987ec8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ ossrh:
script:
- 'which gnupg || ( apk add --update gnupg && rm -rf /var/cache/apk/*)'
- apk add expect
+ - gpg -v --list-keys
- echo "pinentry-mode loopback" > /root/.gnupg/gpg.conf
- echo "allow-loopback-pinentry" > /root/.gnupg/gpg-agent.conf
- gpg --batch --import <(echo "$SIGN_KEY" | base64 -d)
--
GitLab
From 8046a6b4c8821204287df02f5c50abdc7416060e Mon Sep 17 00:00:00 2001
From: Jason Allen <jsa34@cam.ac.uk>
Date: Thu, 25 Nov 2021 09:05:17 +0000
Subject: [PATCH 5/6] Deprecate rather than remove
---
pom.xml | 156 ++++++++++--------
.../seleniumframework/database/BaseDao.java | 37 +++++
.../database/ConnectionManager.java | 16 +-
.../guice/TestAutomationInjectorSource.java | 3 -
4 files changed, 132 insertions(+), 80 deletions(-)
create mode 100644 src/main/java/uk/ac/cam/automation/seleniumframework/database/BaseDao.java
diff --git a/pom.xml b/pom.xml
index d5c72d5..efb47c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,16 +51,17 @@
</distributionManagement>
<properties>
- <allure.version>2.16.0</allure.version>
+ <allure.version>2.16.1</allure.version>
<appium.version>7.6.0</appium.version>
<apache.commons.text.version>1.9</apache.commons.text.version>
<apache.commons.io.version>2.11.0</apache.commons.io.version>
- <cucumber.version>6.11.0</cucumber.version>
+ <cucumber.version>7.0.0</cucumber.version>
<guava.version>31.0.1-jre</guava.version>
<guice.version>5.0.1</guice.version>
<java.mail.version>1.6.2</java.mail.version>
<log4j2.version>2.14.1</log4j2.version>
<selenium.version>4.0.0</selenium.version>
+ <spring.version>5.3.13</spring.version>
<testng.version>7.3.0</testng.version>
<webdriver.manager.version>5.0.2</webdriver.manager.version>
<yank.version>3.4.0</yank.version>
@@ -109,6 +110,12 @@
<groupId>io.qameta.allure</groupId>
<artifactId>allure-cucumber6-jvm</artifactId>
<version>${allure.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.cucumber</groupId>
+ <artifactId>gherkin</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- log4j -->
@@ -149,25 +156,12 @@
<version>${cucumber.version}</version>
</dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-core</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
-
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-testng</artifactId>
<version>${cucumber.version}</version>
</dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-jvm</artifactId>
- <version>${cucumber.version}</version>
- <type>pom</type>
- </dependency>
-
<!-- DB Utils -->
<dependency>
<groupId>org.knowm</groupId>
@@ -175,6 +169,12 @@
<version>${yank.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
@@ -224,64 +224,74 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${maven.source.version}</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>${gpg.version}</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <skip>${maven.gpg.skip}</skip>
- <gpgArguments>
- <arg>--pinentry-mode</arg>
- <arg>loopback</arg>
- </gpgArguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <!-- <plugins>-->
+ <!-- <plugin>-->
+ <!-- <groupId>org.apache.maven.plugins</groupId>-->
+ <!-- <artifactId>maven-compiler-plugin</artifactId>-->
+ <!-- <version>3.8.1</version>-->
+ <!-- </plugin>-->
+ <!-- </plugins>-->
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven.source.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${gpg.version}</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.gpg.skip}</skip>
+ <gpgArguments>
+ <arg>--pinentry-mode</arg>
+ <arg>loopback</arg>
+ </gpgArguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
diff --git a/src/main/java/uk/ac/cam/automation/seleniumframework/database/BaseDao.java b/src/main/java/uk/ac/cam/automation/seleniumframework/database/BaseDao.java
new file mode 100644
index 0000000..54d3112
--- /dev/null
+++ b/src/main/java/uk/ac/cam/automation/seleniumframework/database/BaseDao.java
@@ -0,0 +1,37 @@
+package uk.ac.cam.automation.seleniumframework.database;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.Objects;
+
+public abstract class BaseDao {
+
+ public BaseDao() {
+ }
+
+ public abstract DataSource constructDatasource();
+
+ /**
+ * Construct a JDBC template instance from a given data source
+ * @deprecated
+ * This method is no longer supported as it doesn't fit with the static-first nature of the framework.
+ * <p> Use Yank instead.
+ *
+ * @return jdbc template instance
+ */
+ @Deprecated
+ protected JdbcTemplate getJdbcTemplate() {
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(this.constructDatasource());
+ try {
+ return jdbcTemplate;
+ } finally {
+ try {
+ Objects.requireNonNull(jdbcTemplate.getDataSource()).getConnection().close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
diff --git a/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java b/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
index e6ff227..cf4d505 100644
--- a/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
+++ b/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
@@ -1,6 +1,9 @@
package uk.ac.cam.automation.seleniumframework.database;
+import io.cucumber.java.AfterAll;
+import io.cucumber.java.BeforeAll;
import org.knowm.yank.Yank;
+import uk.ac.cam.automation.seleniumframework.log.Log;
import uk.ac.cam.automation.seleniumframework.properties.PropertyLoader;
import java.util.Properties;
@@ -10,7 +13,9 @@ public class ConnectionManager {
private static final String jdbcUsername = PropertyLoader.getProperty("automation.jdbc.username");
private static final String jdbcPassword = PropertyLoader.getProperty("automation.jdbc.password");
- public static void initYank() {
+ @BeforeAll
+ public void initYank() {
+ Log.Info("Starting Yank... yippee!");
// Connection Pool Properties
Properties dbProps = new Properties();
dbProps.setProperty("jdbcUrl", jdbcUrl);
@@ -19,11 +24,14 @@ public class ConnectionManager {
// Setup connection pool
Yank.setupDefaultConnectionPool(dbProps);
- }
+ Log.Info("Woohoo! Yank ahoy!");
+ }
- public static void closeYank() {
+ @AfterAll
+ public void closeYank() {
+ Log.Info("Yanking Yank away...");
Yank.releaseDefaultConnectionPool();
+ Log.Info("Yank... gone!");
}
-
}
diff --git a/src/main/java/uk/ac/cam/automation/seleniumframework/guice/TestAutomationInjectorSource.java b/src/main/java/uk/ac/cam/automation/seleniumframework/guice/TestAutomationInjectorSource.java
index 2a24c24..afd3aa7 100644
--- a/src/main/java/uk/ac/cam/automation/seleniumframework/guice/TestAutomationInjectorSource.java
+++ b/src/main/java/uk/ac/cam/automation/seleniumframework/guice/TestAutomationInjectorSource.java
@@ -10,7 +10,6 @@ import io.cucumber.guice.CucumberModules;
import io.cucumber.guice.CucumberScopes;
import io.cucumber.guice.InjectorSource;
import io.cucumber.guice.ScenarioScope;
-import uk.ac.cam.automation.seleniumframework.database.ConnectionManager;
import uk.ac.cam.automation.seleniumframework.driver.DriverManager;
import uk.ac.cam.automation.seleniumframework.properties.guice.PropertiesModule;
@@ -28,14 +27,12 @@ public class TestAutomationInjectorSource implements InjectorSource {
@Override
public void enterScope() {
delegate.enterScope();
- ConnectionManager.initYank();
DriverManager.getDriver();
}
@Override
public void exitScope() {
DriverManager.clearDriver();
- ConnectionManager.closeYank();
delegate.exitScope();
}
--
GitLab
From 538adc3c764b76bb7da9feffd97bdb4d63e5c4bc Mon Sep 17 00:00:00 2001
From: Jason Allen <jsa34@cam.ac.uk>
Date: Tue, 30 Nov 2021 21:33:21 +0000
Subject: [PATCH 6/6] Update allure for cucumber 7 Remove unnecessary logging
---
pom.xml | 132 ++++++++----------
.../database/ConnectionManager.java | 5 -
2 files changed, 61 insertions(+), 76 deletions(-)
diff --git a/pom.xml b/pom.xml
index efb47c5..249b42b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,11 +51,11 @@
</distributionManagement>
<properties>
- <allure.version>2.16.1</allure.version>
+ <allure.version>2.17.0</allure.version>
<appium.version>7.6.0</appium.version>
<apache.commons.text.version>1.9</apache.commons.text.version>
<apache.commons.io.version>2.11.0</apache.commons.io.version>
- <cucumber.version>7.0.0</cucumber.version>
+ <cucumber.version>7.1.0</cucumber.version>
<guava.version>31.0.1-jre</guava.version>
<guice.version>5.0.1</guice.version>
<java.mail.version>1.6.2</java.mail.version>
@@ -108,7 +108,7 @@
<!-- Allure Reports -->
<dependency>
<groupId>io.qameta.allure</groupId>
- <artifactId>allure-cucumber6-jvm</artifactId>
+ <artifactId>allure-cucumber7-jvm</artifactId>
<version>${allure.version}</version>
<exclusions>
<exclusion>
@@ -224,74 +224,64 @@
</dependencies>
<build>
- <pluginManagement>
- <!-- <plugins>-->
- <!-- <plugin>-->
- <!-- <groupId>org.apache.maven.plugins</groupId>-->
- <!-- <artifactId>maven-compiler-plugin</artifactId>-->
- <!-- <version>3.8.1</version>-->
- <!-- </plugin>-->
- <!-- </plugins>-->
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${maven.source.version}</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>${gpg.version}</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- <skip>${maven.gpg.skip}</skip>
- <gpgArguments>
- <arg>--pinentry-mode</arg>
- <arg>loopback</arg>
- </gpgArguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven.source.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${gpg.version}</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.gpg.skip}</skip>
+ <gpgArguments>
+ <arg>--pinentry-mode</arg>
+ <arg>loopback</arg>
+ </gpgArguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<profiles>
diff --git a/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java b/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
index cf4d505..3383f48 100644
--- a/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
+++ b/src/main/java/uk/ac/cam/automation/seleniumframework/database/ConnectionManager.java
@@ -3,7 +3,6 @@ package uk.ac.cam.automation.seleniumframework.database;
import io.cucumber.java.AfterAll;
import io.cucumber.java.BeforeAll;
import org.knowm.yank.Yank;
-import uk.ac.cam.automation.seleniumframework.log.Log;
import uk.ac.cam.automation.seleniumframework.properties.PropertyLoader;
import java.util.Properties;
@@ -15,7 +14,6 @@ public class ConnectionManager {
@BeforeAll
public void initYank() {
- Log.Info("Starting Yank... yippee!");
// Connection Pool Properties
Properties dbProps = new Properties();
dbProps.setProperty("jdbcUrl", jdbcUrl);
@@ -24,14 +22,11 @@ public class ConnectionManager {
// Setup connection pool
Yank.setupDefaultConnectionPool(dbProps);
- Log.Info("Woohoo! Yank ahoy!");
}
@AfterAll
public void closeYank() {
- Log.Info("Yanking Yank away...");
Yank.releaseDefaultConnectionPool();
- Log.Info("Yank... gone!");
}
}
--
GitLab