Skip to content

Commit

Permalink
Merge pull request #923 from hashmapinc/Tempus-827_java11
Browse files Browse the repository at this point in the history 
Tempus-827: Upgrade tempus to java 11
  • Loading branch information
@akshaymhetre
akshaymhetre committed Dec 12, 2018
2 parents 704e414 + 15c2654 commit 96af27c
Show file tree
Hide file tree
Showing 50 changed files with 509 additions and 263 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pipeline {
agent {
docker {
image 'hashmapinc/tempusbuild:latest'
image 'hashmapinc/tempusbuild:java-11'
args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
}

Expand Down
Binary file added application/lib/gradle-maven-plugin-1.0.11-SNAPSHOT.jar
View file
Binary file not shown.
153 changes: 153 additions & 0 deletions application/lib/gradle-maven-plugin-1.0.11-SNAPSHOT.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>codes.rafael.gradlemavenplugin</groupId>
<artifactId>gradle-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.0.11-SNAPSHOT</version>
<name>gradle-maven-plugin Maven Mojo</name>
<url>https://github.com/LendingClub/gradle-maven-plugin</url>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:raphw/gradle-maven-plugin.git</connection>
<developerConnection>scm:git:git@github.com:raphw/gradle-maven-plugin.git</developerConnection>
<url>git@github.com:raphw/gradle-maven-plugin.git</url>
</scm>
<developers>
<developer>
<id>rob</id>
<name>Rob Schoening</name>
<email>robschoening@gmail.com</email>
</developer>
<developer>
<id>raphw</id>
<name>Rafael Winterhalter</name>
<email>rafael.wth@gmail.com</email>
</developer>
</developers>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
<executions>
<execution>
<id>mojo-descriptor</id>
<goals>
<goal>descriptor</goal>
</goals>
<phase>process-classes</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<release>11</release>
</configuration>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedGroupFilter>org.slf4j</shadedGroupFilter>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.4</version>
<scope>provided</scope>
<!-- annotations are needed only to build the plugin -->
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.3.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.3.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.gradle</groupId>
<artifactId>gradle-tooling-api</artifactId>
<version>4.10.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.0.6</version>
</dependency>
</dependencies>

<repositories>
<repository>
<id>gradle</id>
<url>http://repo.gradle.org/gradle/libs-releases-local/</url>
</repository>
</repositories>

<distributionManagement>
<repository>
<id>bintray</id>
<url>https://api.bintray.com/maven/raphw/maven/gradle-maven-plugin</url>
</repository>
</distributionManagement>
</project>
50 changes: 40 additions & 10 deletions application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,6 @@
<groupId>com.hashmapinc.tempus</groupId>
<artifactId>tempus-spark-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.8</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
<dependency>
<groupId>net.javacrumbs.future-converter</groupId>
<artifactId>future-converter-spring-guava</artifactId>
Expand All @@ -325,9 +318,22 @@
<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
</dependencies>

<build>
<finalName>${pkg.name}-${project.version}</finalName>
<resources>
Expand All @@ -336,6 +342,28 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
<configuration>
<groupId>codes.rafael.gradlemavenplugin</groupId>
<artifactId>gradle-maven-plugin</artifactId>
<version>1.0.11-SNAPSHOT</version>
<packaging>jar</packaging>
<file>${basedir}/lib/gradle-maven-plugin-1.0.11-SNAPSHOT.jar</file>
<pomFile>${basedir}/lib/gradle-maven-plugin-1.0.11-SNAPSHOT.pom</pomFile>
</configuration>
<executions>
<execution>
<id>install-jar-lib</id>
<goals>
<goal>install-file</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -658,9 +686,10 @@
</executions>
</plugin>
<plugin>
<groupId>org.fortasoft</groupId>
<groupId>codes.rafael.gradlemavenplugin</groupId>
<artifactId>gradle-maven-plugin</artifactId>
<configuration>
<gradleVersion>4.10.2</gradleVersion>
<tasks>
<task>build</task>
<task>buildDeb</task>
Expand All @@ -669,7 +698,8 @@
<args>
<arg>-PprojectBuildDir=${project.build.directory}</arg>
<arg>-PprojectVersion=${project.version}</arg>
<arg>-PmainJar=${project.build.directory}/${project.build.finalName}-boot.${project.packaging}</arg>
<arg>-PmainJar=${project.build.directory}/${project.build.finalName}-boot.${project.packaging}
</arg>
<arg>-PpkgName=${pkg.name}</arg>
<arg>-PpkgInstallFolder=${pkg.installFolder}</arg>
<arg>-PpkgLogFolder=${pkg.unixLogFolder}</arg>
Expand Down
Loading

0 comments on commit 96af27c

Please sign in to comment.