Release 5.11.0

.github/workflows/promote.yml

@@ -32,13 +32,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-
       - name: Get variables
         run: |
           echo "ARTIFACT=`echo ${{ github.repository }} | cut -d/ -f2- | awk '{print tolower($0)}'`" >> $GITHUB_ENV
@@ -58,7 +51,7 @@ jobs:
           export BUNDLE_FILE="bundle.jar"
           jar -cvf ${BUNDLE_FILE} "${files[@]}"
           echo 'Bundle upload'
-          curl -u ${{ secrets.SONATYPE_USER }}:${{ secrets.SONATYPE_PASSWORD }} -L \
+          curl -f -u ${{ secrets.SONATYPE_USER }}:${{ secrets.SONATYPE_PASSWORD }} -L \
             --request POST '${{ env.UPSTREAM_REPOSITORY_URL }}/service/local/staging/bundle_upload' \
             --form "file=@${BUNDLE_FILE}" >response.json
           response_type=`jq type response.json || echo ''`
@@ -105,4 +98,4 @@ jobs:
           else
             echo 'Verification failed, please check the bundle' 1>&2
             exit 1
-          fi
+          fi

.github/workflows/release.yml

@@ -12,9 +12,9 @@ on:
 env:
   GH_USER_NAME: github.actor
   SCRIPTS_VERSION: 5.10.0
-  BOM_VERSION: 5.10.0
-  MIGRATIONS_VERSION: 5.10.0
-  RELEASE_VERSION: 5.10.0
+  BOM_VERSION: 5.11.0
+  MIGRATIONS_VERSION: 5.11.0
+  RELEASE_VERSION: 5.11.0
 
 jobs:
   release:

CHANGELOG.md

@@ -3,56 +3,71 @@
 # Unreleased
 
 ### New Features
-* Added `datastore.minio.bucketPrefix` and `datastore.minio.defaultBucketName` configuration properties
+
+* Added `datastore.minio.bucketPrefix` and `datastore.minio.defaultBucketName` configuration
+  properties
 
 ## 3.2.1
+
 ##### Released: XXX 2017
 
 ### Bugfixes
-* reportportal/reportportal#170 - Test run breaks with unclassified error (jbehave) #170
 
+* reportportal/reportportal#170 - Test run breaks with unclassified error (jbehave) #170
 
 ## 3.2
+
 ##### Released: XXX 2017
 
 ### New Features
+
 * EPMRPP-26429/EPMRPP-26263 - Added possibility to get all latest launches
 * EPMRPP-26416 - Add possibility to use a 'dot' symbol in login of user
 
 ### Bug Fixes
+
 * EPMRPP-29167 - Statistics for deleted elements with custom defect types are still present
-* EPMRPP-29337 - Widgets with Latest Launches ON include statistics for launches with In Progress status
+* EPMRPP-29337 - Widgets with Latest Launches ON include statistics for launches with In Progress
+  status
 * EPMRPP-29320 - Unclassified error for Latest Launches view selected in case no results
 
 ## 3.0
+
 ##### Released: XXX 2017
 
 ### BugFixes
+
 * EPMRPP-23564 - GET shared dashboard request does not contain 'description' parameter
 * EPMRPP-24914 - Item with investigated defect type only is not included in scope of analysis
-* EPMRPP-24539 - Do not take into account items with No Defect type in analysis of following launches
+* EPMRPP-24539 - Do not take into account items with No Defect type in analysis of following
+  launches
 * EPMRPP-25408 - No Defect items are included in scope of analysis in case item has ticket
 
-
 ## 2.7.0
+
 ##### Released: 28 November 2016
 
 ### BugFixes
-* EPMRPP-21206 - Update personal project defaults
 
+* EPMRPP-21206 - Update personal project defaults
 
 ## 2.6.1
+
 ##### Released: 30 September 2016
 
 ### New Features
+
 * Added GitHub auth support
 * Added Personal Spaces support
 
 ### BugFixes
+
 * Fixed issue with Launches cascade delete
 
 ## 2.6.0
+
 ##### Released: 16 September 2016
 
 ### New Features
+
 * Initial release to Public Maven Repositories

README.md

@@ -1,4 +1,5 @@
 # commons-dao
+
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal)
 

build.gradle

@@ -33,17 +33,8 @@ apply from: 'jooq.gradle'
 
 repositories {
     mavenCentral { url "https://repo1.maven.org/maven2" }
-    if (releaseMode) {
-        dependencyRepos.forEach { path ->
-            maven {
-                setUrl("https://maven.pkg.github.com/reportportal/${path}")
-                credentials {
-                    username = findProperty("githubUserName")
-                    password = findProperty("githubToken")
-                }
-            }
-        }
-    } else {
+
+    if (!releaseMode) {
         maven { url 'https://jitpack.io' }
     }
 }
@@ -61,9 +52,9 @@ dependencies {
         compile 'com.epam.reportportal:commons-rules'
         compile 'com.epam.reportportal:commons-model'
     } else {
-        compile 'com.github.reportportal:commons:ce2166b5'
-        compile 'com.github.reportportal:commons-rules:5.10.0'
-        compile 'com.github.reportportal:commons-model:232e69a5'
+        compile 'com.github.reportportal:commons:07566b8e'
+        compile 'com.github.reportportal:commons-rules:01ec4d17'
+        compile 'com.github.reportportal:commons-model:83f012f'
     }
 
     //https://nvd.nist.gov/vuln/detail/CVE-2020-10683 (dom4j 2.1.3 version dependency) AND https://nvd.nist.gov/vuln/detail/CVE-2019-14900
@@ -80,6 +71,7 @@ dependencies {
 
     compile 'io.minio:minio:6.0.13'
 
+    implementation group: 'org.json', name: 'json', version: '20220320'
     compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
     compile 'org.hibernate.validator:hibernate-validator'
 
@@ -96,13 +88,20 @@ dependencies {
 
     compile 'org.apache.jclouds.api:s3:2.5.0'
     compile 'org.apache.jclouds.provider:aws-s3:2.5.0'
+    implementation 'org.apache.jclouds.api:filesystem:2.5.0'
+
+    // add lombok support
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+    testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
+    testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'com.github.ben-manes.caffeine:caffeine'
 
     testCompile 'org.springframework.boot:spring-boot-starter-test'
     testCompile 'org.flywaydb.flyway-test-extensions:flyway-spring-test:6.1.0'
-    
+
 }
 
 dependencyCheck {

gradle.properties

@@ -1 +1,2 @@
-version=5.10.1
+version=5.11.0
+lombokVersion=1.18.30

project-properties.gradle

@@ -68,12 +68,16 @@ project.ext {
             (migrationsUrl + '/migrations/60_sender_case_operator.up.sql')             : 'V060__sender_case_operator.sql',
             (migrationsUrl + '/migrations/61_remove_acl.up.sql')                       : 'V061__remove_acl.sql',
             (migrationsUrl + '/migrations/62_remove_dashboard_cascade_drop.up.sql')    : 'V062__remove_dashboard_cascade_drop.sql',
-            (migrationsUrl + '/migrations/65_launch_attribute_rules_length.up.sql')    : 'V065__launch_attribute_rules_length.up.sql',
+            (migrationsUrl + '/migrations/65_launch_attribute_rules_length.up.sql')    : 'V065__launch_attribute_rules_length.sql',
             (migrationsUrl + '/migrations/67_api_keys.up.sql')                         : 'V067__api_keys.sql',
-            (migrationsUrl + '/migrations/68_api_key_last_used_at.up.sql')             : 'V068__api_key_last_used_at.up.sql',
+            (migrationsUrl + '/migrations/68_api_key_last_used_at.up.sql')             : 'V068__api_key_last_used_at.sql',
             (migrationsUrl + '/migrations/69_replace_activity_table.up.sql')           : 'V069__replace_activity_table.sql',
             (migrationsUrl + '/migrations/71_user_bid_inviting_user_id.up.sql')        : 'V071__user_bid_inviting_user_id.sql',
             (migrationsUrl + '/migrations/72_add_attachment_name.up.sql')              : 'V072__add_attachment_name.sql',
+            (migrationsUrl + '/migrations/73_sender_case_rule_name.up.sql')            : 'V073__sender_case_rule_name.sql',
+            (migrationsUrl + '/migrations/76_user_bid_extension.up.sql')               : 'V076__user_bid_extension.sql',
+            (migrationsUrl + '/migrations/77_email_server_documentation_link.up.sql')  : 'V077__email_server_documentation_link.sql',
+            (migrationsUrl + '/migrations/78_drop_redundant_index.up.sql')             : 'V078__drop_redundant_index.sql',
 
     ]
     excludeTests = [

src/main/java/com/epam/ta/reportportal/ApplicationContextAwareFactoryBean.java

@@ -25,89 +25,88 @@
 import org.springframework.context.ApplicationContextAware;
 
 /**
- * {@link FactoryBean} with access to {@link ApplicationContext} with lazy
- * initialization
+ * {@link FactoryBean} with access to {@link ApplicationContext} with lazy initialization
  *
  * @param <T> - type of bean
  * @author Andrei Varabyeu
  */
-public abstract class ApplicationContextAwareFactoryBean<T> implements FactoryBean<T>, ApplicationContextAware, InitializingBean {
+public abstract class ApplicationContextAwareFactoryBean<T> implements FactoryBean<T>,
+    ApplicationContextAware, InitializingBean {
 
-	/**
-	 * Application context holder
-	 */
-	private ApplicationContext applicationContext;
+  /**
+   * Application context holder
+   */
+  private ApplicationContext applicationContext;
 
-	/**
-	 * Supplier of bean to be created
-	 */
-	private Supplier<T> beanSupplier;
+  /**
+   * Supplier of bean to be created
+   */
+  private Supplier<T> beanSupplier;
 
-	/**
-	 * Whether is bean to be creates going to be singleton
-	 */
-	private boolean singleton = true;
+  /**
+   * Whether is bean to be creates going to be singleton
+   */
+  private boolean singleton = true;
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.springframework.context.ApplicationContextAware#setApplicationContext
-	 * (org.springframework.context.ApplicationContext)
-	 */
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
-	}
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.springframework.beans.factory.FactoryBean#getObject()
+   */
+  @Override
+  public T getObject() throws Exception {
+    return beanSupplier.get();
+  }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.beans.factory.FactoryBean#getObject()
-	 */
-	@Override
-	public T getObject() throws Exception {
-		return beanSupplier.get();
-	}
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.springframework.beans.factory.FactoryBean#isSingleton()
+   */
+  @Override
+  public boolean isSingleton() {
+    return this.singleton;
+  }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
-	 */
-	@Override
-	public boolean isSingleton() {
-		return this.singleton;
-	}
+  public void setSingleton(boolean singleton) {
+    this.singleton = singleton;
+  }
 
-	public void setSingleton(boolean singleton) {
-		this.singleton = singleton;
-	}
+  /**
+   * Instantiates supplier for bean to be created. This mades possible lazy-initialization
+   */
+  @Override
+  public void afterPropertiesSet() throws Exception {
+    Supplier<T> supplier = this::createInstance;
 
-	/**
-	 * Instantiates supplier for bean to be created. This mades possible
-	 * lazy-initialization
-	 */
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		Supplier<T> supplier = this::createInstance;
+    this.beanSupplier = isSingleton() ? Suppliers.memoize(supplier) : supplier;
+  }
 
-		this.beanSupplier = isSingleton() ? Suppliers.memoize(supplier) : supplier;
-	}
+  protected ApplicationContext getApplicationContext() {
+    return applicationContext;
+  }
 
-	protected ApplicationContext getApplicationContext() {
-		return applicationContext;
-	}
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * org.springframework.context.ApplicationContextAware#setApplicationContext
+   * (org.springframework.context.ApplicationContext)
+   */
+  @Override
+  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    this.applicationContext = applicationContext;
+  }
 
-	/**
-	 * Template method that subclasses must override to construct the object
-	 * returned by this factory.
-	 * <p>
-	 * Invoked on initialization of this FactoryBean in case of a singleton;
-	 * else, on each {@link #getObject()} call.
-	 *
-	 * @return the object returned by this factory
-	 * @see #getObject()
-	 */
-	protected abstract T createInstance();
+  /**
+   * Template method that subclasses must override to construct the object returned by this
+   * factory.
+   * <p>
+   * Invoked on initialization of this FactoryBean in case of a singleton; else, on each
+   * {@link #getObject()} call.
+   *
+   * @return the object returned by this factory
+   * @see #getObject()
+   */
+  protected abstract T createInstance();
 }