Skip to content

Commit

Permalink
Update to 2.5.3 (#92)
Browse files Browse the repository at this point in the history
* Add jakarta.annotation-api to fix broken build on Java 11 (fixes MariaDB4j#456)

* Downgrade MariaDB from 10.3.13 to 10.2.11

DB JARs for v10.2.11 are the last ones actually currently available.

Please see https://github.com/vorburger/MariaDB4j/issues/484
for the full background about why this is being done.

Includes disabling building the DBs' JARs on Travis (for now).

Anyone reading this is invited to contributed a PR for MariaDB4j#484
enabling later DB releases (for all platforms) to successfully build.

* Bump maven-plugin-annotations from 3.6.0 to 3.6.2

Bumps [maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](apache/maven-plugin-tools@maven-plugin-tools-3.6.0...maven-plugin-tools-3.6.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump maven-plugin-plugin from 3.6.0 to 3.6.2

Bumps [maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](apache/maven-plugin-tools@maven-plugin-tools-3.6.0...maven-plugin-tools-3.6.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Issue MariaDB4j#372: Add automatic module name to core

Libraries without a set automatic module name causes build warnings for
all clients who build with Java >= 9.

Also bump version of the Exec library, to use a version which has the
automatic module name set.

* Use lower case letter in automatic module name

* Clean up dependabot.yml

* Bump springboot.version from 2.5.2 to 2.6.0

Bumps `springboot.version` from 2.5.2 to 2.6.0.

Updates `spring-boot-dependencies` from 2.5.2 to 2.6.0
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.5.2...v2.6.0)

Updates `spring-boot-maven-plugin` from 2.5.2 to 2.6.0
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.5.2...v2.6.0)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump mysql-connector-java from 8.0.22 to 8.0.27

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.22 to 8.0.27.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](mysql/mysql-connector-j@8.0.22...8.0.27)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump junit from 4.13.1 to 4.13.2

Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](junit-team/junit4@r4.13.1...r4.13.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump maven-compat from 3.6.3 to 3.8.4

Bumps [maven-compat](https://github.com/apache/maven) from 3.6.3 to 3.8.4.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](apache/maven@maven-3.6.3...maven-3.8.4)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-compat
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump maven.version from 3.6.3 to 3.8.4

Bumps `maven.version` from 3.6.3 to 3.8.4.

Updates `maven-plugin-api` from 3.6.3 to 3.8.4
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](apache/maven@maven-3.6.3...maven-3.8.4)

Updates `maven-core` from 3.6.3 to 3.8.4
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](apache/maven@maven-3.6.3...maven-3.8.4)

Updates `maven-model` from 3.6.3 to 3.8.4
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](apache/maven@maven-3.6.3...maven-3.8.4)

Updates `maven-artifact` from 3.6.3 to 3.8.4
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](apache/maven@maven-3.6.3...maven-3.8.4)

Updates `maven-settings` from 3.6.3 to 3.8.4
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](apache/maven@maven-3.6.3...maven-3.8.4)

Updates `maven-settings-builder` from 3.6.3 to 3.8.4
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](apache/maven@maven-3.6.3...maven-3.8.4)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-plugin-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-model
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-settings
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-settings-builder
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump slf4j-simple from 1.7.31 to 1.7.32

Bumps [slf4j-simple](https://github.com/qos-ch/slf4j) from 1.7.31 to 1.7.32.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-simple
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump commons-io from 2.10.0 to 2.11.0

Bumps commons-io from 2.10.0 to 2.11.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump assertj-core from 3.17.2 to 3.21.0

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.17.2 to 3.21.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](assertj/assertj@assertj-core-3.17.2...assertj-core-3.21.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump mockito-core from 3.5.15 to 4.1.0

see mockito/mockito-kotlin#383

* Bump maven-project-info-reports-plugin from 3.1.1 to 3.1.2

Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases)
- [Commits](apache/maven-project-info-reports-plugin@maven-project-info-reports-plugin-3.1.1...maven-project-info-reports-plugin-3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump maven-common-artifact-filters from 3.1.0 to 3.2.0

Bumps [maven-common-artifact-filters](https://github.com/apache/maven-common-artifact-filters) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/apache/maven-common-artifact-filters/releases)
- [Commits](apache/maven-common-artifact-filters@maven-common-artifact-filters-3.1.0...maven-common-artifact-filters-3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Run mvn verify instead of only package on Travis

* Remove fixed version of commons-io from Maven plugin dependencies

This doesn't fix https://github.com/vorburger/MariaDB4j/issues/488,
but still seems like a good idea to do, because the currently used
Maven version (or that test dependency) seems to use IO 2.4.1 as
well, so this does not appear to be required anymore now.

* Fix Maven plugin dependencies scope and remove commons-io dependency from Maven plugin (but it's still transitively inherited)

* Use magic <version>@project.version@ in Maven Plugin IT

see https://github.com/vorburger/MariaDB4j/issues/493

* [maven-release-plugin] prepare release mariaDB4j-2.5.0

* [maven-release-plugin] rollback the release of mariaDB4j-2.5.0

* Bump maven-release-plugin from 2.5.3 to 3.0.0-M4

for https://github.com/vorburger/MariaDB4j/issues/495

* [maven-release-plugin] prepare release mariaDB4j-2.5.0

* [maven-release-plugin] rollback the release of mariaDB4j-2.5.0

* [maven-release-plugin] prepare release mariaDB4j-2.5.0

* [maven-release-plugin] prepare for next development iteration

* rm broken Dependabot badge from README

* Fix ClassNotFoundException: commons.io PathUtils in Maven Plugin (fixes MariaDB4j#488)

The shutdown hook can only use classes which are part of the JDK.

* Bump maven-checkstyle-plugin from 3.1.0 to 3.1.2

Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.1.0 to 3.1.2.
- [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases)
- [Commits](apache/maven-checkstyle-plugin@maven-checkstyle-plugin-3.1.0...maven-checkstyle-plugin-3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* (WIP) Prepare for enforcing Checkstyle

Incl. adding dependency to latest Checkstyle v9.2;
see https://maven.apache.org/plugins/maven-checkstyle-plugin/examples/upgrading-checkstyle.html

* Promoted Checkstyle Warnings to Error

Disabled MissingJavaDoc using severity ignore.
Altered RightCurly to alone_or_singleline to allow one line empty implementations.
Fixed missing doublequote in checkstyle.xml
Complied with outstanding checkstyle errors

* Fix Checkstyle violations in (new) class DBShutdownHook

* Make mariaDB4j-maven-plugin expose DB URL as Maven Project property (MariaDB4j#476)

Incl. performing an assert on the added system property in the test.

* Enable Checkstyle for src/test

* When dumping the database, close the outputstream once the dump is done

* Fixing the checkstyle problems

* Spaces in windows paths are no longer replaced by %20

* Replace DB's toWindowsPath() with inline File.getCanonicalFile()

Because following the previous commit, it's no longer Windows specific.

This is backwards compatible because toWindowsPath() was private.

See https://github.com/vorburger/MariaDB4j/issues/501

* Bump ch.vorburger.exec to 3.1.3 (fixes MariaDB4j#501)

for vorburger/ch.vorburger.exec#60
and vorburger/ch.vorburger.exec#58

see https://github.com/vorburger/MariaDB4j/issues/501

* Bump springboot.version from 2.6.0 to 2.6.1

Bumps `springboot.version` from 2.6.0 to 2.6.1.

Updates `spring-boot-dependencies` from 2.6.0 to 2.6.1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.6.0...v2.6.1)

Updates `spring-boot-maven-plugin` from 2.6.0 to 2.6.1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.6.0...v2.6.1)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* [maven-release-plugin] prepare release mariaDB4j-2.5.1

* [maven-release-plugin] prepare for next development iteration

* log4j dependencyManagement 2.15.0 instead of 2.14.1 (MariaDB4j#509)

see https://github.com/vorburger/MariaDB4j/issues/509

* [maven-release-plugin] prepare release mariaDB4j-2.5.2

* [maven-release-plugin] prepare for next development iteration

* Fix failing release due to Checkstyle in generated-sources (fixes MariaDB4j#511)

* [maven-release-plugin] prepare release mariaDB4j-2.5.3

* Update dependencies

* Update pom.xml

Co-authored-by: Michael Vorburger <mike@vorburger.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jenli66 <jens.lidestrom@vgregion.se>
Co-authored-by: jensli <jens@lidestrom.se>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Robin Stevens <73103348+robin-xyzt-ai@users.noreply.github.com>
Co-authored-by: Gordon Little <dev@gordonlittle.co.uk>
Co-authored-by: Robin Stevens <robin.stevens@xyzt.ai>
Co-authored-by: Niklas <niklas-weisss@web.de>
Co-authored-by: Sumer Jabri <sumer@craftercms.org>
  • Loading branch information
11 people authored Jul 20, 2022
1 parent fa584d8 commit 72ac3ac
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 54 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jdk:
# - .mvn

before_install:
- mvn -f DBs/pom.xml clean install
# TODO uncomment this when raising a PR to fix https://github.com/vorburger/MariaDB4j/issues/484
# - mvn -f DBs/pom.xml clean install

# Run verify, not just package, to catch any failures of mariaDB4j-maven-plugin's integration test
script: mvn verify -B -V
4 changes: 2 additions & 2 deletions DBs/mariaDB4j-db-linux64-10.4.20/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom-lite</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<relativePath>../../mariaDB4j-pom-lite/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -46,7 +46,7 @@
</goals>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 1 addition & 1 deletion DBs/mariaDB4j-db-mac64-10.4.20/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom-lite</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<relativePath>../../mariaDB4j-pom-lite/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion DBs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom-lite</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<relativePath>../mariaDB4j-pom-lite/pom.xml</relativePath>
</parent>

Expand Down
18 changes: 9 additions & 9 deletions mariaDB4j-app/pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom</artifactId>
<version>2.5.1</version>
<relativePath>../pom.xml</relativePath>
<version>2.5.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>mariaDB4j-app</artifactId>
Expand Down Expand Up @@ -34,17 +34,17 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.17.1</version>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.1</version>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -70,7 +70,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -86,6 +86,6 @@
<artifactId>spring-boot-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</dependencies>
</project>
2 changes: 1 addition & 1 deletion mariaDB4j-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -30,7 +30,7 @@

/**
* MariaDB4jService extension suitable for use in Spring Framework-based applications.
*
*
* <p>Other than implementing {@link Lifecycle} to get auto-started, this class allows applications
* using it to programmatically set a default port/socket/data- &amp; base directory in their
* {@link Configuration}, yet let end-users override those via the Spring Values mariaDB4j.port,
Expand All @@ -40,7 +40,7 @@
* <p>This Service is intentionally NOT annotated as a {@link Service} {@link Component}, because we
* don't want it to be auto-started by component scan without explicit declaration in a @Configuration
* (or XML)
*
*
* @author Michael Vorburger
*/
public class MariaDB4jSpringService extends MariaDB4jService implements Lifecycle {
Expand Down
26 changes: 7 additions & 19 deletions mariaDB4j-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -14,7 +14,7 @@
<name>mariaDB4j-maven-plugin</name>

<properties>
<maven.version>3.8.4</maven.version>
<maven.version>3.8.6</maven.version>
<skipTests>false</skipTests>
</properties>

Expand Down Expand Up @@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.6.2</version>
<version>3.6.4</version>
</dependency>
<dependency>
<scope>test</scope>
Expand All @@ -146,7 +146,7 @@
<scope>test</scope>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.27</version>
<version>8.0.29</version>
</dependency>
<dependency>
<scope>test</scope>
Expand All @@ -158,7 +158,7 @@
<scope>test</scope>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>3.8.4</version>
<version>3.8.6</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -181,7 +181,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.4</version>
<configuration>
<goalPrefix>mariaDB4j</goalPrefix>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
Expand All @@ -205,18 +205,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>deploy</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!-- Include slf4j-api in the plugin jar to ensure some versions of maven don't have logging issues.
Deprecate when min maven version is 3.3.9+ currently we allow 3.1.1+
Expand Down Expand Up @@ -393,7 +381,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom</artifactId>
<version>2.5.1</version>
<relativePath>../../pom.xml</relativePath>
<version>@project.version@</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>

<artifactId>mariadb4j-maven-plugin-test-basic</artifactId>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
<version>8.0.29</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions mariaDB4j-pom-lite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom-lite</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<packaging>pom</packaging>

<name>MariaDB4j</name>
Expand Down Expand Up @@ -69,7 +69,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down Expand Up @@ -111,7 +111,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.alexecollins.maven.plugin</groupId>
<artifactId>script-maven-plugin</artifactId>
Expand Down Expand Up @@ -142,12 +142,12 @@
}
dirStream.close();
}

File gitRepoRootDir = project.basedir;
while (!new File(gitRepoRootDir, ".git").exists() &amp;&amp; gitRepoRootDir.getParentFile() != null) {
gitRepoRootDir = gitRepoRootDir.getParentFile();
}

File target = new File(project.build.outputDirectory);
target.mkdirs();
copy(gitRepoRootDir, "README*", target);
Expand Down
2 changes: 1 addition & 1 deletion mariaDB4j-springboot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mariaDB4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
13 changes: 7 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom-lite</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<relativePath>mariaDB4j-pom-lite/pom.xml</relativePath>
</parent>

<artifactId>mariaDB4j-pom</artifactId>
<version>2.5.1</version>
<version>2.5.3</version>
<packaging>pom</packaging>

<scm>
Expand Down Expand Up @@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M6</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
Expand Down Expand Up @@ -105,10 +105,12 @@
</dependencies>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<!- https://github.com/vorburger/MariaDB4j/issues/511 ->
<sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>false</failsOnError>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -136,7 +138,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.33</version>
<version>1.7.36</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -146,5 +148,4 @@
</dependency>
</dependencies>
</dependencyManagement>

</project>

0 comments on commit 72ac3ac

Please sign in to comment.