Skip to content

Commit

Permalink
Merge branch 'release-1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
charphi committed Jun 3, 2020
2 parents cb3f80f + 0b9ce05 commit dab5c0e
Show file tree
Hide file tree
Showing 20 changed files with 864 additions and 329 deletions.
25 changes: 25 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: 1
update_configs:
- package_manager: "java:maven"
directory: "/"
update_schedule: "daily"
automerged_updates:
- match:
dependency_name: "org.apache.maven.plugins:*"
- match:
dependency_name: "org.codehaus.mojo:*"
- match:
dependency_name: "org.gaul:modernizer-maven-plugin"
- match:
dependency_name: "org.jacoco:jacoco-maven-plugin"
- match:
dependency_name: "org.checkerframework:checker-qual"
- match:
dependency_name: "org.assertj:assertj-core"
- match:
dependency_name: "org.openjdk.jmh:*"
- match:
dependency_name: "com.akathist.maven.plugins.launch4j:launch4j-maven-plugin"
- match:
dependency_name: "net.nicoulaj.maven.plugins:checksum-maven-plugin"

47 changes: 35 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,49 @@
dist: xenial
language: java
jdk:
- oraclejdk8
- openjdk8
- openjdk11
- openjdk-ea

cache:
directories:
- $HOME/.m2
matrix:
allow_failures:
- jdk: openjdk-ea

env:
global:
- DEPLOY_JDK=openjdk11
- DEPLOY_REPO=nbbrd/java-net-proxy

deploy:
# SNAPSHOTS from develop & jdk8
# Maven snapshots from develop branch
- provider: script
script: mvn deploy -Dmaven.test.skip -s .travis.settings.xml -P deploy-snapshots
skip_cleanup: true
on:
branch: develop
jdk: oraclejdk8
condition: $TRAVIS_PULL_REQUEST = "false"

# RELEASES from master & jdk8
tags: false
repo: "${DEPLOY_REPO}"
condition: $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_JDK_VERSION == $DEPLOY_JDK

# Maven releases from tags
- provider: script
script: mvn deploy -Dmaven.test.skip -s .travis.settings.xml -P deploy-releases
skip_cleanup: true
on:
branch: master
jdk: oraclejdk8
condition: $TRAVIS_PULL_REQUEST = "false"
tags: true
repo: "${DEPLOY_REPO}"
condition: $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_JDK_VERSION == $DEPLOY_JDK

# Github releases from tags
- provider: releases
api_key: "${GITHUB_KEY}"
skip_cleanup: true
draft: true
on:
tags: true
repo: "${DEPLOY_REPO}"
condition: $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_JDK_VERSION == $DEPLOY_JDK

cache:
directories:
- $HOME/.m2
Loading

0 comments on commit dab5c0e

Please sign in to comment.