[Git][java-team/maven-dependency-analyzer][master] 5 commits: New upstream version 1.11.1
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Jan 27 15:51:40 GMT 2020
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-dependency-analyzer
Commits:
d23ba04c by Emmanuel Bourg at 2020-01-27T16:45:12+01:00
New upstream version 1.11.1
- - - - -
e94f4196 by Emmanuel Bourg at 2020-01-27T16:45:13+01:00
Update upstream source from tag 'upstream/1.11.1'
Update to upstream version '1.11.1'
with Debian dir e16c44747fb52e9dc30d3fe4d5a95740984e1e03
- - - - -
4f11ab71 by Emmanuel Bourg at 2020-01-27T16:50:59+01:00
New upstream release (1.11.1)
- - - - -
cca293f8 by Emmanuel Bourg at 2020-01-27T16:51:08+01:00
Standards-Version updated to 4.5.0
- - - - -
eb0c4c29 by Emmanuel Bourg at 2020-01-27T16:51:16+01:00
Upload to unstable
- - - - -
14 changed files:
- + .github/pull_request_template.md
- + CONTRIBUTING.md
- + README.md
- debian/changelog
- debian/control
- pom.xml
- src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
- src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
- src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
- src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
- src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
- src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
- src/site/xdoc/download.xml.vm
- src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Changes:
=====================================
.github/pull_request_template.md
=====================================
@@ -0,0 +1,29 @@
+Following this checklist to help us incorporate your
+contribution quickly and easily:
+
+ - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MSHARED) filed
+ for the change (usually before you start working on it). Trivial changes like typos do not
+ require a JIRA issue. Your pull request should address just this issue, without
+ pulling in other changes. Also be sure having selected the correct component.
+ - [ ] Each commit in the pull request should have a meaningful subject line and body.
+ - [ ] Format the pull request title like `[MSHARED-XXX] - Fixes bug in ApproximateQuantiles`,
+ where you replace `MSHARED-XXX` with the appropriate JIRA issue. Best practice
+ is to use the JIRA issue title in the pull request title and in the first line of the
+ commit message.
+ - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
+ - [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough check will
+ be performed on your pull request automatically.
+ - [ ] You have run the integration tests successfully (`mvn -Prun-its clean verify`).
+
+If your pull request is about ~20 lines of code you don't need to sign an
+[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf) if you are unsure
+please ask on the developers list.
+
+To make clear that you license your contribution under
+the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
+you have to acknowledge this by using the following check-box.
+
+ - [ ] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
+
+ - [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
+
=====================================
CONTRIBUTING.md
=====================================
@@ -0,0 +1,91 @@
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+Contributing to Apache Maven Dependency Analyzer
+======================
+
+You have found a bug or you have an idea for a cool new feature? Contributing
+code is a great way to give something back to the open source community. Before
+you dig right into the code, there are a few guidelines that we need
+contributors to follow so that we can have a chance of keeping on top of
+things.
+
+Some of the ideas are documented in the [Maven Wiki][maven-wiki]
+which might be interesting to read and for further discussion.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature, it makes sense to discuss your changes
+ on the [dev list](https://maven.apache.org/mail-lists.html) first.
+ This way you can make sure you're not wasting your time on something that isn't
+ considered to be in Apache Maven's scope.
++ Submit a ticket for your issue, assuming one does not already exist.
+ + Clearly describe the issue, including steps to reproduce when it is a bug.
+ + Make sure you fill in the earliest version that you know has the issue.
++ Fork the repository on GitHub.
+
+Making and Submitting Changes
+--------------
+
+We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the
+main channel of communication for contributors.
+There are some guidelines which will make applying PRs easier for us:
++ Create a topic branch from where you want to base your work (this is usually the master branch).
+ Push your changes to a topic branch in your fork of the repository.
++ Make commits of logical units.
++ Respect the original code style: by using the same [codestyle][code-style],
+ patches should only highlight the actual difference, not being disturbed by any formatting issues:
+ + Only use spaces for indentation.
+ + Create minimal diffs - disable on save actions like reformat source code or organize imports.
+ If you feel the source code should be reformatted, create a separate PR for this change.
+ + Check for unnecessary whitespace with `git diff --check` before committing.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
+```
+[MSHARED-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/IT) for your changes.
++ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
++ Submit a pull request to the repository in the Apache organization.
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].
+
+Making Trivial Changes
+----------------------
+
+For changes of a trivial nature to comments and documentation, it is not always
+necessary to create a new ticket in JIRA. In this case, it is appropriate to
+start the first line of a commit with '(doc)' instead of a ticket number.
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
++ [Apache Maven Dependency Analyzer JIRA project page](https://issues.apache.org/jira/projects/MSHARED/)
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
++ #Maven IRC channel on freenode.org
+
+[dev-ml-list]: http://maven.apache.org/mailing-lists.html
+[code-style]: https://maven.apache.org/developers/conventions/code.html
+[cla]: https://www.apache.org/licenses/#clas
+[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
=====================================
README.md
=====================================
@@ -0,0 +1,97 @@
+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+Contributing to Apache Maven Dependency Analyzer
+======================
+
+[][license]
+[](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.apache.maven.shared%22%20AND%20a%3A%22maven-dependency-analyzer%22)
+[][build]
+[][test-results]
+
+
+You have found a bug or you have an idea for a cool new feature? Contributing
+code is a great way to give something back to the open source community. Before
+you dig right into the code, there are a few guidelines that we need
+contributors to follow so that we can have a chance of keeping on top of
+things.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature, it makes sense to discuss your changes
+ on the [dev list](https://maven.apache.org/mailing-lists.html) first.
+ This way you can make sure you're not wasting your time on something that isn't
+ considered to be in Apache Maven's scope.
++ Submit a ticket for your issue, assuming one does not already exist.
+ + Clearly describe the issue, including steps to reproduce when it is a bug.
+ + Make sure you fill in the earliest version that you know has the issue.
++ Fork the repository on GitHub.
+
+Making and Submitting Changes
+--------------
+
+We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the
+main channel of communication for contributors.
+There are some guidelines which will make applying PRs easier for us:
++ Create a topic branch from where you want to base your work (this is usually the master branch).
+ Push your changes to a topic branch in your fork of the repository.
++ Make commits of logical units.
++ Respect the original code style: by using the same [codestyle][code-style],
+ patches should only highlight the actual difference, not being disturbed by any formatting issues:
+ + Only use spaces for indentation.
+ + Create minimal diffs - disable on save actions like reformat source code or organize imports.
+ If you feel the source code should be reformatted, create a separate PR for this change.
+ + Check for unnecessary whitespace with `git diff --check` before committing.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
+```
+[MSHARED-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/IT) for your changes.
++ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
++ Submit a pull request to the repository in the Apache organization.
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].
+
+Making Trivial Changes
+----------------------
+
+For changes of a trivial nature to comments and documentation, it is not always
+necessary to create a new ticket in JIRA. In this case, it is appropriate to
+start the first line of a commit with '(doc)' instead of a ticket number.
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
++ [Apache Maven Help JIRA project page](https://issues.apache.org/jira/projects/SHARED/)
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
++ #Maven IRC channel on freenode.org
+
+[license]: https://www.apache.org/licenses/LICENSE-2.0
+[dev-ml-list]: https://maven.apache.org/mailing-lists.html
+[code-style]: https://maven.apache.org/developers/conventions/code.html
+[cla]: https://www.apache.org/licenses/#clas
+[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
+[test-results]: https://builds.apache.org/job/maven-box/job/maven-dependency-analyzer/job/master/lastCompletedBuild/testReport/
+[build]: https://builds.apache.org/job/maven-box/job/maven-dependency-analyzer/job/master/
=====================================
debian/changelog
=====================================
@@ -1,9 +1,11 @@
-maven-dependency-analyzer (1.10-2) UNRELEASED; urgency=medium
+maven-dependency-analyzer (1.11.1-1) unstable; urgency=medium
* Team upload.
+ * New upstream release
* Removed the unused build dependency on libmaven-plugin-tools-java
+ * Standards-Version updated to 4.5.0
- -- Emmanuel Bourg <ebourg at apache.org> Mon, 26 Nov 2018 14:24:14 +0100
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 27 Jan 2020 16:51:10 +0100
maven-dependency-analyzer (1.10-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
libplexus-component-metadata-java (>= 1.6),
libplexus-utils-java,
maven-debian-helper
-Standards-Version: 4.1.5
+Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/java-team/maven-dependency-analyzer.git
Vcs-Browser: https://salsa.debian.org/java-team/maven-dependency-analyzer
Homepage: http://maven.apache.org/shared/maven-dependency-analyzer/
=====================================
pom.xml
=====================================
@@ -15,7 +15,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
*
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>31</version>
+ <version>33</version>
<relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
</parent>
<artifactId>maven-dependency-analyzer</artifactId>
<packaging>jar</packaging>
- <version>1.10</version>
+ <version>1.11.1</version>
<name>Apache Maven Dependency Analyzer</name>
<description>
@@ -41,7 +41,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git</developerConnection>
<url>https://github.com/apache/maven-dependency-analyzer/tree/${project.scm.tag}</url>
- <tag>maven-dependency-analyzer-1.10</tag>
+ <tag>maven-dependency-analyzer-1.11.1</tag>
</scm>
<issueManagement>
<system>jira</system>
@@ -54,7 +54,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
+ <url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</url>
</site>
</distributionManagement>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>2.2</version>
+ <version>3.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -76,12 +76,12 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>6.1.1</version>
+ <version>7.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.7</version>
+ <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -152,7 +152,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18.1</version>
<configuration>
<systemProperties>
<property>
=====================================
src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
=====================================
@@ -19,6 +19,7 @@ package org.apache.maven.shared.dependency.analyzer.asm;
* under the License.
*/
+import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Collections;
@@ -159,8 +160,10 @@ public class ConstantPoolParser
private static String decodeString( ByteBuffer buf )
{
- int size = buf.getChar(), oldLimit = buf.limit();
- buf.limit( buf.position() + size );
+ int size = buf.getChar();
+ // Explicit cast for compatibility with covariant return type on JDK 9's ByteBuffer
+ int oldLimit = ( (Buffer) buf ).limit();
+ ( (Buffer) buf ).limit( buf.position() + size );
StringBuilder sb = new StringBuilder( size + ( size >> 1 ) + 16 );
while ( buf.hasRemaining() )
{
@@ -183,7 +186,7 @@ public class ConstantPoolParser
}
}
}
- buf.limit( oldLimit );
+ ( (Buffer) buf ).limit( oldLimit );
return sb.toString();
}
}
=====================================
src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
=====================================
@@ -37,7 +37,7 @@ public class DefaultAnnotationVisitor
public DefaultAnnotationVisitor( ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.resultCollector = resultCollector;
}
=====================================
src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
=====================================
@@ -57,7 +57,7 @@ public class DefaultClassVisitor
FieldVisitor fieldVisitor, MethodVisitor methodVisitor,
ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.signatureVisitor = signatureVisitor;
this.annotationVisitor = annotationVisitor;
this.fieldVisitor = fieldVisitor;
@@ -123,6 +123,16 @@ public class DefaultClassVisitor
return methodVisitor;
}
+ public void visitNestHost( final String nestHost )
+ {
+ resultCollector.addName( nestHost );
+ }
+
+ public void visitNestMember( final String nestMember )
+ {
+ resultCollector.addName( nestMember );
+ }
+
// private methods --------------------------------------------------------
private void addSignature( final String signature )
=====================================
src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
=====================================
@@ -39,7 +39,7 @@ public class DefaultFieldVisitor
public DefaultFieldVisitor( AnnotationVisitor annotationVisitor, ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.annotationVisitor = annotationVisitor;
this.resultCollector = resultCollector;
}
=====================================
src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
=====================================
@@ -48,7 +48,7 @@ public class DefaultMethodVisitor
public DefaultMethodVisitor( AnnotationVisitor annotationVisitor, SignatureVisitor signatureVisitor,
ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.annotationVisitor = annotationVisitor;
this.signatureVisitor = signatureVisitor;
this.resultCollector = resultCollector;
=====================================
src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
=====================================
@@ -36,7 +36,7 @@ public class DefaultSignatureVisitor
public DefaultSignatureVisitor( ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.resultCollector = resultCollector;
}
=====================================
src/site/xdoc/download.xml.vm
=====================================
@@ -34,7 +34,7 @@ under the License.
<p>In order to guard against corrupted downloads/installations, it is highly recommended to
<a href="http://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
- of the release bundles against the public <a href="http://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
+ of the release bundles against the public <a href="https://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
developers.</p>
<p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
@@ -108,8 +108,8 @@ under the License.
<tr>
<td>${project.name} ${project.version} (Source zip)</td>
<td><a href="[preferred]maven/shared/${project.artifactId}-${project.version}-source-release.zip">maven/shared/${project.artifactId}-${project.version}-source-release.zip</a></td>
- <td><a href="http://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha1">maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha1</a></td>
- <td><a href="http://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc">maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
+ <td><a href="https://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha512">maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha512</a></td>
+ <td><a href="https://www.apache.org/dist/maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc">maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc</a></td>
</tr>
</tbody>
</table>
=====================================
src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
=====================================
@@ -344,6 +344,12 @@ public class DefaultProjectDependencyAnalyzerTest
properties.put( "maven.compiler.source", "1.6" );
properties.put( "maven.compiler.target", "1.6" );
}
+
+ String httpsProtocols = System.getProperty( "https.protocols" );
+ if ( httpsProtocols != null )
+ {
+ properties.put( "https.protocols", httpsProtocols );
+ }
List<String> goals = Arrays.asList( "clean", "install" );
File log = new File( pom.getParentFile(), "build.log" );
View it on GitLab: https://salsa.debian.org/java-team/maven-dependency-analyzer/compare/87cec244701685ae7d4d035c1ee4bf221a492b59...eb0c4c295e731fe3c98c0e5ee99c49285c919201
--
View it on GitLab: https://salsa.debian.org/java-team/maven-dependency-analyzer/compare/87cec244701685ae7d4d035c1ee4bf221a492b59...eb0c4c295e731fe3c98c0e5ee99c49285c919201
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200127/84d7de0e/attachment.html>
More information about the pkg-java-commits
mailing list