Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into feature/transformer-generator
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG-JDK8.md
#	CHANGELOG.md
#	bull-bean-transformer/pom.xml
#	bull-common/pom.xml
#	bull-converter/pom.xml
#	bull-map-transformer/pom.xml
#	bull-report/pom.xml
#	pom.xml
  • Loading branch information
Fabio Borriello committed Oct 7, 2020
2 parents 180b723 + a5e6709 commit 67863da
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# These owners will be the default owners for everything on this repo.
# https://github.com/HotelsDotCom/bull

* @HotelsDotCom/bull-committers
* @HotelsDotCom/bull-committers borriello.fabio@gmail.com

# Only some members of Customer Insights can alter the CODEOWNERS file
.github/CODEOWNERS @fborriello @HotelsDotCom/bull-admin
.github/CODEOWNERS borriello.fabio@gmail.com @HotelsDotCom/bull-admin
4 changes: 4 additions & 0 deletions CHANGELOG-JDK8.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file.
* Added transformer model generation for mutable JavaBeans in module `transformer-generator-core`.
* Added transformer generation at run-time in module `transformer-bytecode-adapter`.

### [1.7.3-jdk8] 2020.10.07
#### Changed
* Provides new utilities methods

### [1.7.2-jdk8] 2020.06.09
#### Changed
* Removes the deprecated method: `setDefaultValueSetEnabled`
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file.
* Added transformer generation at run-time in module `transformer-bytecode-adapter`.
* Added transformer source adapter which take the transformers generated from the Core module and decorate them to produce readable source file representations in module `transformer-source-adapter`.

### [1.7.4] 2020.10.07
#### Changed
* Provides new utilities methods

### [1.7.3] 2020.06.09
#### Changed
* Removes the deprecated method: `setDefaultValueSetEnabled`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Tests for the source adapter.
*/
/**
* Tests for the source adapter.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Example usage of the source adapter.
*/
/**
* Example usage of the source adapter.
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
<apache.commons-lang3.version>3.11</apache.commons-lang3.version>
<hotels.oss.plugin.config.version>1.3.0</hotels.oss.plugin.config.version>
<!-- testing dependencies -->
<mockito-core.version>3.5.11</mockito-core.version>
<mockito-core.version>3.5.13</mockito-core.version>
<testng.version>7.3.0</testng.version>
<assertj-core.version>3.17.2</assertj-core.version>
<!-- validation dependencies -->
<validation-api.version>2.0.1.Final</validation-api.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<hibernate-validator.version>6.1.6.Final</hibernate-validator.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<javax.el-api.version>3.0.0</javax.el-api.version>
<glassfish.javax.el.version>2.2.6</glassfish.javax.el.version>
Expand Down

0 comments on commit 67863da

Please sign in to comment.