release 2024-09-18-15.12

steveloughran · Sep 18, 2024 · 798a953 · 798a953
1 parent eff6576
commit 798a953
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 40 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -14,14 +14,13 @@
 
 # Building
 
-With maven, with profiles for many different hadoop versions.
+With maven, with profiles for AWS java v1 and v2 SDK.
 
 To build a production release
 1. Use java8
-2. And compile against a shipping hadoop version, with `-Pextra` for the extra stuff
-3. Do not attempt to build the AWS v1 SDK components `-Pextra` against a version of Hadoop
-   built with the AWS V2 SDK. It will fail
-4. If you cut a v2 sdk release, declare it in the release notes.
+2. compile against a shipping hadoop version (see the profiles)
+3. Use with `-Pextra` for the AWS v1 SDK integration
+4. Build with `-Psdk2` for the aws sdk v2.
 
 V1 SDK build
 ```bash

diff --git a/pom.xml b/pom.xml
@@ -233,6 +233,12 @@
       <artifactId>aws-java-sdk-bundle</artifactId>
       <version>1.12.720</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
@@ -270,29 +276,6 @@
 
   <profiles>
 
-    <profile>
-      <id>branch-3.2</id>
-      <activation>
-        <property>
-          <name>branch-3.2</name>
-        </property>
-      </activation>
-      <properties>
-        <hadoop.version>3.2.4-SNAPSHOT</hadoop.version>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>branch-3.1</id>
-      <activation>
-        <property>
-          <name>branch-3.1</name>
-        </property>
-      </activation>
-      <properties>
-        <hadoop.version>3.1.3-SNAPSHOT</hadoop.version>
-      </properties>
-    </profile>
 
     <profile>
       <id>branch-3.3</id>
@@ -306,18 +289,6 @@
       </properties>
     </profile>
 
-    <profile>
-      <id>hadoop-3.2</id>
-      <activation>
-        <property>
-          <name>hadoop-3.2</name>
-        </property>
-      </activation>
-      <properties>
-        <hadoop.version>3.2.4</hadoop.version>
-      </properties>
-    </profile>
-
     <profile>
       <id>hadoop-3.3</id>
       <activation>