-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #255 from RADAR-base/release-0.5.16
Release 0.6.0
- Loading branch information
Showing
66 changed files
with
680 additions
and
422 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,28 +4,25 @@ | |
|
|
||
| plugins { | ||
| id 'com.commercehub.gradle.plugin.avro-base' version '0.19.1' | ||
| id 'com.jfrog.bintray' version '1.8.5' apply false | ||
| id 'com.jfrog.artifactory' version '4.15.2' apply false | ||
| } | ||
|
|
||
| subprojects { | ||
| apply plugin: 'java' | ||
| apply plugin: 'java-library' | ||
| apply plugin: 'com.jfrog.bintray' | ||
| apply plugin: 'com.commercehub.gradle.plugin.avro-base' | ||
| apply plugin: 'maven-publish' | ||
| apply plugin: 'idea' | ||
|
|
||
| // Configuration | ||
| version = '0.5.15' | ||
| group = 'org.radarcns' | ||
| version = '0.6.0' | ||
| group = 'org.radarbase' | ||
| ext.githubRepoName = 'RADAR-base/RADAR-Schemas' | ||
|
|
||
| ext.avroVersion = '1.9.2' | ||
|
|
||
| ext.githubUrl = "https://github.com/${githubRepoName}.git" | ||
| ext.issueUrl = "https://github.com/${githubRepoName}/issues" | ||
| ext.website = 'http://radar-cns.org' | ||
| ext.website = 'http://radar-base.org' | ||
|
|
||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
|
|
@@ -41,68 +38,6 @@ subprojects { | |
| } | ||
| } | ||
|
|
||
| // publishing | ||
| ext.pomConfig = { | ||
| licenses { | ||
| license { | ||
| name "The Apache Software License, Version 2.0" | ||
| url "http://www.apache.org/licenses/LICENSE-2.0.txt" | ||
| distribution 'repo' | ||
| } | ||
| } | ||
| developers { | ||
| developer { | ||
| id 'blootsvoets' | ||
| name 'Joris Borgdorff' | ||
| email '[email protected]' | ||
| organization 'The Hyve' | ||
| } | ||
| developer { | ||
| id 'yatharthranjan' | ||
| name 'Yatharth Ranjan' | ||
| email '[email protected]' | ||
| organization 'King\'s College London' | ||
| } | ||
| } | ||
| issueManagement { | ||
| system 'GitHub' | ||
| url issueUrl | ||
| } | ||
| organization { | ||
| name 'RADAR-base' | ||
| url website | ||
| } | ||
| scm { | ||
| connection 'scm:git:' + githubUrl | ||
| url githubUrl | ||
| } | ||
| } | ||
| ext.sharedManifest = manifest { | ||
| attributes("Implementation-Title": rootProject.name, | ||
| "Implementation-Version": version) | ||
| } | ||
|
|
||
| jar { | ||
| manifest.from sharedManifest | ||
| } | ||
| // custom tasks for creating source/javadoc jars | ||
| task sourcesJar(type: Jar, dependsOn: classes) { | ||
| archiveClassifier.set('sources') | ||
| from sourceSets.main.allSource | ||
| manifest.from sharedManifest | ||
| } | ||
|
|
||
| task javadocJar(type: Jar, dependsOn: javadoc) { | ||
| archiveClassifier.set('javadoc') | ||
| from javadoc.destinationDir | ||
| manifest.from sharedManifest | ||
| } | ||
|
|
||
| // add javadoc/source jar tasks as artifacts | ||
| artifacts { | ||
| archives sourcesJar, javadocJar | ||
| } | ||
|
|
||
| // Generated avro files | ||
| ext.avroOutputDir = file('src/generated/java') | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| apply plugin: 'maven-publish' | ||
| apply plugin: 'signing' | ||
|
|
||
| def sharedManifest = manifest { | ||
| attributes("Implementation-Title": project.name, | ||
| "Implementation-Version": version) | ||
| } | ||
|
|
||
| jar { | ||
| manifest.from sharedManifest | ||
| } | ||
|
|
||
| // custom tasks for creating source/javadoc jars | ||
| task sourcesJar(type: Jar, dependsOn: classes) { | ||
| archiveClassifier.set('sources') | ||
| from sourceSets.main.allSource | ||
| manifest.from sharedManifest | ||
| } | ||
|
|
||
| task javadocJar(type: Jar, dependsOn: javadoc) { | ||
| archiveClassifier.set('javadoc') | ||
| from javadoc.destinationDir | ||
| manifest.from sharedManifest | ||
| } | ||
|
|
||
| assemble.dependsOn(javadocJar, sourcesJar) | ||
|
|
||
| publishing { | ||
| publications { | ||
| mavenJar(MavenPublication) { publication -> | ||
| from components.java | ||
| artifact sourcesJar | ||
| artifact javadocJar | ||
|
|
||
| pom { | ||
| name = project.name | ||
| description = project.description | ||
| url = githubUrl | ||
| licenses { | ||
| license { | ||
| name = 'The Apache Software License, Version 2.0' | ||
| url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' | ||
| distribution = 'repo' | ||
| } | ||
| } | ||
| developers { | ||
| developer { | ||
| id = 'blootsvoets' | ||
| name = 'Joris Borgdorff' | ||
| email = '[email protected]' | ||
| organization = 'The Hyve' | ||
| } | ||
| developer { | ||
| id = 'yatharthranjan' | ||
| name = 'Yatharth Ranjan' | ||
| email = '[email protected]' | ||
| organization = 'King\'s College London' | ||
| } | ||
| } | ||
| issueManagement { | ||
| system = 'GitHub' | ||
| url = githubUrl + '/issues' | ||
| } | ||
| organization { | ||
| name = 'RADAR-base' | ||
| url = website | ||
| } | ||
| scm { | ||
| connection = 'scm:git:' + githubUrl | ||
| url = githubUrl | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| maven { | ||
| name = "OSSRH" | ||
| credentials { | ||
| username = project.hasProperty("ossrh.user") ? project.property("ossrh.user") : System.getenv("OSSRH_USER") | ||
| password = project.hasProperty("ossrh.password") ? project.property("ossrh.password") : System.getenv("OSSRH_PASSWORD") | ||
| } | ||
|
|
||
| def releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") | ||
| def snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/") | ||
| url = version.toString().endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl | ||
| } | ||
| } | ||
| } | ||
|
|
||
| signing { | ||
| useGpgCmd() | ||
| required { true } | ||
| sign(tasks["sourcesJar"], tasks["javadocJar"]) | ||
| sign(publishing.publications["mavenJar"]) | ||
| } | ||
|
|
||
| tasks.withType(Sign).configureEach { | ||
| onlyIf { gradle.taskGraph.hasTask("${project.path}:publish") } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
.../main/java/org/radarcns/schema/Scope.java → ...main/java/org/radarbase/schema/Scope.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...g/radarcns/stream/TimeWindowMetadata.java → .../radarbase/stream/TimeWindowMetadata.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.