Skip to content

Commit

Permalink
Merge pull request #65 from RADAR-base/release-0.12.0
Browse files Browse the repository at this point in the history 
Release 0.12.0
  • Loading branch information
@blootsvoets
blootsvoets authored Mar 11, 2019
2 parents a9a26df + 88559a9 commit 67600a7
Show file tree
Hide file tree
Showing 114 changed files with 1,244 additions and 2,010 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: java
jdk:
- oraclejdk8
- oraclejdk11
sudo: false

cache:
Expand All @@ -12,8 +12,6 @@ cache:
- $HOME/.gradle/native
- $HOME/.gradle/wrapper

before_install:
- ./gradlew downloadDependencies
after_script:
- ./gradlew sendCoverageToCodacy

Expand Down
18 changes: 9 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repositories {
}
dependencies {
implementation group: 'org.radarcns', name: 'radar-commons', version: '0.11.3'
implementation group: 'org.radarbase', name: 'radar-commons', version: '0.12.0'
}
```

Expand All @@ -26,21 +26,21 @@ repositories {
}
dependencies {
implementation group: 'org.radarcns', name: 'radar-commons-server', version: '0.11.3'
implementation group: 'org.radarbase', name: 'radar-commons-server', version: '0.12.0'
}
```

For mocking clients of the RADAR-CNS infrastructure, use that 'radar-commons-testing' repository:
For mocking clients of the RADAR-base infrastructure, use that 'radar-commons-testing' repository:

```gradle
repositories {
jcenter()
maven { url 'http://packages.confluent.io/maven/' }
maven { url 'http://dl.bintray.com/radar-cns/org.radarcns' }
maven { url 'http://dl.bintray.com/radar-base/org.radarbase' }
}
dependencies {
testImplementation group: 'org.radarcns', name: 'radar-commons-testing', version: '0.11.3'
testImplementation group: 'org.radarbase', name: 'radar-commons-testing', version: '0.12.0'
}
```

Expand All @@ -49,11 +49,11 @@ Finally, if the schema registry is losing old schemas and your code is not recov
repositories {
jcenter()
maven { url 'http://packages.confluent.io/maven/' }
maven { url 'http://dl.bintray.com/radar-cns/org.radarcns' }
maven { url 'http://dl.bintray.com/radar-base/org.radarbase' }
}
dependencies {
runtimeOnly group: 'org.radarcns', name: 'radar-commons-unsafe', version: '0.11.3'
runtimeOnly group: 'org.radarbase', name: 'radar-commons-unsafe', version: '0.12.0'
}
```

Expand All @@ -78,9 +78,9 @@ configurations.all {
}
dependencies {
compile group: 'org.radarcns', name: 'radar-commons', version: '0.11.4-SNAPSHOT', changing: true
compile group: 'org.radarbase', name: 'radar-commons', version: '0.12.1-SNAPSHOT'
}
```

Code should be formatted using the [Google Java Code Style Guide](https://google.github.io/styleguide/javaguide.html).
If you want to contribute a feature or fix browse our [issues](https://github.com/RADAR-CNS/RADAR-Commons/issues), and please make a pull request.
If you want to contribute a feature or fix browse our [issues](https://github.com/RADAR-base/radar-commons/issues), and please make a pull request.
106 changes: 19 additions & 87 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,49 +13,43 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
// Get bintray version
id 'com.jfrog.bintray' version '1.8.1' apply false
id 'com.jfrog.artifactory' version '4.7.5' apply false
id 'com.jfrog.bintray' version '1.8.4' apply false
id 'com.jfrog.artifactory' version '4.9.1' apply false
id 'com.commercehub.gradle.plugin.avro' version '0.16.0'
}

subprojects {
// Apply the plugins
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'idea'
apply plugin: 'checkstyle'
apply plugin: 'pmd'
apply plugin: 'com.jfrog.bintray'
apply plugin: 'maven-publish'
apply plugin: 'jacoco'
apply plugin: 'com.jfrog.artifactory'

//---------------------------------------------------------------------------//
// Configuration //
//---------------------------------------------------------------------------//

version = '0.11.3'
group = 'org.radarcns'
ext.githubRepoName = 'RADAR-CNS/RADAR-Commons'
version = '0.12.0'
group = 'org.radarbase'
ext.githubRepoName = 'RADAR-base/radar-commons'

ext.slf4jVersion = '1.7.25'
ext.kafkaVersion = '2.0.0'
ext.slf4jVersion = '1.7.26'
ext.kafkaVersion = '2.1.1'
ext.avroVersion = '1.8.2'
ext.confluentVersion = '5.0.0'
ext.jacksonVersion = '2.9.7'
ext.okhttpVersion = '3.11.0'
ext.confluentVersion = '5.1.2'
ext.jacksonVersion = '2.9.8'
ext.okhttpVersion = '3.13.1'
ext.junitVersion = '4.12'
ext.mockitoVersion = '2.13.0'
ext.mockitoVersion = '2.24.5'
ext.hamcrestVersion = '1.3'
ext.codacyVersion = '2.0.1'
ext.radarSchemasVersion = '0.4.0'
ext.orgJsonVersion = '20170516'
ext.codacyVersion = '4.0.5'
ext.radarSchemasVersion = '0.4.3'
ext.orgJsonVersion = '20180813'

ext.githubUrl = 'https://github.com/' + githubRepoName + '.git'
ext.issueUrl = 'https://github.com/' + githubRepoName + '/issues'
ext.website = 'http://radar-cns.org'
ext.githubUrl = "https://github.com/$githubRepoName"
ext.issueUrl = "https://github.com/$githubRepoName/issues"
ext.website = 'http://radar-base.org'

//---------------------------------------------------------------------------//
// Dependencies //
Expand All @@ -69,48 +63,6 @@ subprojects {
}
}

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 'nivemaham'
name 'Nivethika Mahasivam'
email 'nivethika@thehyve.nl'
organization 'The Hyve'
}
developer {
id 'blootsvoets'
name 'Joris Borgdorff'
email 'joris@thehyve.nl'
organization 'The Hyve'
}
developer {
id 'fnobilia'
name 'Francesco Nobilia'
email 'francesco.nobilia@kcl.ac.uk'
organization 'King\'s College London'
}
}
issueManagement {
system 'GitHub'
url githubUrl + '/issues'
}
organization {
name 'RADAR-CNS'
url website
}
scm {
connection 'scm:git:' + githubUrl
url githubUrl
}
}

idea {
module {
downloadSources = true
Expand All @@ -121,26 +73,6 @@ subprojects {
// Style checking //
//---------------------------------------------------------------------------//

checkstyle {
// codacy version
toolVersion '6.16'
ignoreFailures false

configFile = rootProject.file('config/checkstyle/checkstyle.xml')
}

pmd {
// codacy version
toolVersion = '5.5.2'
ignoreFailures = false

consoleOutput = true

ruleSets = []
ruleSetFiles = files(rootProject.file("config/pmd/ruleset.xml"))
}


tasks.matching { it instanceof Test }.all {
def stdout = new LinkedList<String>()
beforeTest { TestDescriptor td ->
Expand Down Expand Up @@ -179,5 +111,5 @@ subprojects {
}

wrapper {
gradleVersion '4.10.2'
gradleVersion '5.2.1'
}
100 changes: 47 additions & 53 deletions config/pmd/ruleset.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,82 +8,76 @@
This ruleset was parsed from the Codacy default codestyle.
</description>

<rule ref="rulesets/java/strings.xml">
<exclude name="ConsecutiveAppendsShouldReuse"/>
</rule>

<rule ref="rulesets/java/unusedcode.xml">
<exclude name="UnusedFormalParameter"/>
</rule>

<rule ref="rulesets/java/unnecessary.xml"/>
<rule ref="rulesets/java/basic.xml"/>

<rule ref="rulesets/java/logging-java.xml/SystemPrintln"/>
<rule ref="rulesets/java/logging-java.xml/AvoidPrintStackTrace"/>

<rule ref="rulesets/java/naming.xml">
<rule ref="category/java/codestyle.xml">
<exclude name="LongVariable"/>
<exclude name="ShortVariable"/>
<exclude name="BooleanGetMethodName"/>
<exclude name="AbstractNaming"/>
<exclude name="TooManyStaticImports"/>
<exclude name="MethodArgumentCouldBeFinal"/>
<exclude name="LocalVariableCouldBeFinal"/>
<exclude name="OnlyOneReturn"/>
<exclude name="AtLeastOneConstructor"/>
<exclude name="DefaultPackage"/>
<exclude name="CommentDefaultAccessModifier"/>
<exclude name="CallSuperInConstructor"/>
<exclude name="ConfusingTernary"/>
<exclude name="UseUnderscoresInNumericLiterals"/>
</rule>
<rule ref="rulesets/java/naming.xml/ShortMethodName">
<rule ref="category/java/codestyle.xml/ShortMethodName">
<properties>
<property name="minimum" value="2"/>
</properties>
</rule>
<rule ref="rulesets/java/naming.xml/VariableNamingConventions">
<rule ref="category/java/codestyle.xml/FieldNamingConventions">
<properties>
<property name="violationSuppressRegex" value=".*, 'log(ger)?' is not all capitals\."/>
<property name="exclusions" value="logger|log|serialVersionUID"/>
</properties>
</rule>

<rule ref="rulesets/java/imports.xml">
<exclude name="TooManyStaticImports"/>
</rule>

<rule ref="rulesets/java/strictexception.xml">
<rule ref="category/java/design.xml">
<exclude name="AvoidCatchingGenericException"/>
</rule>

<rule ref="rulesets/java/design.xml">
<exclude name="AvoidDeeplyNestedIfStmts"/>
<exclude name="SwitchDensity"/>
<exclude name="AccessorClassGeneration"/>
<exclude name="ConstructorCallsOverridableMethod"/>
<exclude name="AvoidSynchronizedAtMethodLevel"/>
<exclude name="TooFewBranchesForASwitchStatement"/>
<exclude name="PositionLiteralsFirstInComparisons"/>
<exclude name="ConfusingTernary"/>
<exclude name="UseVarargs"/>
</rule>

<rule ref="rulesets/java/codesize.xml">
<exclude name="CyclomaticComplexity"/>
<exclude name="ExcessiveClassLength"/>
<exclude name="ExcessivePublicCount"/>
<exclude name="TooManyFields"/>
<exclude name="TooManyMethods"/>
<exclude name="LawOfDemeter"/>
<exclude name="LoosePackageCoupling"/>
<exclude name="ExcessiveImports"/>
<exclude name="DataClass"/>
</rule>

<rule ref="rulesets/java/empty.xml">
<exclude name="EmptyCatchBlock"/>
<rule ref="category/java/bestpractices.xml">
<exclude name="GuardLogStatement"/>
<exclude name="PositionLiteralsFirstInComparisons"/>
<exclude name="MethodReturnsInternalArray"/>
</rule>

<rule ref="rulesets/java/finalizers.xml"/>
<rule ref="rulesets/java/braces.xml"/>
<rule ref="rulesets/java/clone.xml"/>

<rule ref="rulesets/java/controversial.xml/AssignmentInOperand"/>
<rule ref="rulesets/java/controversial.xml/OneDeclarationPerLine"/>
<rule ref="rulesets/java/controversial.xml/SuspiciousOctalEscape"/>
<rule ref="rulesets/java/controversial.xml/UnnecessaryParentheses"/>
<rule ref="category/java/errorprone.xml">
<exclude name="EmptyCatchBlock"/>
<exclude name="DataflowAnomalyAnalysis"/>
<exclude name="AvoidLiteralsInIfCondition"/>
<exclude name="BeanMembersShouldSerialize"/>
<exclude name="NullAssignment"/>
<exclude name="UseProperClassLoader"/>
</rule>

<rule ref="rulesets/java/optimizations.xml/UseArrayListInsteadOfVector"/>
<rule ref="rulesets/java/optimizations.xml/UseArraysAsList"/>
<rule ref="rulesets/java/optimizations.xml/AvoidArrayLoops"/>
<rule ref="rulesets/java/optimizations.xml/UnnecessaryWrapperObjectCreation"/>
<rule ref="rulesets/java/optimizations.xml/AddEmptyString"/>
<rule ref="rulesets/java/optimizations.xml/PrematureDeclaration"/>
</ruleset>
<rule ref="category/java/multithreading.xml">
<exclude name="AvoidSynchronizedAtMethodLevel"/>
<exclude name="UseConcurrentHashMap"/>
<exclude name="DoNotUseThreads"/>
</rule>
<rule ref="category/java/performance.xml">
<exclude name="AvoidUsingShortType"/>
<exclude name="RedundantFieldInitializer"/>
<exclude name="AvoidInstantiatingObjectsInLoops"/>
</rule>
<rule ref="category/java/security.xml"/>
<rule ref="category/java/documentation.xml">
<exclude name="CommentRequired"/>
<exclude name="CommentSize"/>
</rule>
</ruleset>
Loading

0 comments on commit 67600a7

Please sign in to comment.