Repository: aries-rsa Updated Branches: refs/heads/master 729eb6413 -> 7e31f39cb
ARIES-1822 - Upgrade plugins to new versions Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/7e31f39c Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/7e31f39c Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/7e31f39c Branch: refs/heads/master Commit: 7e31f39cb5b14d9a7fb787818875bd8a33428277 Parents: 729eb64 Author: Christian Schneider <[email protected]> Authored: Thu Aug 2 15:05:00 2018 +0200 Committer: Christian Schneider <[email protected]> Committed: Thu Aug 2 15:05:00 2018 +0200 ---------------------------------------------------------------------- parent/pom.xml | 10 ++-- pom.xml | 55 ++------------------ .../provider/fastbin/io/TransportServer.java | 6 +-- .../fastbin/tcp/AbstractInvocationStrategy.java | 1 - .../provider/fastbin/util/UuidGenerator.java | 3 +- .../org/apache/aries/rsa/core/PackageUtil.java | 1 - 6 files changed, 12 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/7e31f39c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0ab3223..f41196d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,7 +41,7 @@ <log4j.version>1.2.6</log4j.version> <hawtdispatch.version>1.21</hawtdispatch.version> <hawtbuf.version>1.11</hawtbuf.version> - <exam.version>4.10.0</exam.version> + <exam.version>4.12.0</exam.version> <cxf.resources.base.path /> <cxf.checkstyle.extension /> </properties> @@ -223,13 +223,13 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>3.5.0</version> + <version>3.5.1</version> <extensions>true</extensions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> + <version>3.8.0</version> <configuration> <source>1.7</source> <target>1.7</target> @@ -238,7 +238,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> + <version>3.1.0</version> <configuration> <encoding>UTF-8</encoding> </configuration> @@ -246,7 +246,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> + <version>3.0.1</version> <configuration> <attach>true</attach> <quiet>true</quiet> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/7e31f39c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 551c3ae..2347564 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>18</version> + <version>20</version> <relativePath /> </parent> @@ -90,62 +90,13 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <excludes> - <exclude>**/target/**/*</exclude> - <exclude>**/appended-resources/**/*</exclude> - <exclude>**/dependency-reduced-pom.xml</exclude> - <exclude>**/velocity.log</exclude> - <exclude>**/DEPENDENCIES</exclude> - <!-- exclude IntelliJ IDEA generated files --> - <exclude>**/*.iml</exclude> - <exclude>**/*.ipr</exclude> - <exclude>**/*.iws</exclude> - <exclude>**/.idea/**/*</exclude> - <!-- exclude Eclipse IDE generated files --> - <exclude>**/.project</exclude> - <exclude>**/.classpath</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/eclipse-classes/**/*</exclude> - <!-- manifest files don't support comments so don't contain - the ASL2.0 header --> - <exclude>**/APPLICATION.MF</exclude> - <exclude>**/MANIFEST.MF</exclude> - <exclude>**/*.MF</exclude> - <!--RAT doesn't seem to recognize MIT style licenses --> - <exclude>manual/src/styles/print.css</exclude> - <!-- RAT doesn't recognize BSD license in transaction-manager - logger --> - <exclude>**/objectweb/howl/log/Logger.java</exclude> - <exclude>.gitignore</exclude> - <exclude>osgi.bnd</exclude> - <exclude>README.md</exclude> - <exclude>*.cfg</exclude> - <exclude>derby.log</exclude> - <exclude>**/*.sql</exclude> - <exclude>**/README.md</exclude> - <exclude>**/Readme.md</exclude> - </excludes> - </configuration> - </plugin> </plugins> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> <configuration> <releaseProfiles>apache-release</releaseProfiles> <autoVersionSubmodules>true</autoVersionSubmodules> @@ -162,7 +113,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.15</version> + <version>2.22</version> <configuration> <aggregate>true</aggregate> </configuration> http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/7e31f39c/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java ---------------------------------------------------------------------- diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java index 35de9c7..0372813 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/io/TransportServer.java @@ -23,15 +23,15 @@ import java.net.InetSocketAddress; import org.fusesource.hawtdispatch.DispatchQueue; /** - * A TransportServer asynchronously accepts {@see Transport} objects and then - * delivers those objects to a {@see TransportAcceptListener}. + * A TransportServer asynchronously accepts @see Transport objects and then + * delivers those objects to a @see TransportAcceptListener. * * @version $Revision: 1.4 $ */ public interface TransportServer extends Service { /** - * Registers an {@see TransportAcceptListener} which is notified of accepted + * Registers an @see TransportAcceptListener which is notified of accepted * channels. * * @param acceptListener http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/7e31f39c/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java ---------------------------------------------------------------------- diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java index ef8f604..77d3db4 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/tcp/AbstractInvocationStrategy.java @@ -83,7 +83,6 @@ public abstract class AbstractInvocationStrategy implements InvocationStrategy * @param method * @param args * @param requestStream - * @param protocolVersion * @throws Exception */ protected void encodeRequest(SerializationStrategy serializationStrategy, ClassLoader loader, Method method, Object[] args, DataByteArrayOutputStream requestStream) throws Exception { http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/7e31f39c/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java ---------------------------------------------------------------------- diff --git a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java index 7f09e1a..bb95609 100644 --- a/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java +++ b/provider/fastbin/src/main/java/org/apache/aries/rsa/provider/fastbin/util/UuidGenerator.java @@ -29,8 +29,7 @@ import org.slf4j.LoggerFactory; /** * A unique ID generator which is a fast implementation based on - * how <a href="http://activemq.apache.org/>Apache ActiveMQ</a> generates its UUID. - * <p/> + * how Apache ActiveMQ generates its UUID. */ public class UuidGenerator { http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/7e31f39c/rsa/src/main/java/org/apache/aries/rsa/core/PackageUtil.java ---------------------------------------------------------------------- diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/PackageUtil.java b/rsa/src/main/java/org/apache/aries/rsa/core/PackageUtil.java index daf9c9d..0823cf6 100644 --- a/rsa/src/main/java/org/apache/aries/rsa/core/PackageUtil.java +++ b/rsa/src/main/java/org/apache/aries/rsa/core/PackageUtil.java @@ -40,7 +40,6 @@ public class PackageUtil { * Tries to retrieve the version of iClass via the PackageAdmin. * * @param iClass tThe interface for which the version should be found - * @param bc any valid BundleContext * @return the version of the interface or "0.0.0" if no version information could be found or an error * occurred during the retrieval */
