Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Commit

Permalink
Add profiles for jdk 1.8 and 11
Browse files Browse the repository at this point in the history 
The jdk8 jars are needed for Android.

Signed-off-by: Boyd Johnson <[email protected]>
  • Loading branch information
Boyd Johnson committed Nov 27, 2018
1 parent d5e6c44 commit 070aa25
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 45 deletions.
55 changes: 54 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>


Expand Down
8 changes: 0 additions & 8 deletions sawtooth-sdk-protos/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 0 additions & 15 deletions sawtooth-sdk-signing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
22 changes: 1 addition & 21 deletions sawtooth-sdk-transaction-processor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</project>

0 comments on commit 070aa25

Please sign in to comment.