Skip to content

Commit

Permalink
Merge pull request #6 from Workiva/release-1.1.2-1
Browse files Browse the repository at this point in the history
RM-142416 Release 1.1.2-1
  • Loading branch information
rmconsole5-wk authored Jun 6, 2022
2 parents 50acc65 + b220a4e commit 4a41f96
Show file tree
Hide file tree
Showing 13 changed files with 295 additions and 150 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.git/
.gitignore
.dockerignore
.idea/
*/build/
*/out/
20 changes: 20 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## Purpose

Brief description of the purpose of this change.

## Solution

High level overview of what was done. This is the roadmap for those who are going to CR.

## Semantic Versioning (check one)

- [ ] The following were changed in a non-backward compatible way and requires a major version bump:
- *[link to the breaking change in the diff]*
- [ ] Something public was added or changed in backward compatible way, this requires a minor version bump
- [ ] No public changes nor new features (backwards-compatible refactor or bug fix), so this can be included in a patch
release

## How to QA

- [ ] run the following related examples: **(fill in)**
- [ ] Other necessary steps needed to fully exercise the solution should be added here. **(fill in)**
20 changes: 20 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 2
registries:
maven-repository-workivaeast-jfrog-io-workivaeast-maven-prod:
type: maven-repository
url: https://workivaeast.jfrog.io/workivaeast/maven-prod
username: "${{secrets.WORKIVA_ARTIFACTORY_JFROG_USERNAME}}"
password: "${{secrets.WORKIVA_ARTIFACTORY_JFROG_PASSWORD}}"

updates:
- package-ecosystem: "gradle"
directory: "/"
registries:
- maven-repository-workivaeast-jfrog-io-workivaeast-maven-prod
schedule:
interval: "weekly"
day: sunday
commit-message:
prefix: fix
prefix-development: chore
include: scope
28 changes: 28 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM amazoncorretto:8 AS build
WORKDIR /build

RUN yum install tar gzip -y

COPY settings.gradle build.gradle gradlew ./
COPY gradle gradle

# run to pull down the gradle wrapper and cache that on its own layer
RUN ./gradlew --version

COPY . .

ARG GIT_BRANCH
ARG GIT_TAG

# Build the application.
#
RUN ./scripts/build.sh
# Collect assembled jar for publishing
ARG BUILD_ARTIFACTS_JAVA=/build/build/libs/*.jar

# Generate Veracode Artifact
RUN tar -cvzf /java.tar.gz /build/build/libs/
ARG BUILD_ARTIFACTS_VERACODE=/java.tar.gz

# We only care about publishing a jar
FROM scratch
1 change: 1 addition & 0 deletions aviary.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version: 1
36 changes: 12 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,15 @@ apply plugin: 'maven-publish'
apply plugin: 'java-library'

repositories {
mavenLocal()
maven {
url = 'https://oss.sonatype.org/content/repositories/snapshots'
}

maven {
url = 'http://repo.maven.apache.org/maven2'
}
mavenCentral()
}

//java {
// withSourcesJar()
//}

dependencies {
testCompile 'junit:junit:4.11'
testCompile 'org.assertj:assertj-core:2.0.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.22.0'
}

group ARTIFACT_PACKAGE
version ARTIFACT_VERSION
description = 'Flip Tables'
sourceCompatibility = '1.8'

Expand All @@ -44,21 +32,21 @@ publishing {
mavenJava(MavenPublication) {
groupId = ARTIFACT_PACKAGE
artifactId = ARTIFACT_NAME
version = ARTIFACT_VERSION
from components.java
}
}
repositories {
maven {
url = "https://maven.pkg.github.com/${COMPANY}/${REPOSITORY_NAME}"
credentials {
username = System.getenv("GITHUB_USERNAME")
password = System.getenv("GITHUB_TOKEN")
pom {
name = ARTIFACT_NAME
}
}
}
}

jar {
into("META-INF/maven/$project.group/$project.name") {
from { generatePomFileForMavenJavaPublication }
rename ".*", "pom.xml"
}
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARTIFACT_VERSION=1.1.2-onecloud
version=1.0.0-SNAPSHOT
ARTIFACT_NAME=flip-tables
ARTIFACT_PACKAGE=com.jakewharton.fliptables
ARTIFACT_PACKAGING=jar
Expand Down
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 4a41f96

Please sign in to comment.