From 8637f0b04eab3855567ff9f3e49e63cac4496ed47ae998cba2121f58c4400629 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 5 Dec 2019 12:02:35 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=6 --- 00-keep-deprecated-aether-CacheUtils.patch | 147 +++++++++++++++++++++ maven-resolver-1.3.1-source-release.zip | 3 - maven-resolver-1.4.1-source-release.zip | 3 + maven-resolver-build.tar.xz | 4 +- maven-resolver.spec | 6 +- 5 files changed, 156 insertions(+), 7 deletions(-) create mode 100644 00-keep-deprecated-aether-CacheUtils.patch delete mode 100644 maven-resolver-1.3.1-source-release.zip create mode 100644 maven-resolver-1.4.1-source-release.zip diff --git a/00-keep-deprecated-aether-CacheUtils.patch b/00-keep-deprecated-aether-CacheUtils.patch new file mode 100644 index 0000000..a1dd38d --- /dev/null +++ b/00-keep-deprecated-aether-CacheUtils.patch @@ -0,0 +1,147 @@ +diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java +new file mode 100644 +index 0000000..d7e8f01 +--- /dev/null ++++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java +@@ -0,0 +1,141 @@ ++package org.eclipse.aether.internal.impl; ++ ++/* ++ * 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. ++ */ ++ ++import java.util.Iterator; ++import java.util.List; ++ ++import org.eclipse.aether.RepositorySystemSession; ++import org.eclipse.aether.repository.ArtifactRepository; ++import org.eclipse.aether.repository.LocalRepository; ++import org.eclipse.aether.repository.RemoteRepository; ++import org.eclipse.aether.repository.RepositoryPolicy; ++import org.eclipse.aether.repository.WorkspaceReader; ++import org.eclipse.aether.repository.WorkspaceRepository; ++ ++/** ++ * @deprecated To be deleted without replacement. ++ */ ++@Deprecated ++public final class CacheUtils ++{ ++ ++ public static boolean eq( T s1, T s2 ) ++ { ++ return s1 != null ? s1.equals( s2 ) : s2 == null; ++ } ++ ++ public static int hash( Object obj ) ++ { ++ return obj != null ? obj.hashCode() : 0; ++ } ++ ++ public static int repositoriesHashCode( List repositories ) ++ { ++ int result = 17; ++ for ( RemoteRepository repository : repositories ) ++ { ++ result = 31 * result + repositoryHashCode( repository ); ++ } ++ return result; ++ } ++ ++ private static int repositoryHashCode( RemoteRepository repository ) ++ { ++ int result = 17; ++ result = 31 * result + hash( repository.getUrl() ); ++ return result; ++ } ++ ++ private static boolean repositoryEquals( RemoteRepository r1, RemoteRepository r2 ) ++ { ++ if ( r1 == r2 ) ++ { ++ return true; ++ } ++ ++ return eq( r1.getId(), r2.getId() ) && eq( r1.getUrl(), r2.getUrl() ) ++ && policyEquals( r1.getPolicy( false ), r2.getPolicy( false ) ) ++ && policyEquals( r1.getPolicy( true ), r2.getPolicy( true ) ); ++ } ++ ++ private static boolean policyEquals( RepositoryPolicy p1, RepositoryPolicy p2 ) ++ { ++ if ( p1 == p2 ) ++ { ++ return true; ++ } ++ // update policy doesn't affect contents ++ return p1.isEnabled() == p2.isEnabled() && eq( p1.getChecksumPolicy(), p2.getChecksumPolicy() ); ++ } ++ ++ public static boolean repositoriesEquals( List r1, List r2 ) ++ { ++ if ( r1.size() != r2.size() ) ++ { ++ return false; ++ } ++ ++ for ( Iterator it1 = r1.iterator(), it2 = r2.iterator(); it1.hasNext(); ) ++ { ++ if ( !repositoryEquals( it1.next(), it2.next() ) ) ++ { ++ return false; ++ } ++ } ++ ++ return true; ++ } ++ ++ public static WorkspaceRepository getWorkspace( RepositorySystemSession session ) ++ { ++ WorkspaceReader reader = session.getWorkspaceReader(); ++ return ( reader != null ) ? reader.getRepository() : null; ++ } ++ ++ public static ArtifactRepository getRepository( RepositorySystemSession session, ++ List repositories, Class repoClass, ++ String repoId ) ++ { ++ if ( repoClass != null ) ++ { ++ if ( WorkspaceRepository.class.isAssignableFrom( repoClass ) ) ++ { ++ return session.getWorkspaceReader().getRepository(); ++ } ++ else if ( LocalRepository.class.isAssignableFrom( repoClass ) ) ++ { ++ return session.getLocalRepository(); ++ } ++ else ++ { ++ for ( RemoteRepository repository : repositories ) ++ { ++ if ( repoId.equals( repository.getId() ) ) ++ { ++ return repository; ++ } ++ } ++ } ++ } ++ return null; ++ } ++ ++} diff --git a/maven-resolver-1.3.1-source-release.zip b/maven-resolver-1.3.1-source-release.zip deleted file mode 100644 index e2f2fb0..0000000 --- a/maven-resolver-1.3.1-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e05de9f5539f18967464210fdc2142df7d7f0f2d7a86849c3800130054dafae5 -size 1333887 diff --git a/maven-resolver-1.4.1-source-release.zip b/maven-resolver-1.4.1-source-release.zip new file mode 100644 index 0000000..9b107a5 --- /dev/null +++ b/maven-resolver-1.4.1-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:941ef5a059fd469ffab2e835c762a4d487f31d2a64736bd6f304baa896c261c9 +size 1344636 diff --git a/maven-resolver-build.tar.xz b/maven-resolver-build.tar.xz index a75e784..b5e23c2 100644 --- a/maven-resolver-build.tar.xz +++ b/maven-resolver-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8348a79ed474c8ae848840c529194f78283454a0fead1713f2ea8ed7023a725f -size 5392 +oid sha256:1052b5e7d9f775a8e4535ec938f22a07f496231a0a3479d44dd668152f5a8099 +size 5388 diff --git a/maven-resolver.spec b/maven-resolver.spec index 071e2a1..7ce8d0f 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,7 +1,7 @@ # # spec file for package maven-resolver # -# Copyright (c) 2019 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 @@ -18,7 +18,7 @@ %bcond_with tests Name: maven-resolver -Version: 1.3.1 +Version: 1.4.1 Release: 0 Summary: Apache Maven Artifact Resolver library License: Apache-2.0 @@ -27,6 +27,7 @@ URL: http://maven.apache.org/resolver/ Source0: http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip Source1: %{name}-build.tar.xz Patch0: maven-resolver-1.3.1-java8compat.patch +Patch1: 00-keep-deprecated-aether-CacheUtils.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes @@ -142,6 +143,7 @@ This package provides %{summary}. %prep %setup -q -a1 %patch0 -p1 +#%patch1 -p1 # tests require jetty 7 %pom_remove_dep :::test maven-resolver-transport-http From 50068ee36f8ac500d020144aa52bc76271f3f7d58b042f8301633482ef25b737 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 9 Dec 2019 15:37:38 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=7 --- 00-keep-deprecated-aether-CacheUtils.patch | 147 --------------------- maven-resolver.changes | 5 + maven-resolver.spec | 2 - 3 files changed, 5 insertions(+), 149 deletions(-) delete mode 100644 00-keep-deprecated-aether-CacheUtils.patch diff --git a/00-keep-deprecated-aether-CacheUtils.patch b/00-keep-deprecated-aether-CacheUtils.patch deleted file mode 100644 index a1dd38d..0000000 --- a/00-keep-deprecated-aether-CacheUtils.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java -new file mode 100644 -index 0000000..d7e8f01 ---- /dev/null -+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java -@@ -0,0 +1,141 @@ -+package org.eclipse.aether.internal.impl; -+ -+/* -+ * 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. -+ */ -+ -+import java.util.Iterator; -+import java.util.List; -+ -+import org.eclipse.aether.RepositorySystemSession; -+import org.eclipse.aether.repository.ArtifactRepository; -+import org.eclipse.aether.repository.LocalRepository; -+import org.eclipse.aether.repository.RemoteRepository; -+import org.eclipse.aether.repository.RepositoryPolicy; -+import org.eclipse.aether.repository.WorkspaceReader; -+import org.eclipse.aether.repository.WorkspaceRepository; -+ -+/** -+ * @deprecated To be deleted without replacement. -+ */ -+@Deprecated -+public final class CacheUtils -+{ -+ -+ public static boolean eq( T s1, T s2 ) -+ { -+ return s1 != null ? s1.equals( s2 ) : s2 == null; -+ } -+ -+ public static int hash( Object obj ) -+ { -+ return obj != null ? obj.hashCode() : 0; -+ } -+ -+ public static int repositoriesHashCode( List repositories ) -+ { -+ int result = 17; -+ for ( RemoteRepository repository : repositories ) -+ { -+ result = 31 * result + repositoryHashCode( repository ); -+ } -+ return result; -+ } -+ -+ private static int repositoryHashCode( RemoteRepository repository ) -+ { -+ int result = 17; -+ result = 31 * result + hash( repository.getUrl() ); -+ return result; -+ } -+ -+ private static boolean repositoryEquals( RemoteRepository r1, RemoteRepository r2 ) -+ { -+ if ( r1 == r2 ) -+ { -+ return true; -+ } -+ -+ return eq( r1.getId(), r2.getId() ) && eq( r1.getUrl(), r2.getUrl() ) -+ && policyEquals( r1.getPolicy( false ), r2.getPolicy( false ) ) -+ && policyEquals( r1.getPolicy( true ), r2.getPolicy( true ) ); -+ } -+ -+ private static boolean policyEquals( RepositoryPolicy p1, RepositoryPolicy p2 ) -+ { -+ if ( p1 == p2 ) -+ { -+ return true; -+ } -+ // update policy doesn't affect contents -+ return p1.isEnabled() == p2.isEnabled() && eq( p1.getChecksumPolicy(), p2.getChecksumPolicy() ); -+ } -+ -+ public static boolean repositoriesEquals( List r1, List r2 ) -+ { -+ if ( r1.size() != r2.size() ) -+ { -+ return false; -+ } -+ -+ for ( Iterator it1 = r1.iterator(), it2 = r2.iterator(); it1.hasNext(); ) -+ { -+ if ( !repositoryEquals( it1.next(), it2.next() ) ) -+ { -+ return false; -+ } -+ } -+ -+ return true; -+ } -+ -+ public static WorkspaceRepository getWorkspace( RepositorySystemSession session ) -+ { -+ WorkspaceReader reader = session.getWorkspaceReader(); -+ return ( reader != null ) ? reader.getRepository() : null; -+ } -+ -+ public static ArtifactRepository getRepository( RepositorySystemSession session, -+ List repositories, Class repoClass, -+ String repoId ) -+ { -+ if ( repoClass != null ) -+ { -+ if ( WorkspaceRepository.class.isAssignableFrom( repoClass ) ) -+ { -+ return session.getWorkspaceReader().getRepository(); -+ } -+ else if ( LocalRepository.class.isAssignableFrom( repoClass ) ) -+ { -+ return session.getLocalRepository(); -+ } -+ else -+ { -+ for ( RemoteRepository repository : repositories ) -+ { -+ if ( repoId.equals( repository.getId() ) ) -+ { -+ return repository; -+ } -+ } -+ } -+ } -+ return null; -+ } -+ -+} diff --git a/maven-resolver.changes b/maven-resolver.changes index 9454fc0..0804247 100644 --- a/maven-resolver.changes +++ b/maven-resolver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 9 15:35:35 UTC 2019 - Fridrich Strba + +- Upgrade to upstream version 1.4.1 + ------------------------------------------------------------------- Wed Mar 20 10:26:50 UTC 2019 - Fridrich Strba diff --git a/maven-resolver.spec b/maven-resolver.spec index 7ce8d0f..63be010 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -27,7 +27,6 @@ URL: http://maven.apache.org/resolver/ Source0: http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip Source1: %{name}-build.tar.xz Patch0: maven-resolver-1.3.1-java8compat.patch -Patch1: 00-keep-deprecated-aether-CacheUtils.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes @@ -143,7 +142,6 @@ This package provides %{summary}. %prep %setup -q -a1 %patch0 -p1 -#%patch1 -p1 # tests require jetty 7 %pom_remove_dep :::test maven-resolver-transport-http