From b4b3f794217c779292d066ac611ad203402ddf49 Mon Sep 17 00:00:00 2001
From: Christoph Pirkl <christoph.pirkl@exasol.com>
Date: Thu, 9 Nov 2023 08:06:23 +0100
Subject: [PATCH] Fix extension build order

---
 dependencies.md              |   8 +--
 doc/changes/changes_2.4.3.md |   1 +
 pom.xml                      | 110 +++++++++++++++++------------------
 3 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/dependencies.md b/dependencies.md
index 0f3ab20..76f47da 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -59,8 +59,8 @@
 | [JaCoCo :: Maven Plugin][56]                            | [Eclipse Public License 2.0][33]  |
 | [error-code-crawler-maven-plugin][57]                   | [MIT License][58]                 |
 | [Reproducible Build Maven Plugin][59]                   | [Apache 2.0][43]                  |
-| [Exec Maven Plugin][60]                                 | [Apache License 2][13]            |
-| [Apache Maven Clean Plugin][61]                         | [Apache-2.0][13]                  |
+| [Apache Maven Clean Plugin][60]                         | [Apache-2.0][13]                  |
+| [Exec Maven Plugin][61]                                 | [Apache License 2][13]            |
 
 ## Extension
 
@@ -130,6 +130,6 @@
 [57]: https://github.com/exasol/error-code-crawler-maven-plugin/
 [58]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE
 [59]: http://zlika.github.io/reproducible-build-maven-plugin
-[60]: https://www.mojohaus.org/exec-maven-plugin
-[61]: https://maven.apache.org/plugins/maven-clean-plugin/
+[60]: https://maven.apache.org/plugins/maven-clean-plugin/
+[61]: https://www.mojohaus.org/exec-maven-plugin
 [62]: https://registry.npmjs.org/@exasol/extension-manager-interface/-/extension-manager-interface-0.4.0.tgz
diff --git a/doc/changes/changes_2.4.3.md b/doc/changes/changes_2.4.3.md
index 5be03b2..c3c83b1 100644
--- a/doc/changes/changes_2.4.3.md
+++ b/doc/changes/changes_2.4.3.md
@@ -28,6 +28,7 @@ This release adds integration tests using Exasol 8 and an extension for the Exte
 
 #### Test Dependency Updates
 
+* Updated `com.exasol:exasol-testcontainers:6.6.2` to `6.6.3`
 * Added `com.exasol:extension-manager-integration-test-java:0.5.5`
 * Updated `com.exasol:hamcrest-resultset-matcher:1.6.1` to `1.6.2`
 * Added `com.oracle.database.jdbc:ojdbc8:23.3.0.23.09`
diff --git a/pom.xml b/pom.xml
index cd71f21..f04fe89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>exasol-testcontainers</artifactId>
-            <version>6.6.2</version>
+            <version>6.6.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -139,10 +139,18 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
+                <groupId>org.sonatype.ossindex.maven</groupId>
+                <artifactId>ossindex-maven-plugin</artifactId>
                 <configuration>
-                    <useModulePath>false</useModulePath>
+                    <excludeVulnerabilityIds>
+                        <!-- Transitive test dependency fr.turri:aXMLRPC used by com.exasol:bucketfs-java.
+                        CVE-2020-36641 is reported to be fixed in aXMLRPC 1.12.1. We use version 1.13.0, so this is a false
+                        positive. -->
+                        <exclude>CVE-2020-36641</exclude>
+                        <!-- Transitive test dependency io.netty:netty-handler of software.amazon.awssdk:s3.
+                        We assume that the AWS client's usage of `netty-handler` is not affected by the vulnerability. -->
+                        <exclude>CVE-2023-4586</exclude>
+                    </excludeVulnerabilityIds>
                 </configuration>
             </plugin>
             <plugin>
@@ -164,6 +172,21 @@
                     <finalName>virtual-schema-dist-${vscjdbc.version}-oracle-${project.version}</finalName>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <useModulePath>false</useModulePath>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Fix locale dependent tests in case the OS locale is not English -->
+                    <argLine>-Duser.country=US -Duser.language=en ${argLine}</argLine>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -184,11 +207,35 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.3.2</version>
                 <configuration>
-                    <!-- Fix locale dependent tests in case the OS locale is not English -->
-                    <argLine>-Duser.country=US -Duser.language=en ${argLine}</argLine>
+                    <filesets>
+                        <fileset>
+                            <directory>extension/coverage</directory>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </fileset>
+                        <fileset>
+                            <directory>extension/dist</directory>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </fileset>
+                        <fileset>
+                            <directory>extension/node_modules</directory>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </fileset>
+                        <fileset>
+                            <directory>extension/src</directory>
+                            <includes>
+                                <include>extension-description.ts</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
                 </configuration>
             </plugin>
             <plugin>
@@ -250,53 +297,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.3.2</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>extension/coverage</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </fileset>
-                        <fileset>
-                            <directory>extension/dist</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </fileset>
-                        <fileset>
-                            <directory>extension/node_modules</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </fileset>
-                        <fileset>
-                            <directory>extension/src</directory>
-                            <includes>
-                                <include>extension-description.ts</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.ossindex.maven</groupId>
-                <artifactId>ossindex-maven-plugin</artifactId>
-                <configuration>
-                    <excludeVulnerabilityIds>
-                        <!-- Transitive test dependency fr.turri:aXMLRPC used by com.exasol:bucketfs-java.
-                        CVE-2020-36641 is reported to be fixed in aXMLRPC 1.12.1. We use version 1.13.0, so this is a false
-                        positive. -->
-                        <exclude>CVE-2020-36641</exclude>
-                        <!-- Transitive test dependency io.netty:netty-handler of software.amazon.awssdk:s3.
-                        We assume that the AWS client's usage of `netty-handler` is not affected by the vulnerability. -->
-                        <exclude>CVE-2023-4586</exclude>
-                    </excludeVulnerabilityIds>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     <parent>