Skip to content

Commit

Permalink
#171: Refactored artifact packaging and releasing process for module …
Browse files Browse the repository at this point in the history
…setup (#173)


---------

Co-authored-by: Sebastian Bär <[email protected]>
  • Loading branch information
morazow and redcatbear authored Jun 22, 2023
1 parent 25b364a commit 0cfd23b
Show file tree
Hide file tree
Showing 20 changed files with 1,790 additions and 933 deletions.
21 changes: 11 additions & 10 deletions .project-keeper.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,26 @@
sources:
- type: maven
path: pom.xml
modules:
- maven_central
path: parent-pom/pom.xml
- type: maven
path: exasol-jdbc/pom.xml
modules:
- maven_central
- integration_tests
parentPom:
groupId: "com.exasol"
artifactId: "spark-connector-parent"
artifactId: "spark-connector-parent-pom"
version: "${revision}"
relativePath: "../pom.xml"
relativePath: "../parent-pom/pom.xml"
- type: maven
path: exasol-s3/pom.xml
modules:
- maven_central
- integration_tests
parentPom:
groupId: "com.exasol"
artifactId: "spark-connector-parent"
artifactId: "spark-connector-parent-pom"
version: "${revision}"
relativePath: "../pom.xml"
relativePath: "../parent-pom/pom.xml"
version:
fromSource: pom.xml
fromSource: parent-pom/pom.xml
excludes:
- regex: "(?s)E-PK-CORE-62: The project's README.md does not contain a valid badges block. Please add or replace the following badges:.*"
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build-next-java.yml'"
Expand All @@ -34,6 +30,11 @@ excludes:
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_release_on_maven_central.yml'"
- "E-PK-CORE-18: Outdated content: '.settings/org.eclipse.jdt.core.prefs'"
- regex: "(?s)E-PK-CORE-18: Outdated content: 'exasol-(jdbc|s3)/pk_generated_parent.pom'"
- regex: "(?s)E-PK-CORE-104: Invalid pom file 'exasol-(jdbc|s3)/pom.xml':.*"
- regex: "(?s)E-PK-CORE-118: Invalid pom file 'exasol-(jdbc|s3)/pom.xml':.*"
- "E-PK-CORE-17: Missing required file: '.github/workflows/project-keeper-verify.yml'"
- "E-PK-CORE-17: Missing required file: '.github/workflows/project-keeper.sh'"
linkReplacements:
- https://netty.io/netty-all/|https://netty.io/index.html
- http://nexus.sonatype.org/oss-repository-hosting.html/scalatest-maven-plugin|https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin
Expand Down
325 changes: 152 additions & 173 deletions dependencies.md

Large diffs are not rendered by default.

73 changes: 27 additions & 46 deletions doc/changes/changes_1.5.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,41 +19,31 @@ Code name:
## Refactoring

* #158: Refactored common options class
* #171: Refactored artifact packaging and releasing for module setup

## Dependency Updates

### Spark Exasol Connector Parent Pom

#### Compile Dependency Updates

* Removed `com.exasol:error-reporting-java8:1.0.1`
* Removed `com.exasol:exasol-jdbc:7.1.19`
* Removed `com.exasol:sql-statement-builder-java8:4.5.4`
* Removed `com.fasterxml.woodstox:woodstox-core:6.5.1`
* Removed `com.google.protobuf:protobuf-java:3.22.3`
* Removed `org.apache.commons:commons-text:1.10.0`
* Removed `org.scala-lang:scala-library:2.13.10`

#### Test Dependency Updates

* Removed `com.exasol:exasol-testcontainers:6.5.2`
* Removed `com.exasol:hamcrest-resultset-matcher:1.6.0`
* Removed `com.exasol:test-db-builder-java:3.4.2`
* Removed `org.apache.logging.log4j:log4j-1.2-api:2.20.0`
* Removed `org.apache.logging.log4j:log4j-api:2.20.0`
* Removed `org.apache.logging.log4j:log4j-core:2.20.0`
* Removed `org.mockito:mockito-core:5.3.0`
* Removed `org.scalatestplus:scalatestplus-mockito_2.13:1.0.0-M2`
* Removed `org.scalatest:scalatest_2.13:3.2.9`

#### Plugin Dependency Updates

* Removed `com.diffplug.spotless:spotless-maven-plugin:2.36.0`
* Removed `io.github.evis:scalafix-maven-plugin_2.13:0.1.4_0.9.31`
* Removed `net.alchim31.maven:scala-maven-plugin:4.8.1`
* Removed `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0`
* Removed `org.apache.maven.plugins:maven-resources-plugin:2.6`
* Removed `org.scalatest:scalatest-maven-plugin:2.2.0`
* Added `com.exasol:error-code-crawler-maven-plugin:1.2.3`
* Added `io.github.zlika:reproducible-build-maven-plugin:0.16`
* Added `org.apache.maven.plugins:maven-clean-plugin:2.5`
* Added `org.apache.maven.plugins:maven-compiler-plugin:3.11.0`
* Added `org.apache.maven.plugins:maven-deploy-plugin:3.1.1`
* Added `org.apache.maven.plugins:maven-enforcer-plugin:3.3.0`
* Added `org.apache.maven.plugins:maven-install-plugin:2.4`
* Added `org.apache.maven.plugins:maven-site-plugin:3.3`
* Added `org.apache.maven.plugins:maven-surefire-plugin:3.0.0`
* Added `org.apache.maven.plugins:maven-toolchains-plugin:3.1.0`
* Added `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1`
* Added `org.codehaus.mojo:flatten-maven-plugin:1.4.1`
* Added `org.codehaus.mojo:versions-maven-plugin:2.15.0`
* Added `org.itsallcode:openfasttrace-maven-plugin:1.6.2`
* Added `org.jacoco:jacoco-maven-plugin:0.8.9`
* Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184`
* Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.2.0`

### Spark Exasol Connector With JDBC

Expand All @@ -72,17 +62,15 @@ Code name:
* Added `org.apache.logging.log4j:log4j-1.2-api:2.20.0`
* Added `org.apache.logging.log4j:log4j-api:2.20.0`
* Added `org.apache.logging.log4j:log4j-core:2.20.0`
* Added `org.mockito:mockito-core:5.3.1`
* Added `org.mockito:mockito-junit-jupiter:5.3.1`
* Added `org.mockito:mockito-core:5.4.0`
* Added `org.mockito:mockito-junit-jupiter:5.4.0`
* Added `org.scalatestplus:scalatestplus-mockito_2.13:1.0.0-M2`
* Added `org.scalatest:scalatest_2.13:3.2.9`

#### Plugin Dependency Updates

* Added `com.diffplug.spotless:spotless-maven-plugin:2.37.0`
* Added `com.exasol:artifact-reference-checker-maven-plugin:0.4.2`
* Added `com.exasol:error-code-crawler-maven-plugin:1.2.3`
* Added `com.exasol:project-keeper-maven-plugin:2.9.7`
* Added `io.github.evis:scalafix-maven-plugin_2.13:0.1.4_0.9.31`
* Added `io.github.zlika:reproducible-build-maven-plugin:0.16`
* Added `net.alchim31.maven:scala-maven-plugin:4.8.1`
Expand All @@ -91,15 +79,14 @@ Code name:
* Added `org.apache.maven.plugins:maven-deploy-plugin:3.1.1`
* Added `org.apache.maven.plugins:maven-enforcer-plugin:3.3.0`
* Added `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0`
* Added `org.apache.maven.plugins:maven-gpg-plugin:3.0.1`
* Added `org.apache.maven.plugins:maven-install-plugin:2.4`
* Added `org.apache.maven.plugins:maven-jar-plugin:3.3.0`
* Added `org.apache.maven.plugins:maven-javadoc-plugin:3.5.0`
* Added `org.apache.maven.plugins:maven-resources-plugin:2.6`
* Added `org.apache.maven.plugins:maven-shade-plugin:3.4.1`
* Added `org.apache.maven.plugins:maven-site-plugin:3.3`
* Added `org.apache.maven.plugins:maven-source-plugin:3.2.1`
* Added `org.apache.maven.plugins:maven-surefire-plugin:3.0.0`
* Added `org.apache.maven.plugins:maven-toolchains-plugin:3.1.0`
* Added `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1`
* Added `org.codehaus.mojo:flatten-maven-plugin:1.4.1`
* Added `org.codehaus.mojo:versions-maven-plugin:2.15.0`
Expand All @@ -108,20 +95,19 @@ Code name:
* Added `org.scalatest:scalatest-maven-plugin:2.2.0`
* Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184`
* Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.2.0`
* Added `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13`

### Spark Exasol Connector With S3 Storage Layer
### Spark Exasol Connector With S3

#### Compile Dependency Updates

* Added `com.exasol:spark-connector-common-java:1.0.1`
* Added `org.apache.hadoop:hadoop-aws:3.3.5`
* Added `org.scala-lang:scala-library:2.13.10`
* Added `software.amazon.awssdk:s3:2.20.79`
* Added `org.scala-lang:scala-library:2.13.11`
* Added `software.amazon.awssdk:s3:2.20.90`

#### Test Dependency Updates

* Added `com.amazonaws:aws-java-sdk-s3:1.12.482`
* Added `com.amazonaws:aws-java-sdk-s3:1.12.493`
* Added `com.exasol:exasol-testcontainers:6.6.0`
* Added `com.exasol:hamcrest-resultset-matcher:1.6.0`
* Added `com.exasol:test-db-builder-java:3.4.2`
Expand All @@ -132,29 +118,24 @@ Code name:

#### Plugin Dependency Updates

* Added `com.exasol:artifact-reference-checker-maven-plugin:0.4.2`
* Added `com.exasol:error-code-crawler-maven-plugin:1.2.3`
* Added `com.exasol:project-keeper-maven-plugin:2.9.7`
* Added `io.github.zlika:reproducible-build-maven-plugin:0.16`
* Added `org.apache.maven.plugins:maven-clean-plugin:2.5`
* Added `org.apache.maven.plugins:maven-compiler-plugin:3.11.0`
* Added `org.apache.maven.plugins:maven-deploy-plugin:3.1.1`
* Added `org.apache.maven.plugins:maven-enforcer-plugin:3.3.0`
* Added `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0`
* Added `org.apache.maven.plugins:maven-gpg-plugin:3.0.1`
* Added `org.apache.maven.plugins:maven-install-plugin:2.4`
* Added `org.apache.maven.plugins:maven-jar-plugin:3.3.0`
* Added `org.apache.maven.plugins:maven-javadoc-plugin:3.5.0`
* Added `org.apache.maven.plugins:maven-jar-plugin:2.4`
* Added `org.apache.maven.plugins:maven-resources-plugin:2.6`
* Added `org.apache.maven.plugins:maven-shade-plugin:3.4.1`
* Added `org.apache.maven.plugins:maven-site-plugin:3.3`
* Added `org.apache.maven.plugins:maven-source-plugin:3.2.1`
* Added `org.apache.maven.plugins:maven-surefire-plugin:3.0.0`
* Added `org.apache.maven.plugins:maven-toolchains-plugin:3.1.0`
* Added `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1`
* Added `org.codehaus.mojo:flatten-maven-plugin:1.4.1`
* Added `org.codehaus.mojo:versions-maven-plugin:2.15.0`
* Added `org.itsallcode:openfasttrace-maven-plugin:1.6.2`
* Added `org.jacoco:jacoco-maven-plugin:0.8.9`
* Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184`
* Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.2.0`
* Added `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13`
5 changes: 5 additions & 0 deletions exasol-dist/error_code_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
error-tags:
SEC:
packages:
- com.exasol.spark
highest-index: 26

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions exasol-dist/src/test/resources/logging.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
handlers=java.util.logging.ConsoleHandler
.level=INFO
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
java.util.logging.SimpleFormatter.format=%1$tF %1$tT.%1$tL [%4$-7s] %5$s %n
com.exasol.level=ALL
18 changes: 18 additions & 0 deletions exasol-dist/versionsMavenPluginRules.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" comparisonMethod="maven"
xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
<ignoreVersions>
<!-- Ignore Alpha's, Beta's, release candidates and milestones -->
<ignoreVersion type="regex">(?i).*Alpha(?:-?[\d.]+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*a(?:-?[\d.]+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*Beta(?:-?[\d.]+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*-B(?:-?[\d.]+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*-b(?:-?[\d.]+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*RC(?:-?[\d.]+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*CR(?:-?[\d.]+)?</ignoreVersion>
<ignoreVersion type="regex">(?i).*M(?:-?[\d.]+)?</ignoreVersion>
</ignoreVersions>
<rules>
</rules>
</ruleset>
6 changes: 3 additions & 3 deletions exasol-jdbc/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand Down Expand Up @@ -113,7 +113,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.processAnnotations=enabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
Expand Down
99 changes: 3 additions & 96 deletions exasol-jdbc/pk_generated_parent.pom

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0cfd23b

Please sign in to comment.