Hello community, here is the log from the commit of package maven-enforcer for openSUSE:Factory checked in at 2019-11-26 16:59:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-enforcer (Old) and /work/SRC/openSUSE:Factory/.maven-enforcer.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-enforcer" Tue Nov 26 16:59:15 2019 rev:2 rq:750589 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-enforcer/maven-enforcer.changes 2019-05-02 19:20:50.817721821 +0200 +++ /work/SRC/openSUSE:Factory/.maven-enforcer.new.26869/maven-enforcer.changes 2019-11-26 16:59:26.172106352 +0100 @@ -1,0 +2,9 @@ +Sun Nov 24 16:57:50 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin +- Added patch: + * 0002-Port-to-artifact-transfer-0.11.0.patch + + allow building against maven-artifact-transfer 0.11 + +------------------------------------------------------------------- New: ---- 0002-Port-to-artifact-transfer-0.11.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-enforcer.spec ++++++ --- /var/tmp/diff_new_pack.n8UatV/_old 2019-11-26 16:59:27.324105971 +0100 +++ /var/tmp/diff_new_pack.n8UatV/_new 2019-11-26 16:59:27.328105970 +0100 @@ -1,7 +1,7 @@ # # spec file for package maven-enforcer # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,8 +27,10 @@ # TODO forward upstream # https://issues.apache.org/jira/browse/MENFORCER-267 Patch0: 0001-Port-to-Maven-3-API.patch +Patch1: 0002-Port-to-artifact-transfer-0.11.0.patch BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: unzip BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) @@ -47,7 +49,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-i18n) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: unzip BuildArch: noarch %description @@ -55,12 +56,14 @@ %package javadoc Summary: Javadoc for %{name} +Group: Development/Libraries/Java %description javadoc API documentation for %{name}. %package api Summary: Enforcer API +Group: Development/Libraries/Java %description api This component provides the generic interfaces needed to @@ -68,12 +71,14 @@ %package rules Summary: Enforcer Rules +Group: Development/Libraries/Java %description rules This component contains the standard Enforcer Rules. %package plugin Summary: Enforcer Rules +Group: Development/Libraries/Java %description plugin This component contains the standard Enforcer Rules. @@ -81,6 +86,7 @@ %prep %setup -q -n enforcer-%{version} %patch0 -p1 +%patch1 -p1 # Avoid dependency cycle %pom_xpath_inject pom:build/pom:pluginManagement/pom:plugins " @@ -95,7 +101,10 @@ -i enforcer-{api,rules}/pom.xml %build -%{mvn_build} -s -f -- -Dmaven.compiler.source=6 -Dmaven.compiler.target=6 -Dsource=6 +%{mvn_build} -s -f \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -- -Dmaven.compiler.release=6 +%endif %install %mvn_install ++++++ 0002-Port-to-artifact-transfer-0.11.0.patch ++++++ --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java @@ -69,8 +69,8 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.settings.Settings; -import org.apache.maven.shared.artifact.resolve.ArtifactResolver; -import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.util.ReflectionUtils; --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java @@ -31,7 +31,7 @@ import org.apache.maven.model.Repository; import org.apache.maven.plugins.enforcer.utils.EnforcerRuleUtils; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java @@ -38,8 +38,8 @@ import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingRequest; -import org.apache.maven.shared.artifact.resolve.ArtifactResolver; -import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.util.ReaderFactory;
