Skip to content
This repository has been archived by the owner on Jan 11, 2018. It is now read-only.

Commit

Permalink
[gradle] upgrade to travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
pkriens committed Jun 8, 2016
1 parent 5c5f34a commit 7eedb9b
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 14 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ install:
- ./gradlew --version

script:
- ./gradlew --continue release
- ./gradlew --continue build
- export BRANCH=`git rev-parse --abbrev-ref HEAD`
- if [ $BRANCH == "master" -a -n $OSGI_NEXUS_SETTING ]; then ./gradlew --info --continue release; fi


env:
- secure: "U43zbnrgmxZm2O9RtRiy69HfREkQxW3DjKMrCdyLeqTaVHDDpfnQ14TgACXO8WqTTFzxicRAgK9eVkPx8pVmI8B5ynYh1seGsqLoxtw5pzVMbqK2gp41M7wNMuPUtF0+RCuWiT6VEw4aKD7tfdYHZNiVL77LfopmtMHeeMJj3yI="

cache:
directories:
Expand Down
21 changes: 17 additions & 4 deletions cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
copyright.year = ${tstamp;yyyy}
copyright = Copyright (c) OSGi Alliance (2014, ${copyright.year}). All Rights Reserved.

build.version 2.0.0.SNAPSHOT
baseline.version: 1.0.0
base.version: 2.0.0
-groupid: org.osgi
-pom true
-pom: version=${versionmask;===s;${@version}}
Bundle-Version: ${base.version}.${tstamp}-SNAPSHOT

# Uncomment the following line to build the non-snapshot version.
#-snapshot: REL

Bundle-Copyright: ${copyright}
Bundle-Vendor: OSGi Alliance http://www.osgi.org/
Bundle-Version: ${build.version}
Bundle-License: http://opensource.org/licenses/apache2.0.php; \
link="http://www.apache.org/licenses/LICENSE-2.0"; \
description="Apache License, Version 2.0"
Expand All @@ -25,7 +29,16 @@ Bundle-Developers: osgi; \
Git-Descriptor: ${system-allow-fail;git describe --dirty --always}
Git-SHA: ${system-allow-fail;git rev-list -1 HEAD}

-connection-settings: ${env;OSGI_NEXUS_SETTING}, bnd

-plugin.osgi.nexus: \
\
aQute.bnd.repository.maven.provider.MavenBndRepository; \
snapshotUrl=https://oss.sonatype.org/content/repositories/osgi-snapshots/; \
releaseUrl= https://oss.sonatype.org/content/repositories/osgi-releases/; \
index=${.}/osgi-nexus.maven; \
name="OSGiNexus"

-releaserepo: Release
-releaserepo: OSGiNexus
-baselinerepo: Distro

7 changes: 0 additions & 7 deletions cnf/ext/release.bnd

This file was deleted.

2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
bnd_cnf=cnf

# bnd_plugin is the dependency declaration for the bnd gradle plugin
bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:3.1.0
bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:+

# bnd_build can be set to the name of a "master" project whose dependencies will seed the set of projects to build.
bnd_build=
Expand Down
4 changes: 3 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import aQute.bnd.osgi.Constants
/* Add bnd gradle plugin as a script dependency */
buildscript {
repositories {
jcenter()
maven {
url 'https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles'
}
}
dependencies {
classpath bnd_plugin
Expand Down

0 comments on commit 7eedb9b

Please sign in to comment.