diff --git a/2.2.2.tar.gz b/2.2.2.tar.gz new file mode 100644 index 0000000..b83149c Binary files /dev/null and b/2.2.2.tar.gz differ diff --git a/shrinkwrap-resolver-2.2.2-maven-model3.4.patch b/shrinkwrap-resolver-2.2.2-maven-model3.4.patch new file mode 100644 index 0000000..8a38c26 --- /dev/null +++ b/shrinkwrap-resolver-2.2.2-maven-model3.4.patch @@ -0,0 +1,55 @@ +diff -Nru resolver-2.2.2/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/MavenModelResolver.java resolver-2.2.2.maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/MavenModelResolver.java +--- resolver-2.2.2/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/MavenModelResolver.java 2016-02-10 15:23:47.000000000 +0100 ++++ resolver-2.2.2.maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/MavenModelResolver.java 2016-08-09 16:37:49.946612710 +0200 +@@ -22,6 +22,7 @@ + import java.util.List; + import java.util.Set; + ++import org.apache.maven.model.Dependency; + import org.apache.maven.model.Parent; + import org.apache.maven.model.Repository; + import org.apache.maven.model.building.FileModelSource; +@@ -182,6 +183,43 @@ + } + + @Override ++ public ModelSource resolveModel(Dependency dependency) throws UnresolvableModelException { ++ Artifact artifact = new DefaultArtifact( dependency.getGroupId(), dependency.getArtifactId(), "", ++ "pom", dependency.getVersion() ); ++ ++ VersionRangeRequest versionRangeRequest = new VersionRangeRequest(artifact, repositories, null); ++ ++ try { ++ VersionRangeResult versionRangeResult = ++ system.resolveVersionRange(session, versionRangeRequest); ++ ++ if (versionRangeResult.getHighestVersion() == null) { ++ throw new UnresolvableModelException("No versions matched the dependency requested range '" + dependency.getVersion() ++ + "'", dependency.getGroupId(), dependency.getArtifactId(), ++ dependency.getVersion()); ++ ++ } ++ ++ if (versionRangeResult.getVersionConstraint() != null ++ && versionRangeResult.getVersionConstraint().getRange() != null ++ && versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null) { ++ throw new UnresolvableModelException("The requested dependency version range '" + dependency.getVersion() ++ + "' does not specify an upper bound", dependency.getGroupId(), ++ dependency.getArtifactId(), dependency.getVersion()); ++ ++ } ++ ++ dependency.setVersion(versionRangeResult.getHighestVersion().toString()); ++ } catch (VersionRangeResolutionException e) { ++ throw new UnresolvableModelException(e.getMessage(), dependency.getGroupId(), dependency.getArtifactId(), ++ dependency.getVersion(), e); ++ } ++ ++ return resolveModel(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion()); ++ ++ } ++ ++ @Override + public void addRepository(Repository repository, boolean replace) throws InvalidRepositoryException { + + if (session.isIgnoreArtifactDescriptorRepositories()) { diff --git a/shrinkwrap-resolver-2.2.2-override.patch b/shrinkwrap-resolver-2.2.2-override.patch new file mode 100644 index 0000000..42741ee --- /dev/null +++ b/shrinkwrap-resolver-2.2.2-override.patch @@ -0,0 +1,11 @@ +diff -Nru resolver-2.2.2/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/MavenModelResolver.java resolver-2.2.2.override/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/MavenModelResolver.java +--- resolver-2.2.2/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/MavenModelResolver.java 2017-02-08 17:04:38.056960836 +0100 ++++ resolver-2.2.2.override/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/internal/MavenModelResolver.java 2017-02-08 17:06:01.115275244 +0100 +@@ -182,7 +182,6 @@ + return resolveModel(parent.getGroupId(), parent.getArtifactId(), parent.getVersion()); + } + +- @Override + public ModelSource resolveModel(Dependency dependency) throws UnresolvableModelException { + Artifact artifact = new DefaultArtifact( dependency.getGroupId(), dependency.getArtifactId(), "", + "pom", dependency.getVersion() ); diff --git a/shrinkwrap-resolver.spec b/shrinkwrap-resolver.spec new file mode 100644 index 0000000..c11477a --- /dev/null +++ b/shrinkwrap-resolver.spec @@ -0,0 +1,216 @@ +Name: shrinkwrap-resolver +Version: 2.2.2 +Release: 1 +Summary: Java API to obtain Maven artifacts +License: ASL 2.0 +URL: http://arquillian.org/modules/resolver-shrinkwrap/ +Source0: https://github.com/shrinkwrap/resolver/archive/%{version}.tar.gz +Patch0: shrinkwrap-resolver-2.2.2-maven-model3.4.patch +Patch1: shrinkwrap-resolver-2.2.2-override.patch + +BuildRequires: maven-local mvn(com.google.guava:guava) mvn(junit:junit) +BuildRequires: mvn(org.apache.maven:maven-aether-provider) mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model) mvn(org.apache.maven:maven-model-builder) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven:maven-repository-metadata) +BuildRequires: mvn(org.apache.maven:maven-settings) +BuildRequires: mvn(org.apache.maven:maven-settings-builder) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin) +BuildRequires: mvn(org.apache.maven.wagon:wagon-file) +BuildRequires: mvn(org.apache.maven.wagon:wagon-http-lightweight) +BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) +BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) +BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-api) +BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.eclipse.aether:aether:pom:) +BuildRequires: mvn(org.eclipse.aether:aether-api) mvn(org.eclipse.aether:aether-impl) +BuildRequires: mvn(org.eclipse.aether:aether-spi) mvn(org.eclipse.aether:aether-util) +BuildRequires: mvn(org.eclipse.aether:aether-connector-basic) +BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.gradle:gradle-tooling-api) mvn(org.jboss:jboss-parent:pom:) +BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-api) +BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-bom:pom:) +BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base) mvn(org.mockito:mockito-all) +BuildRequires: mvn(org.sonatype.plexus:plexus-sec-dispatcher) xmvn +BuildArch: noarch + +%description +The ShrinkWrap Resolvers project provides a Java API to obtain artifacts +from a repository system. This is handy to include third party libraries +available in any Maven repository in your test archive. ShrinkWrap Resolvers +additionally allows you to reuse all the configuration you've already specified +in Maven build file, making packaging of an application archive much easier job. + +%package api +Summary: ShrinkWrap Resolver API +%description api +API to Resolve Dependencies from a Generic Backend. + +%package api-gradle-embedded-archive +Summary: ShrinkWrap Resolver Embedded Gradle Archive API +%description api-gradle-embedded-archive +API for Resolving Dependencies from a Gradle Backend to +a ShrinkWrap Archive and Gradle Importer. + +%package api-maven +Summary: ShrinkWrap Resolver Maven API +%description api-maven +API to Resolve Dependencies from a Maven Backend. + +%package api-maven-archive +Summary: ShrinkWrap Resolver Maven Archive API +%description api-maven-archive +API for Resolving Dependencies from a Maven Backend to +a ShrinkWrap Archive and Maven Importer. + +%package bom +Summary: ShrinkWrap Resolver Bill of Materials +%description bom +Centralized dependencyManagement for the +ShrinkWrap Resolver Project. + +%package build-resources +Summary: Shrinkwrap Resolver Build Resources +%description build-resources +Shrinkwrap Resolver Build Resources. + +%package depchain +Summary: ShrinkWrap Resolver Dependency Chain +%description depchain +Single-POM Definition to export the +ShrinkWrap Resolver artifacts +in proper scope. + +%package gradle-depchain +Summary: ShrinkWrap Resolver Gradle Dependency Chain +%description gradle-depchain +Single-POM Definition to export the +ShrinkWrap Resolver Gradle artifacts +in proper scope. + +%package impl-gradle-embedded-archive +Summary: ShrinkWrap Resolver Embedded Gradle Archive Implementation +%description impl-gradle-embedded-archive +Implementation for Resolving Dependencies +from a Gradle Backend to a ShrinkWrap Archive. + +%package impl-maven +Summary: ShrinkWrap Resolver Maven Implementation +%description impl-maven +Implementation for Resolving Dependencies from a Maven Backend. + +%package impl-maven-archive +Summary: ShrinkWrap Resolver Maven Archive Implementation +%description impl-maven-archive +Implementation for Resolving Dependencies +from a Maven Backend to a ShrinkWrap Archive. + +%package maven-plugin +Summary: ShrinkWrap Resolver Maven Plugin +%description maven-plugin +ShrinkWrap Resolver Maven Plugin. + +%package parent +Summary: ShrinkWrap Resolver Aggregator +%description parent +ShrinkWrap Resolver Aggregator. + +%package spi +Summary: ShrinkWrap Resolver SPI +%description spi +Service Provider Interface to Resolve Dependencies from a Generic Backend. + +%package spi-maven +Summary: ShrinkWrap Resolver Maven SPI +%description spi-maven +Service Provider Interface to Resolve Dependencies from a Maven Backend. + +%package spi-maven-archive +Summary: ShrinkWrap Resolver Maven Archive SPI +%description spi-maven-archive +Service Provider Interface for Resolving Dependencies +from a Maven Backend to a ShrinkWrap Archive and +Importing Maven Project. + +%package javadoc +Summary: Javadoc for %{name} +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n resolver-%{version} +find -name '*.jar' -print -delete +rm -rf */target +%patch0 -p1 +%patch1 -p1 +%pom_remove_plugin -r :maven-checkstyle-plugin +%pom_remove_plugin ":maven-enforcer-plugin" +%pom_remove_plugin :maven-invoker-plugin maven-plugin +%pom_remove_dep -r org.easytesting:fest-assert +%pom_xpath_remove "pom:dependency[pom:scope = 'test']" impl-maven +rm -r impl-maven/src/test/java impl-gradle-embedded-archive/src/test/java +rm -r impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/ConfiguredMavenImporterTestCase.java \ + impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/JarMavenImporterTestCase.java \ + impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/ManifestTestCase.java \ + impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/WarMavenImporterTestCase.java \ + impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/usecases/ShrinkWrapMavenTestCase.java + +%build +%mvn_build -s + +%install +%mvn_install + +%files api -f .mfiles-%{name}-api +%doc README.asciidoc +%license LICENSE + +%files api-gradle-embedded-archive -f .mfiles-%{name}-api-gradle-embedded-archive + +%files api-maven -f .mfiles-%{name}-api-maven + +%files api-maven-archive -f .mfiles-%{name}-api-maven-archive + +%files bom -f .mfiles-%{name}-bom +%license LICENSE + +%files build-resources -f .mfiles-%{name}-build-resources +%license LICENSE + +%files depchain -f .mfiles-%{name}-depchain +%license LICENSE + +%files gradle-depchain -f .mfiles-%{name}-gradle-depchain +%license LICENSE + +%files impl-gradle-embedded-archive -f .mfiles-%{name}-impl-gradle-embedded-archive + +%files impl-maven -f .mfiles-%{name}-impl-maven + +%files impl-maven-archive -f .mfiles-%{name}-impl-maven-archive + +%files maven-plugin -f .mfiles-%{name}-maven-plugin + +%files parent -f .mfiles-%{name}-parent +%license LICENSE + +%files spi -f .mfiles-%{name}-spi + +%files spi-maven -f .mfiles-%{name}-spi-maven + +%files spi-maven-archive -f .mfiles-%{name}-spi-maven-archive + +%files javadoc -f .mfiles-javadoc +%license LICENSE + +%changelog +* Tue Aug 11 2020 maminjie - 2.2.2-1 +- package init diff --git a/shrinkwrap-resolver.yaml b/shrinkwrap-resolver.yaml new file mode 100644 index 0000000..191e4bc --- /dev/null +++ b/shrinkwrap-resolver.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: shrinkwrap/resolver +tag_prefix: ^ +seperator: "."