Skip to content

Commit

Permalink
[5141] [mariadb4j] Upgrade to latest (#27)
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

* Upgrade MariaDB4J

* Upgrade log4j

* Upgrade log4j

Co-authored-by: Sumer Jabri <sumer@craftercms.org>
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>
  • Loading branch information
11 people committed Dec 21, 2021
1 parent 914823c commit 75368e0
Show file tree
Hide file tree
Showing 48 changed files with 710 additions and 367 deletions.
26 changes: 26 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
version: 2
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: weekly
day: sunday
time: "04:00"
open-pull-requests-limit: 99
ignore:
- dependency-name: mysql:mysql-connector-java
versions:
- 8.0.23
- dependency-name: org.mockito:mockito-core
versions:
- 3.7.7
- 3.8.0
- dependency-name: org.apache.maven.shared:maven-common-artifact-filters
versions:
- 3.1.1
- dependency-name: org.assertj:assertj-core
versions:
- 3.18.1
- dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin
versions:
- 3.1.1
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jdk:
before_install:
- mvn -f DBs/pom.xml clean install

# https://github.com/vorburger/MariaDB4j/issues/208
script: mvn install -B -V
# Run verify, not just package, to catch any failures of mariaDB4j-maven-plugin's integration test
script: mvn verify -B -V
2 changes: 1 addition & 1 deletion 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.4.10</version>
<version>2.5.1</version>
<relativePath>../../mariaDB4j-pom-lite/pom.xml</relativePath>
</parent>

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.4.10</version>
<version>2.5.1</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.4.10</version>
<version>2.5.1</version>
<relativePath>../mariaDB4j-pom-lite/pom.xml</relativePath>
</parent>

Expand Down
46 changes: 45 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ If you are using this project, consider [supporting it :heart: by donating via P
[![Javadocs](http://www.javadoc.io/badge/ch.vorburger.mariaDB4j/mariaDB4j-core.svg)](http://www.javadoc.io/doc/ch.vorburger.mariaDB4j/mariaDB4j-core)
[![JitPack](https://jitpack.io/v/vorburger/MariaDB4j.svg)](https://jitpack.io/#vorburger/MariaDB4j)
[![Build Status](https://secure.travis-ci.org/vorburger/MariaDB4j.png?branch=master)](http://travis-ci.org/vorburger/MariaDB4j/)
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=vorburger/MariaDB4j)](https://dependabot.com)


How? (Java)
Expand Down Expand Up @@ -157,6 +156,51 @@ helpful tool for launching MariaDB from Java.

See pom and integration test in https://github.com/vorburger/MariaDB4j/tree/mariaDB4j-maven-plugin/mariaDB4j-maven-plugin/src/it/mariadb4j-maven-plugin-test-basic for usage example.

#### Example usage

An example usage of this plugin is to install and start a database at the start of the integration test phase, and stop and uninstall the database afterwards.

This is done by configuring the plugin to execute the `start` goal in the `pre-integration-test` phase and the `stop` goal in the `post-integration-test` phase:

```xml
<plugin>
<groupId>ch.vorburger.mariaDB4j</groupId>
<artifactId>mariaDB4j-maven-plugin</artifactId>
...
<executions>
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
```

This will ensure there is a MariaDB instance running on a random port, and expose the database URL as a Maven Project property.

To access the database in your integration tests, you can pass the database URL as system property to your integration tests:

```xml
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
...
<configuration>
<systemProperties>
<mariadb.databaseurl>${mariadb4j.databaseurl}</mariadb.databaseurl>
</systemProperties>
</configuration>
</plugin>
```

#### How to upgrade the maven plugin from mike10004 version to this version

To upgrade from mike10004 to vorbuger version please change
Expand Down
35 changes: 16 additions & 19 deletions checkstyle.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<!--
This configuration file was written by the eclipse-cs plugin configuration editor
-->
<!--
Checkstyle-Configuration: Michael Vorburger's Checkstyle Checks
Description:
http://www.vorburger.ch
Checkstyle-Configuration: Michael Vorburger's <http://www.vorburger.ch> Checkstyle Checks
-->
<module name="Checker">
<property name="severity" value="warning"/>
<property name="severity" value="error"/>
<property name="charset" value="UTF-8"/>
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
Expand All @@ -24,10 +18,6 @@ http://www.vorburger.ch
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
<module name="LineLength">
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
<property name="max" value="140"/>
</module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
Expand All @@ -39,9 +29,8 @@ http://www.vorburger.ch
<property name="tokens" value="LITERAL_DO,LITERAL_FOR,LITERAL_WHILE"/>
</module>
<module name="LeftCurly"/>
<module name="RightCurly"/>
<module name="RightCurly">
<property name="option" value="alone"/>
<property name="option" value="alone_or_singleline"/>
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
</module>
<module name="WhitespaceAround">
Expand Down Expand Up @@ -118,6 +107,7 @@ http://www.vorburger.ch
<module name="VariableDeclarationUsageDistance"/>
<module name="CustomImportOrder">
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
</module>
<module name="MethodParamPad"/>
<module name="OperatorWrap">
Expand All @@ -140,15 +130,18 @@ http://www.vorburger.ch
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
</module>
<module name="JavadocMethod">
<module name="JavadocStyle">
<property name="scope" value="nothing"/>
</module>
<module name="MissingJavadocMethod">
<!-- @TODO Find time to re-enable this check and provide meaningful Javadocs -->
<property name="severity" value="ignore"/>
<property name="minLineCount" value="2"/>
</module>
<module name="JavadocMethod">
<property name="allowedAnnotations" value="Override, Test"/>
<property name="scope" value="nothing"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="suppressLoadErrors" value="true"/>
</module>
<module name="MethodName">
<property name="format" value="^_?[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
Expand All @@ -159,6 +152,10 @@ http://www.vorburger.ch
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
</module>
</module>
<module name="LineLength">
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
<property name="max" value="140"/>
</module>
<module name="FileTabCharacter">
<property name="severity" value="error"/>
<property name="eachLine" value="true"/>
Expand Down
22 changes: 21 additions & 1 deletion mariaDB4j-app/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.4.10</version>
<version>2.5.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -36,10 +36,30 @@
</build>

<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mariaDB4j-springboot</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static void main(String[] args) throws Exception {
app.setBannerMode(Mode.OFF);
app.run(args);

while(true) { }
while (true) { }
}

@Override
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 @@ -21,20 +21,17 @@

import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;

import ch.vorburger.mariadb4j.springframework.boot.MariaDB4jApplication;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import ch.vorburger.mariadb4j.springframework.boot.MariaDB4jApplication;

@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = MariaDB4jApplication.class, webEnvironment = NONE)
public class MariaDB4jApplicationTest {

@Test
public void testMariaDB4jApplication() {
@Test public void testMariaDB4jApplication() {
// We don't actually have to write anything here
}

}
25 changes: 23 additions & 2 deletions mariaDB4j-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,25 @@
<parent>
<groupId>org.craftercms.mariaDB4j</groupId>
<artifactId>mariaDB4j-pom</artifactId>
<version>2.4.10</version>
<version>2.5.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>mariaDB4j-core</artifactId>

<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>ch.vorburger.exec</groupId>
<artifactId>exec</artifactId>
<version>3.1.1</version>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -59,4 +63,21 @@

</dependencies>


<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>ch.vorburger.mariadb4j</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit 75368e0

Please sign in to comment.