Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
csowada committed Dec 17, 2020
2 parents 56b2b56 + 763c219 commit 88c7187
Show file tree
Hide file tree
Showing 22 changed files with 357 additions and 197 deletions.
3 changes: 3 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="annotationpath" value="/ebus configuration/annotations"/>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="annotationpath" value="/ebus configuration/annotations"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand Down
76 changes: 76 additions & 0 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path

name: Maven Package

on:
push:
# Sequence of patterns matched against refs/tags
tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Use Cache for Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Import GPG keys
run: 'echo -e "$GPG_FILE" | gpg2 --import --no-tty --batch --yes'
shell: bash
env:
GPG_FILE: ${{secrets.GPG_FILE}}

- name: Set up Java for Apache Maven Central
uses: actions/setup-java@v1
with:
java-version: 11
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
server-username: OSSRH_USERNAME # env variable for username in deploy
server-password: OSSRH_PASSWORD # env variable for token in deploy
gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Build and Verify with Maven
run: mvn --batch-mode --update-snapshots clean compile verify

- name: Publish to Apache Maven Central
# run: mvn deploy --batch-mode --update-snapshots -P sign,!build-extras -Dmaven.test.skip=true
run: mvn deploy --batch-mode --update-snapshots -P sign,!build-extras,deploy-ossrh -Dmaven.test.skip=true
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

- name: Set up Java for publishing to GitHub Packages
uses: actions/setup-java@v1
with:
java-version: 11

- name: Publish to GitHub Packages
# -DaltDeploymentRepository=github::default::https://maven.pkg.github.com/csowada/ebus
run: mvn deploy --batch-mode --update-snapshots -P !sign,!build-extras,!deploy-ossrh,deploy-github -Dmaven.test.skip=true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create GitGub Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body: |
Changes in this Release
draft: true
prerelease: false
54 changes: 54 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Java CI with Maven

on:
push:
branches: [ master, develop ]
pull_request:
types: [opened, synchronize, reopened]

jobs:

build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Cache SonarCloud packages
uses: actions/cache@v2
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar

- name: Set up Java
uses: actions/setup-java@v1
with:
java-version: 11

- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar

- run: mkdir staging && cp target/*.jar staging

- name: Upload Maven build artifact
uses: actions/upload-artifact@v1
with:
name: artifact
path: staging
48 changes: 0 additions & 48 deletions .travis.settings.xml

This file was deleted.

34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions annotations/java/util/Collections.eea
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class java/util/Collections
emptyList
<T:Ljava/lang/Object;>()Ljava/util/List<TT;>;
<T:Ljava/lang/Object;>()L1java/util/List<T1T;>;
4 changes: 4 additions & 0 deletions annotations/org/slf4j/LoggerFactory.eea
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class org/slf4j/LoggerFactory
getLogger
(Ljava/lang/Class<*>;)Lorg/slf4j/Logger;
(Ljava/lang/Class<*>;)L1org/slf4j/Logger;
7 changes: 0 additions & 7 deletions cd/before-deploy.sh

This file was deleted.

Binary file removed cd/codesigning.asc.enc
Binary file not shown.
6 changes: 0 additions & 6 deletions cd/deploy.sh

This file was deleted.

28 changes: 0 additions & 28 deletions cd/mvnsettings.xml

This file was deleted.

Loading

0 comments on commit 88c7187

Please sign in to comment.