Merge pull request #14 from exasol/enhamcement/13_add_ossindex_and_ve…

…rsions_maven_plugins Added ossindex and versions maven plugins, updated dependencies
exasol · Jul 6, 2020 · 51f9206 · 51f9206
2 parents 591f815 + f1e4224
commit 51f9206
Show file tree

Hide file tree

Showing 7 changed files with 163 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Exasol Virtual Schema 
 
 [![Build Status](https://travis-ci.com/exasol/exasol-virtual-schema.svg?branch=master)](https://travis-ci.com/exasol/exasol-virtual-schema)
+[![Maven Central](https://img.shields.io/maven-central/v/com.exasol/exasol-virtual-schema)](https://search.maven.org/artifact/com.exasol/exasol-virtual-schema)
 
 SonarCloud results:
 
@@ -28,42 +29,58 @@ This projects contains the Exasol dialect for [Exasol's Virtual Schema][virtual-
 
 * [Exasol dialect](doc/dialects/exasol.md)
 * [User guide][user-guide]
+* [Changelog](doc/changes/changelog.md)
 
 Find all the documentation in the [Virtual Schemas project][vs-doc].
 
 ### Run Time Dependencies
 
 Running the Virtual Schema requires a Java Runtime version 11 or later.
 
-| Dependency                                                                          | Purpose                                                | License                       |
-|-------------------------------------------------------------------------------------|--------------------------------------------------------|-------------------------------|
-| [Exasol Virtual Schema JDBC](https://github.com/exasol/virtual-schema-common-jdbc)  | Common JDBC functions for Virtual Schemas adapters     | MIT License                   |
-| [Exasol JDBC Driver](https://www.exasol.com/portal/display/DOWNLOAD/Exasol+Download+Section)  | JDBC driver for Exasol database              | MIT License                   |
+| Dependency                                                         | Purpose                                                | License                       |
+|--------------------------------------------------------------------|--------------------------------------------------------|-------------------------------|
+| [Exasol Virtual Schema JDBC][virtual-schema-common-jdbc]           | Common JDBC functions for Virtual Schemas adapters     | MIT License                   |
+| [Exasol JDBC Driver][exasol-jdbc-driver]                           | JDBC driver for Exasol database              | MIT License                   |
 
 ### Test Dependencies
 
-| Dependency                                                                          | Purpose                                                | License                       |
-|-------------------------------------------------------------------------------------|--------------------------------------------------------|-------------------------------|
-| [Java Hamcrest](http://hamcrest.org/JavaHamcrest/)                                  | Checking for conditions in code via matchers           | BSD License                   |
-| [JUnit](https://junit.org/junit5)                                                   | Unit testing framework                                 | Eclipse Public License 1.0    |
-| [Mockito](http://site.mockito.org/)                                                 | Mocking framework                                      | MIT License                   |
-| [Testcontainers](https://www.testcontainers.org/)                                   | Container-based integration tests                      | MIT License                   |
-| [SLF4J](http://www.slf4j.org/)                                                      | Logging facade                                         | MIT License                   |
+| Dependency                                                         | Purpose                                                | License                       |
+|--------------------------------------------------------------------|--------------------------------------------------------|-------------------------------|
+| [Java Hamcrest](http://hamcrest.org/JavaHamcrest/)                 | Checking for conditions in code via matchers           | BSD License                   |
+| [JUnit](https://junit.org/junit5)                                  | Unit testing framework                                 | Eclipse Public License 1.0    |
+| [Mockito](http://site.mockito.org/)                                | Mocking framework                                      | MIT License                   |
+| [Testcontainers](https://www.testcontainers.org/)                  | Container-based integration tests                      | MIT License                   |
+| [SLF4J](http://www.slf4j.org/)                                     | Logging facade                                         | MIT License                   |
 
 
 ### Maven Plug-ins
 
-| Plug-in                                                                             | Purpose                                                | License                       |
-|-------------------------------------------------------------------------------------|--------------------------------------------------------|-------------------------------|
-| [Maven Compiler Plugin](https://maven.apache.org/plugins/maven-compiler-plugin/)    | Setting required Java version                          | Apache License 2.0            |
-| [Maven Exec Plugin](https://www.mojohaus.org/exec-maven-plugin/)                    | Executing external applications                        | Apache License 2.0            |
-| [Maven GPG Plugin](https://maven.apache.org/plugins/maven-gpg-plugin/)              | Code signing                                           | Apache License 2.0            |
-| [Maven Failsafe Plugin](https://maven.apache.org/surefire/maven-surefire-plugin/)   | Integration testing                                    | Apache License 2.0            |
-| [Maven Javadoc Plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/)      | Creating a Javadoc JAR                                 | Apache License 2.0            |
-| [Maven Jacoco Plugin](https://www.eclemma.org/jacoco/trunk/doc/maven.html)          | Code coverage metering                                 | Eclipse Public License 2.0    |
-| [Maven Source Plugin](https://maven.apache.org/plugins/maven-source-plugin/)        | Creating a source code JAR                             | Apache License 2.0            |
-| [Maven Surefire Plugin](https://maven.apache.org/surefire/maven-surefire-plugin/)   | Unit testing                                           | Apache License 2.0            |
-
+| Plug-in                                                            | Purpose                                                | License                       |
+|--------------------------------------------------------------------|--------------------------------------------------------|-------------------------------|
+| [Maven Compiler Plugin][maven-compiler-plugin]                     | Setting required Java version                          | Apache License 2.0            |
+| [Maven Exec Plugin](https://www.mojohaus.org/exec-maven-plugin/)   | Executing external applications                        | Apache License 2.0            |
+| [Maven Enforcer Plugin][maven-enforcer-plugin]                     | Controlling environment constants                      | Apache License 2.0            |
+| [Maven GPG Plugin][maven-gpg-plugin]                               | Code signing                                           | Apache License 2.0            |
+| [Maven Failsafe Plugin][maven-failsafe-plugin]                     | Integration testing                                    | Apache License 2.0            |
+| [Maven Javadoc Plugin][maven-javadoc-plugin]                       | Creating a Javadoc JAR                                 | Apache License 2.0            |
+| [Maven Jacoco Plugin][maven-jacoco-plugin]                         | Code coverage metering                                 | Eclipse Public License 2.0    |
+| [Maven Source Plugin][maven-source-plugin]                         | Creating a source code JAR                             | Apache License 2.0            |
+| [Maven Surefire Plugin][maven-surefire-plugin]                     | Unit testing                                           | Apache License 2.0            |
+| [Sonatype OSS Index Maven Plugin][sonatype-oss-index-maven-plugin] | Checking Dependencies Vulnerability                    | ASL2                          |
+| [Versions Maven Plugin][versions-maven-plugin]                     | Checking if dependencies updates are available         | Apache License 2.0            |
+
+[exasol-jdbc-driver]: https://www.exasol.com/portal/display/DOWNLOAD/Exasol+Download+Section
+[maven-compiler-plugin]: https://maven.apache.org/plugins/maven-compiler-plugin/
+[maven-enforcer-plugin]: http://maven.apache.org/enforcer/maven-enforcer-plugin/
+[maven-gpg-plugin]: https://maven.apache.org/plugins/maven-gpg-plugin/
+[maven-failsafe-plugin]: https://maven.apache.org/surefire/maven-failsafe-plugin/
+[maven-javadoc-plugin]: https://maven.apache.org/plugins/maven-javadoc-plugin/
+[maven-jacoco-plugin]: https://www.eclemma.org/jacoco/trunk/doc/maven.html
+[maven-source-plugin]: https://maven.apache.org/plugins/maven-source-plugin/
+[maven-surefire-plugin]: https://maven.apache.org/surefire/maven-surefire-plugin/
+[sonatype-oss-index-maven-plugin]: https://sonatype.github.io/ossindex-maven/maven-plugin/
 [user-guide]: https://github.com/exasol/virtual-schemas/blob/master/doc/user-guide/user_guide.md#using-the-adapter
+[versions-maven-plugin]: https://www.mojohaus.org/versions-maven-plugin/
 [virtual-schemas]: https://github.com/exasol/virtual-schemas
+[virtual-schema-common-jdbc]:https://github.com/exasol/virtual-schema-common-jdbc
 [vs-doc]: https://github.com/exasol/virtual-schemas/tree/master/doc
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
@@ -0,0 +1,3 @@
+# Changes
+
+* [3.0.2](changes-3.0.2.md)
diff --git a/doc/changes/changes-3.0.2.md b/doc/changes/changes-3.0.2.md
@@ -0,0 +1,20 @@
+# Exasol Virtual Schema Common 3.0.2, released 2020-07-06
+
+## Features / Enhancements
+
+* #13: Added ossindex-maven-plugin and versions-maven-plugin, updated dependencies.
+
+## Dependency updates
+
+* Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.1.0`
+* Added `org.codehaus.mojo:versions-maven-plugin:2.7`
+* Added `org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3`
+* Updated `org.apache.maven.plugins:maven-assembly-plugin` from 3.2.0 to 3.3.0
+* Updated `org.apache.maven.plugins:maven-javadoc-plugin` from 3.0.1 to 3.2.0
+* Updated `com.exasol:exasol-testcontainers` from 2.0.0 to 2.0.3
+* Updated `com.exasol:hamcrest-resultset-matcher` from 0.1.0 to 1.1.1
+* Updated ` com.exasol:virtual-schema-common-jdbc` from 5.0.1 to 5.0.2
+* Updated `org.junit.jupiter:junit-jupiter-engine` from 5.6.1 to 5.6.2
+* Updated `org.junit.jupiter:junit-jupiter-params` from 5.6.1 to 5.6.2
+* Updated `org.junit.platform:junit-platform-runner` from 1.6.1 to 1.6.2
+* Updated `org.testcontainers:junit-jupiter` from 1.13.0 to 1.14.3
diff --git a/doc/dialects/exasol.md b/doc/dialects/exasol.md
@@ -18,7 +18,7 @@ The SQL statement below creates the adapter script, defines the Java class that
 ```sql
 CREATE JAVA ADAPTER SCRIPT SCHEMA_FOR_VS_SCRIPT.ADAPTER_SCRIPT_EXASOL AS
     %scriptclass com.exasol.adapter.RequestDispatcher;
-    %jar /buckets/<BFS service>/<bucket>/exasol-virtual-schema-dist-3.0.1.jar;
+    %jar /buckets/<BFS service>/<bucket>/virtual-schema-dist-5.0.2-exasol-3.0.2.jar;
 /
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -4,19 +4,18 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.exasol</groupId>
     <artifactId>exasol-virtual-schema</artifactId>
-    <version>${product.version}</version>
+    <version>3.0.2</version>
     <name>Exasol Virtual Schema</name>
     <description>This projects contains the Exasol dialect for Exasol's Virtual Schema</description>
     <url>https://github.com/exasol/exasol-virtual-schema</url>
     <properties>
-        <product.version>3.0.1</product.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>11</java.version>
-        <junit.version>5.6.1</junit.version>
-        <junit.platform.version>1.6.1</junit.platform.version>
+        <junit.version>5.6.2</junit.version>
+        <junit.platform.version>1.6.2</junit.platform.version>
         <surefire.and.failsafe.plugin.version>3.0.0-M4</surefire.and.failsafe.plugin.version>
-        <vscjdbc.version>5.0.1</vscjdbc.version>
+        <vscjdbc.version>5.0.2</vscjdbc.version>
         <sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
         <gpg.skip>true</gpg.skip>
@@ -81,13 +80,13 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>exasol-testcontainers</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.13.0</version>
+            <version>1.14.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -106,7 +105,7 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>hamcrest-resultset-matcher</artifactId>
-            <version>0.1.0</version>
+            <version>1.1.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -198,12 +197,12 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/assembly/all-dependencies.xml</descriptor>
                     </descriptors>
-                    <finalName>virtual-schema-dist-${vscjdbc.version}-exasol-${product.version}</finalName>
+                    <finalName>virtual-schema-dist-${vscjdbc.version}-exasol-${version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
@@ -283,6 +282,53 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.sonatype.ossindex.maven</groupId>
+                <artifactId>ossindex-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>audit</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.7</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>display-plugin-updates</goal>
+                            <goal>display-dependency-updates</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.3.9</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>

diff --git a/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectIT.java b/src/test/java/com/exasol/adapter/dialects/exasol/ExasolSqlDialectIT.java
@@ -34,7 +34,7 @@
 @Testcontainers
 class ExasolSqlDialectIT {
     private static final Logger LOGGER = LoggerFactory.getLogger(ExasolSqlDialectIT.class);
-    private static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "exasol-virtual-schema-dist-3.0.1.jar";
+    private static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-5.0.2-exasol-3.0.2.jar";
     private static final Path PATH_TO_VIRTUAL_SCHEMAS_JAR = Path.of("target", VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION);
     private static final String SCHEMA_EXASOL = "SCHEMA_EXASOL";
     private static final String ADAPTER_SCRIPT_EXASOL = "ADAPTER_SCRIPT_EXASOL";