Releasing 3.2.1

.travis.yml

@@ -12,7 +12,6 @@ jdk:
 
 branches:
   only:
-  - develop
   - master
 
 install:

build.gradle

@@ -10,7 +10,7 @@ allprojects {
     apply plugin: "jacoco"
 
     group = 'com.paypal.butterfly'
-    version = '3.2.1-SNAPSHOT'
+    version = '3.2.1'
 
     repositories {
         mavenLocal()

docs/CONTRIBUTING.md

@@ -5,15 +5,15 @@
 
 - If there is not one open already, open an issue in [GitHub issues](https://github.com/paypal/butterfly/issues)
 - Fork this repo
-- Checkout `develop` branch
+- Checkout `master` branch
 - Apply your changes
   - Make sure all projects build and all unit tests pass
   - Make sure code coverage doesn't drop (add extra unit tests if necessary)
   - If fixing a bug, make sure you add an unit or integration test to expose the issue
   - If adding a new feature, make sure you add an unit or integration test to test the feature
   - If adding a new feature, add end user documentation as well
   - Add comments to the code explaining your changes if necessary
-- Create a pull request to the correct development branch (mention the issue id in the PR name)
+- Create a pull request to master branch (mention the issue id in the PR name)
 
 ## Code style
 

docs/Extension-development-guide.md

@@ -15,7 +15,7 @@ As an analogy, if **Butterfly is a cook**, then **the recipe is the transformati
 
 Butterfly offers a **Service Provider Interface (SPI)** allowing the **transfomration engine** to be completely detached from **transformation templates**. This flexible architecture allows anyone to write transformation templates and plug them easily into Butterfly.
 
-This SPI is represented by [butterfly-extensions-api](https://paypal.github.io/butterfly/javadocs/3.2.0/butterfly-extensions-api/index.html).
+This SPI is represented by [butterfly-extensions-api](https://paypal.github.io/butterfly/javadocs/3.2.1/butterfly-extensions-api/index.html).
 
 ### How to install an extension
 
@@ -103,5 +103,5 @@ When developing a Butterfly extension, it is very helpful to run it from the IDE
 
 Refer to the following javadocs to develop your own Butterfly extension:
 
-1. [butterfly-extensions-api](https://paypal.github.io/butterfly/javadocs/3.2.0/butterfly-extensions-api/index.html): API component to be used by Butterfly extensions when providing their transformation and upgrade templates.
-1. [butterfly-utilities](https://paypal.github.io/butterfly/javadocs/3.2.0/butterfly-utilities/index.html): multiple types of ready-to-use transformation utilities.
+1. [butterfly-extensions-api](https://paypal.github.io/butterfly/javadocs/3.2.1/butterfly-extensions-api/index.html): API component to be used by Butterfly extensions when providing their transformation and upgrade templates.
+1. [butterfly-utilities](https://paypal.github.io/butterfly/javadocs/3.2.1/butterfly-utilities/index.html): multiple types of ready-to-use transformation utilities.

docs/Installing-Butterfly.md

@@ -11,14 +11,14 @@ See [butterfly tap](https://github.com/paypal/homebrew-butterfly) for instructio
 
 ## Installing Butterfly from zip file
 
-1. Download and extract [butterfly-cli-package.zip](https://repo1.maven.org/maven2/com/paypal/butterfly/butterfly-cli-package/3.2.0/butterfly-cli-package-3.2.0.zip) file
+1. Download and extract [butterfly-cli-package.zip](https://repo1.maven.org/maven2/com/paypal/butterfly/butterfly-cli-package/3.2.1/butterfly-cli-package-3.2.1.zip) file
 1. Cd to the `butterfly` folder and run `butterfly`. If you see its help, Butterfly has been installed properly
 1. Run `butterfly –l` and notice that you have no Butterfly extensions at this point, as seen below
 
 ```
 No active profile set, falling back to default profiles: default
 Started ButterflyCliApp in 0.965 seconds (JVM running for 1.427)
-Butterfly application transformation tool (version 3.2.0)
+Butterfly application transformation tool (version 3.2.1)
 There are no registered extensions
 ```
 
@@ -36,7 +36,7 @@ You would get an output similar to the one below if you've installed the sample
 ```
 No active profile set, falling back to default profiles: default
 Started ButterflyCliApp in 0.909 seconds (JVM running for 1.397)
-Butterfly application transformation tool (version 3.2.0)
+Butterfly application transformation tool (version 3.2.1)
 See registered extensions below (shortcut in parenthesis)
 
 - com.extensiontest.SampleExtension: Sample extension (version 1.0.0)

docs/QUICK_START.md

@@ -8,7 +8,7 @@ Follow the steps below.
 ### 1- Installing Butterfly
 
 * Install Butterfly following [this document](https://paypal.github.io/butterfly/Installing-Butterfly).
-* Following the same document, install [butterfly-springboot-extension-3.2.0.jar](https://paypal.github.io/butterfly/jar/butterfly-springboot-extension-3.2.0.jar) Butterfly extension, which will be used to transform the sample application.
+* Following the same document, install [butterfly-springboot-extension-3.2.1.jar](https://paypal.github.io/butterfly/jar/butterfly-springboot-extension-3.2.1.jar) Butterfly extension, which will be used to transform the sample application.
 
 ### 2- The sample application
 

docs/RELEASE_NOTES.md

@@ -4,13 +4,13 @@
 ## 3.2.1
 
 #### Release date
-TBD
+December 21st, 2021
 
 #### New features and enhancements
-TBD
+None
 
 #### Bug fixes
-TBD
+* [385 - Upgrade log4j to version 2.17.0](https://github.com/paypal/butterfly/issues/385)
 
 ## 3.2.0
 

release_steps.md

@@ -1,6 +1,6 @@
 # Release steps
 
-1. Working from a feature branch (out of develop) in your fork:
+1. Working from master branch:
    1. Rev up root build.gradle file to the release version
    1. Build and test it
    1. In your terminal, set an environment with the new Butterfly version (necessary in next instructions): `export NEW_BUTTERFLY_VERSION=<new version>`
@@ -21,9 +21,7 @@
       1. update link in `QUICK_START.md` if zip file name changed
    1. Update release notes
    1. Commit `Releasing x`
-   1. Push from local feature branch to origin feature branch (`git push origin <branch name>`)
-1. Send and merge PR from origin feature branch to upstream develop
-1. Send and merge PR from upstream develop to upstream master
+   1. Push your changes (`git push upstream master`)
 1. Tag new release from master
    1. Release title should be the version
    1. Add sections `New Features and enhancements` and `Bug fixes` from release notes to Release description
@@ -47,12 +45,11 @@
    1. Copy the `sha256` value from it and close the text editor
    1. Change file https://github.com/paypal/homebrew-butterfly/blob/master/Formula/butterfly.rb providing the new Butterfly `VERSION` and `sha256` value
    1. Test the new brew installation and make sure it works 
-1. Working from a feature branch (out of develop) in your fork:
+1. Working from master branch:
    1. Rev up root build.gradle file to the next SNAPSHOT version
    1. Build the whole project and make sure it builds fine
    1. Add new version empty section in release notes
    1. Commit `Preparing for version x`
-   1. Push from feature branch to origin feature branch (`git push origin <branch name>`)
-   1. Send and merge PR from origin feature branch to upstream develop
+   1. Push your changes (`git push upstream master`)
 1. Create new milestone
    1. Add issues to new milestone (if any)

tests/integration-tests/src/test/java/com/paypal/butterfly/integrationtests/PerformanceIT.java

@@ -40,7 +40,7 @@ public class PerformanceIT extends AbstractTestNGSpringContextTests {
 
     private static final int PARALLELISM = Runtime.getRuntime().availableProcessors();
     private static final int NUMBER_OF_PARALLEL_TRANSFORMATIONS = 200;
-    private static final float MINIMUM_ACCEPTABLE_EFFICIENCY = 40f; // In percentage
+    private static final float MINIMUM_ACCEPTABLE_EFFICIENCY = 30f; // In percentage
 
     @Autowired
     private ButterflyFacade facade;