From 9633d9f48f7f5f04c45148b588e53c8af3dc59a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Thu, 4 Jun 2020 07:21:40 +0200 Subject: [PATCH] better compile, do not publish gradle plugin to sonatype --- build.gradle | 1 - gradle.properties | 4 ++-- gradle/compile/java.gradle | 10 +++++++++- maven-plugin-rpm/build.gradle | 2 ++ rpm-ant/build.gradle | 2 ++ rpm-core/build.gradle | 2 ++ rpm-core/src/main/java/module-info.java | 4 ++-- .../main/java/org/xbib/rpm/header/AbstractHeader.java | 4 ++-- .../java/org/xbib/rpm/io/ReadableChannelWrapper.java | 2 +- 9 files changed, 22 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 8271c6e..ed8607f 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,5 @@ subprojects { apply from: rootProject.file('gradle/ide/idea.gradle') apply from: rootProject.file('gradle/compile/java.gradle') apply from: rootProject.file('gradle/test/junit5.gradle') - apply from: rootProject.file('gradle/publishing/publication.gradle') } apply from: rootProject.file('gradle/publishing/sonatype.gradle') diff --git a/gradle.properties b/gradle.properties index c21d618..82bfc07 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ group = org.xbib name = rpm -version = 2.0.0 +version = 2.0.1 gradle.wrapper.version = 6.4.1 gradle.publish.plugin.version = 0.11.0 bouncycastle.version = 1.64 -xbib-archive.version = 1.0.0 +xbib-archive.version = 1.0.1 ant.version = 1.10.8 maven.version = 3.6.3 maven-plugin-annotations.version = 3.6.0 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index a9d76ce..c9bba7f 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -32,4 +32,12 @@ task javadocJar(type: Jar, dependsOn: javadoc) { artifacts { archives sourcesJar, javadocJar -} \ No newline at end of file +} + +tasks.withType(JavaCompile) { + options.compilerArgs << '-Xlint:all,-fallthrough' +} + +javadoc { + options.addStringOption('Xdoclint:none', '-quiet') +} diff --git a/maven-plugin-rpm/build.gradle b/maven-plugin-rpm/build.gradle index 0e7ed97..0105f26 100644 --- a/maven-plugin-rpm/build.gradle +++ b/maven-plugin-rpm/build.gradle @@ -71,3 +71,5 @@ task generatePluginDescriptor(type: JavaExec, dependsOn: compileJava) { } project.jar.dependsOn(generatePluginDescriptor) + +apply from: rootProject.file('gradle/publishing/publication.gradle') diff --git a/rpm-ant/build.gradle b/rpm-ant/build.gradle index 38cb3e2..937c5e4 100644 --- a/rpm-ant/build.gradle +++ b/rpm-ant/build.gradle @@ -2,3 +2,5 @@ dependencies { api project(':rpm-core') implementation "org.apache.ant:ant:${project.property('ant.version')}" } + +apply from: rootProject.file('gradle/publishing/publication.gradle') diff --git a/rpm-core/build.gradle b/rpm-core/build.gradle index fdf2a51..845ff55 100644 --- a/rpm-core/build.gradle +++ b/rpm-core/build.gradle @@ -3,3 +3,5 @@ dependencies { api "org.xbib:io-compress-bzip2:${project.property('xbib-archive.version')}" api "org.xbib:io-compress-xz:${project.property('xbib-archive.version')}" } + +apply from: rootProject.file('gradle/publishing/publication.gradle') diff --git a/rpm-core/src/main/java/module-info.java b/rpm-core/src/main/java/module-info.java index 7d20df5..891fd40 100644 --- a/rpm-core/src/main/java/module-info.java +++ b/rpm-core/src/main/java/module-info.java @@ -11,8 +11,8 @@ module org.xbib.rpm { exports org.xbib.rpm.security; exports org.xbib.rpm.signature; exports org.xbib.rpm.trigger; - requires org.bouncycastle.pg; - requires org.bouncycastle.provider; + requires transitive org.bouncycastle.pg; + requires transitive org.bouncycastle.provider; requires org.xbib.io.compress.bzip; requires org.xbib.io.compress.xz; } diff --git a/rpm-core/src/main/java/org/xbib/rpm/header/AbstractHeader.java b/rpm-core/src/main/java/org/xbib/rpm/header/AbstractHeader.java index 0760208..9cb3a39 100644 --- a/rpm-core/src/main/java/org/xbib/rpm/header/AbstractHeader.java +++ b/rpm-core/src/main/java/org/xbib/rpm/header/AbstractHeader.java @@ -203,9 +203,9 @@ public abstract class AbstractHeader { if (existingValues == null) { entry.setValues(values); } else if (existingValues instanceof Collection) { - Collection collection = (Collection) existingValues; + Collection collection = (Collection) existingValues; if (values instanceof Collection) { - Collection valuesCollection = (Collection) values; + Collection valuesCollection = (Collection) values; collection.addAll(valuesCollection); } else { collection.add(values); diff --git a/rpm-core/src/main/java/org/xbib/rpm/io/ReadableChannelWrapper.java b/rpm-core/src/main/java/org/xbib/rpm/io/ReadableChannelWrapper.java index 7b53dab..a116836 100644 --- a/rpm-core/src/main/java/org/xbib/rpm/io/ReadableChannelWrapper.java +++ b/rpm-core/src/main/java/org/xbib/rpm/io/ReadableChannelWrapper.java @@ -28,7 +28,7 @@ public class ReadableChannelWrapper extends ChannelWrapper implements ReadableBy public int read(final ByteBuffer buffer) throws IOException { final int read = channel.read(buffer); for (Consumer consumer : consumers.values()) { - consumer.consume((ByteBuffer) buffer.duplicate().flip()); + consumer.consume(buffer.duplicate().flip()); } return read; }