Repository: maven-resolver Updated Branches: refs/heads/master 599cc2b0f -> 0b6edee0d
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/0b6edee0/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java ---------------------------------------------------------------------- diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java index 27c52fa..8cf66b0 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java +++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java @@ -41,7 +41,7 @@ final class GenericVersionConstraint * * @param range The version range, must not be {@code null}. */ - public GenericVersionConstraint( VersionRange range ) + GenericVersionConstraint( VersionRange range ) { this.range = requireNonNull( range, "version range cannot be null" ); this.version = null; @@ -52,7 +52,7 @@ final class GenericVersionConstraint * * @param version The version, must not be {@code null}. */ - public GenericVersionConstraint( Version version ) + GenericVersionConstraint( Version version ) { this.version = requireNonNull( version, "version cannot be null" ); this.range = null; http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/0b6edee0/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java ---------------------------------------------------------------------- diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java index 832dd94..ef1f012 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java +++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java @@ -40,7 +40,7 @@ final class GenericVersionRange * @param range The range specification to parse, must not be {@code null}. * @throws InvalidVersionSpecificationException If the range could not be parsed. */ - public GenericVersionRange( String range ) + GenericVersionRange( String range ) throws InvalidVersionSpecificationException { String process = range; http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/0b6edee0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4ebc65c..75944cf 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>30</version> + <version>31</version> </parent> <groupId>org.apache.maven.resolver</groupId> @@ -210,17 +210,12 @@ <pluginManagement> <plugins> <plugin> - <!-- See https://issues.apache.org/jira/browse/MPLUGIN-296 --> - <!-- Can be removed once the core is shipped with an updated plugin. --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>3.5</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <detectOfflineLinks>false</detectOfflineLinks> + <linksource>true</linksource> + <notimestamp>true</notimestamp> <links> <link>http://download.oracle.com/javase/6/docs/api/</link> </links> @@ -306,7 +301,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.20</version> <configuration> <argLine>-Xmx128m</argLine> <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile> @@ -366,19 +360,6 @@ </plugin> </plugins> </pluginManagement> - <plugins> - <plugin><!-- TODO remove when upgrading to parent pom 31 --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>extra-enforcer-rules</artifactId> - <version>1.0-beta-6</version> - </dependency> - </dependencies> - </plugin> - </plugins> </build> <profiles> @@ -409,11 +390,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <linksource>true</linksource> - <notimestamp>true</notimestamp> - <quiet>true</quiet> - </configuration> <reportSets> <reportSet> <id>aggregate</id>
