From 070aa2553010eb72d2b9da6a0b26874bb03fa7d7 Mon Sep 17 00:00:00 2001
From: Boyd Johnson <bjohnson@bitwise.io>
Date: Tue, 27 Nov 2018 10:17:01 -0600
Subject: [PATCH] Add profiles for jdk 1.8 and 11

The jdk8 jars are needed for Android.

Signed-off-by: Boyd Johnson <bjohnson@bitwise.io>
---
 pom.xml                                    | 55 +++++++++++++++++++++-
 sawtooth-sdk-protos/pom.xml                |  8 ----
 sawtooth-sdk-signing/pom.xml               | 15 ------
 sawtooth-sdk-transaction-processor/pom.xml | 22 +--------
 4 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2df77eac0..e39c30966 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,6 @@
         <protobuf.version>3.6.1</protobuf.version>
         <checkstyle.path>../checkstyle.xml</checkstyle.path>
         <maven.compiler.plugin.version>3.7.0</maven.compiler.plugin.version>
-        <jdk.version>11</jdk.version>
     </properties>
 
     <distributionManagement>
@@ -135,6 +134,60 @@
 
             </build>
         </profile>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>${maven.compiler.plugin.version}</version>
+                        <configuration>
+                            <release>11</release>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.ow2.asm</groupId>
+                                <artifactId>asm</artifactId>
+                                <version>6.2</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <finalName>${project.artifactId}</finalName>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <classifier>jdk8</classifier>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>${maven.compiler.plugin.version}</version>
+                        <configuration>
+                            <source>1.8</source>
+                            <target>1.8</target>
+                            <testSource>1.8</testSource>
+                            <testTarget>1.8</testTarget>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 
diff --git a/sawtooth-sdk-protos/pom.xml b/sawtooth-sdk-protos/pom.xml
index 13e030706..e771e3a45 100644
--- a/sawtooth-sdk-protos/pom.xml
+++ b/sawtooth-sdk-protos/pom.xml
@@ -83,14 +83,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.compiler.plugin.version}</version>
-                <configuration>
-                    <release>${jdk.version}</release>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
diff --git a/sawtooth-sdk-signing/pom.xml b/sawtooth-sdk-signing/pom.xml
index ff0cf7a08..8ec7e153d 100644
--- a/sawtooth-sdk-signing/pom.xml
+++ b/sawtooth-sdk-signing/pom.xml
@@ -89,21 +89,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.compiler.plugin.version}</version>
-                <configuration>
-                    <release>${jdk.version}</release>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>6.2</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/sawtooth-sdk-transaction-processor/pom.xml b/sawtooth-sdk-transaction-processor/pom.xml
index 3345c987b..d96742d8a 100644
--- a/sawtooth-sdk-transaction-processor/pom.xml
+++ b/sawtooth-sdk-transaction-processor/pom.xml
@@ -62,24 +62,4 @@
             <version>2.3.1</version>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.compiler.plugin.version}</version>
-                <configuration>
-                    <release>${jdk.version}</release>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>6.2</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
+</project>