Hello community, here is the log from the commit of package glassfish-hk2 for openSUSE:Factory checked in at 2020-03-26 23:33:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glassfish-hk2 (Old) and /work/SRC/openSUSE:Factory/.glassfish-hk2.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glassfish-hk2" Thu Mar 26 23:33:08 2020 rev:2 rq:788440 version:2.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/glassfish-hk2/glassfish-hk2.changes 2020-03-06 21:33:23.073775176 +0100 +++ /work/SRC/openSUSE:Factory/.glassfish-hk2.new.3160/glassfish-hk2.changes 2020-03-26 23:33:18.134775649 +0100 @@ -1,0 +2,18 @@ +Thu Mar 26 07:50:52 UTC 2020 - Fridrich Strba <fst...@suse.com> + +- Update to version 2.5.0 +- Removed patch: + * glassfish-hk2-2.3.0-hk2-utils-osgi_bundle.patch + + fixes included in 0001-OSGi-metadata-fixes.patch +- Added patches: + * 0001-OSGi-metadata-fixes.patch + + unbundles tiger-types from hk2-utils + + fixes invalid whitespace in hk2-core + * 0002-Fixed-tests.patch +- Modified patch: + * hk2-jdk11.patch + + fixes com.sun.enterprise.module.Module vs java.lang.Module + ambiguity + + rediff to changed context + +------------------------------------------------------------------- Old: ---- 2.4.0.tar.gz glassfish-LICENSE.txt glassfish-hk2-2.3.0-hk2-utils-osgi_bundle.patch New: ---- 0001-OSGi-metadata-fixes.patch 0002-Fixed-tests.patch glassfish-hk2-2.5.0.tar.gz glassfish-hk2-extra-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glassfish-hk2.spec ++++++ ++++ 931 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/glassfish-hk2/glassfish-hk2.spec ++++ and /work/SRC/openSUSE:Factory/.glassfish-hk2.new.3160/glassfish-hk2.spec ++++++ 0001-OSGi-metadata-fixes.patch ++++++ >From 01eeca78566d3a867d9e7142e4ef84f0a4f4c6ff Mon Sep 17 00:00:00 2001 From: Mat Booth <mat.bo...@redhat.com> Date: Fri, 8 Mar 2019 15:53:38 +0000 Subject: [PATCH 1/2] OSGi metadata fixes: * unbundles tiger-types from hk2-utils * fixes invalid whitespace in hk2-core --- class-model/osgi.bundle | 30 +++++++++++++++--------------- hk2-api/osgi.bundle | 30 +++++++++++++++--------------- hk2-core/osgi.bundle | 3 ++- hk2-utils/osgi.bundle | 31 +++++++++++++++---------------- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/class-model/osgi.bundle b/class-model/osgi.bundle index 3e8ba69..72905ec 100755 --- a/class-model/osgi.bundle +++ b/class-model/osgi.bundle @@ -1,18 +1,18 @@ -/* - * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ +# +# Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License v. 2.0, which is available at +# http://www.eclipse.org/legal/epl-2.0. +# +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the +# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, +# version 2 with the GNU Classpath Exception, which is available at +# https://www.gnu.org/software/classpath/license.html. +# +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +# Bundle-Activator: org.glassfish.hk2.classmodel.reflect.util.ClassModelActivator diff --git a/hk2-api/osgi.bundle b/hk2-api/osgi.bundle index be5033d..e08de48 100755 --- a/hk2-api/osgi.bundle +++ b/hk2-api/osgi.bundle @@ -1,18 +1,18 @@ -/* - * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ +# +# Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License v. 2.0, which is available at +# http://www.eclipse.org/legal/epl-2.0. +# +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the +# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, +# version 2 with the GNU Classpath Exception, which is available at +# https://www.gnu.org/software/classpath/license.html. +# +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +# -exportcontents: \ com.sun.hk2.component; \ diff --git a/hk2-core/osgi.bundle b/hk2-core/osgi.bundle index f9db7c6..1e4fd15 100755 --- a/hk2-core/osgi.bundle +++ b/hk2-core/osgi.bundle @@ -24,4 +24,5 @@ com.sun.enterprise.module.single; \ com.sun.enterprise.module.impl; version=${project.osgi.version} -Import-Package: \ * +Import-Package: \ + * diff --git a/hk2-utils/osgi.bundle b/hk2-utils/osgi.bundle index 4f3779a..fad6317 100755 --- a/hk2-utils/osgi.bundle +++ b/hk2-utils/osgi.bundle @@ -1,18 +1,18 @@ -/* - * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ +# +# Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License v. 2.0, which is available at +# http://www.eclipse.org/legal/epl-2.0. +# +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the +# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, +# version 2 with the GNU Classpath Exception, which is available at +# https://www.gnu.org/software/classpath/license.html. +# +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +# -exportcontents: \ org.glassfish.hk2.utilities.cache; \ @@ -20,7 +20,6 @@ org.glassfish.hk2.utilities.reflection; \ org.glassfish.hk2.utilities.reflection.internal; \ org.jvnet.hk2.component; \ - org.jvnet.tiger_types; \ version=${project.osgi.version} DynamicImport-Package: * -- 2.20.1 ++++++ 0002-Fixed-tests.patch ++++++ >From d59ca1ac14b0ebcb9951da35959026514bdcff23 Mon Sep 17 00:00:00 2001 From: Mat Booth <mat.bo...@redhat.com> Date: Sun, 10 Mar 2019 16:58:48 +0000 Subject: [PATCH 2/2] Fixed tests --- .../hk2/xml/test/interop/InteropTest.java | 16 ++++++++-------- .../hk2/examples/runlevel/test/PrimaryITest.java | 2 +- .../examples/runlevel/test/SecondaryITest.java | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hk2-configuration/persistence/hk2-xml/test1/src/test/java/org/glassfish/hk2/xml/test/interop/InteropTest.java b/hk2-configuration/persistence/hk2-xml/test1/src/test/java/org/glassfish/hk2/xml/test/interop/InteropTest.java index 5c256a8..e47204a 100755 --- a/hk2-configuration/persistence/hk2-xml/test1/src/test/java/org/glassfish/hk2/xml/test/interop/InteropTest.java +++ b/hk2-configuration/persistence/hk2-xml/test1/src/test/java/org/glassfish/hk2/xml/test/interop/InteropTest.java @@ -80,11 +80,11 @@ public class InteropTest { byte asBytes[] = baos.toByteArray(); String asString = new String(asBytes); - Assert.assertTrue("Incorrect String: " + asString, asString.contains("\"name\": \"Alice\"")); - Assert.assertTrue(asString.contains("\"name\": \"Bob\"")); + Assert.assertTrue("Incorrect String: " + asString, asString.contains("\"name\":\"Alice\"")); + Assert.assertTrue(asString.contains("\"name\":\"Bob\"")); - Assert.assertTrue(asString.contains("\"houseNumber\": 100")); - Assert.assertTrue(asString.contains("\"houseNumber\": 200")); + Assert.assertTrue(asString.contains("\"houseNumber\":100")); + Assert.assertTrue(asString.contains("\"houseNumber\":200")); } /** @@ -270,11 +270,11 @@ public class InteropTest { byte asBytes[] = baos.toByteArray(); String asString = new String(asBytes); - Assert.assertTrue(asString.contains("\"name\": \"Alice\"")); - Assert.assertTrue(asString.contains("\"name\": \"Bob\"")); + Assert.assertTrue(asString.contains("\"name\":\"Alice\"")); + Assert.assertTrue(asString.contains("\"name\":\"Bob\"")); - Assert.assertTrue(asString.contains("\"houseNumber\": 100")); - Assert.assertTrue(asString.contains("\"houseNumber\": 200")); + Assert.assertTrue(asString.contains("\"houseNumber\":100")); + Assert.assertTrue(asString.contains("\"houseNumber\":200")); } private static byte[] readURLCompletely(URL url) throws IOException { diff --git a/hk2-testing/hk2-runlevel-extras/src/test/java/org/jvnet/hk2/examples/runlevel/test/PrimaryITest.java b/hk2-testing/hk2-runlevel-extras/src/test/java/org/jvnet/hk2/examples/runlevel/test/PrimaryITest.java index 2a81481..a29e173 100755 --- a/hk2-testing/hk2-runlevel-extras/src/test/java/org/jvnet/hk2/examples/runlevel/test/PrimaryITest.java +++ b/hk2-testing/hk2-runlevel-extras/src/test/java/org/jvnet/hk2/examples/runlevel/test/PrimaryITest.java @@ -32,7 +32,7 @@ public class PrimaryITest { @Inject Kernel lifeCycle; - @Test + @Test(enabled=false) public void test() { System.out.println("Running primary integration test"); } diff --git a/hk2-testing/hk2-runlevel-extras/src/test/java/org/jvnet/hk2/examples/runlevel/test/SecondaryITest.java b/hk2-testing/hk2-runlevel-extras/src/test/java/org/jvnet/hk2/examples/runlevel/test/SecondaryITest.java index b787b15..d42a2d6 100755 --- a/hk2-testing/hk2-runlevel-extras/src/test/java/org/jvnet/hk2/examples/runlevel/test/SecondaryITest.java +++ b/hk2-testing/hk2-runlevel-extras/src/test/java/org/jvnet/hk2/examples/runlevel/test/SecondaryITest.java @@ -32,7 +32,7 @@ public class SecondaryITest { @Inject Kernel lifeCycle; - @Test + @Test(enabled=false) public void test() { System.out.println("Running secondary integration test"); } -- 2.20.1 ++++++ hk2-jdk11.patch ++++++ --- /var/tmp/diff_new_pack.jLP6A5/_old 2020-03-26 23:33:18.938775939 +0100 +++ /var/tmp/diff_new_pack.jLP6A5/_new 2020-03-26 23:33:18.938775939 +0100 @@ -1,7 +1,7 @@ -diff -urEbwB hk2-2.4.0/hk2-core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java hk2-2.4.0.new/hk2-core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java ---- hk2-2.4.0/hk2-core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java 2016-01-05 20:52:26.000000000 +0100 -+++ hk2-2.4.0.new/hk2-core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java 2019-12-13 16:08:16.114729257 +0100 -@@ -79,8 +79,8 @@ +diff -urEbwB glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java +--- glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java 2020-03-24 16:11:30.751539739 +0100 ++++ glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java 2020-03-24 16:11:47.559629638 +0100 +@@ -55,8 +55,8 @@ return new ModulesRegistryImpl(this); } @@ -12,7 +12,7 @@ for (ModuleLifecycleListener l : getLifecycleListeners()) { l.moduleInstalled(m); } -@@ -88,7 +88,7 @@ +@@ -64,7 +64,7 @@ } protected List<ActiveDescriptor> parseInhabitants( @@ -21,7 +21,7 @@ throws IOException { return ((ModuleImpl)module).parseInhabitants(name, postProcessors); } -@@ -110,7 +110,7 @@ +@@ -86,7 +86,7 @@ } ModuleId id = AbstractFactory.getInstance().createModuleId(moduleName, version); @@ -30,7 +30,7 @@ if (module!=null) { ModuleImpl privateModule = (ModuleImpl)newModule(module.getModuleDefinition()); -@@ -165,7 +165,7 @@ +@@ -141,7 +141,7 @@ } ClassLoaderProxy cl = new ClassLoaderProxy(new URL[0], parent); for (ModuleDefinition def : defs) { @@ -39,7 +39,7 @@ cl.addDelegate(module.getClassLoader()); } -@@ -196,7 +196,7 @@ +@@ -172,7 +172,7 @@ } @@ -48,10 +48,10 @@ ClassLoader cl = clazz.getClassLoader(); if(cl==null) return null; if (cl instanceof ModuleClassLoader) -diff -urEbwB hk2-2.4.0/hk2-core/src/main/java/com/sun/enterprise/module/single/ProxyModule.java hk2-2.4.0.new/hk2-core/src/main/java/com/sun/enterprise/module/single/ProxyModule.java ---- hk2-2.4.0/hk2-core/src/main/java/com/sun/enterprise/module/single/ProxyModule.java 2016-01-05 20:52:26.000000000 +0100 -+++ hk2-2.4.0.new/hk2-core/src/main/java/com/sun/enterprise/module/single/ProxyModule.java 2019-12-13 16:01:48.632550619 +0100 -@@ -51,7 +51,7 @@ +diff -urEbwB glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/single/ProxyModule.java glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/single/ProxyModule.java +--- glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/single/ProxyModule.java 2020-03-24 16:11:30.751539739 +0100 ++++ glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/single/ProxyModule.java 2020-03-24 16:11:47.559629638 +0100 +@@ -27,7 +27,7 @@ * * @author Jerome Dochez */ @@ -60,7 +60,7 @@ final ClassLoader classLoader; final ModuleDefinition moduleDef; -@@ -113,15 +113,15 @@ +@@ -89,15 +89,15 @@ return classLoader; } @@ -80,10 +80,10 @@ throw new UnsupportedOperationException("Inports cannot be added dynamically to static modules"); } -diff -urEbwB hk2-2.4.0/hk2-core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java hk2-2.4.0.new/hk2-core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java ---- hk2-2.4.0/hk2-core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java 2016-01-05 20:52:26.000000000 +0100 -+++ hk2-2.4.0.new/hk2-core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java 2019-12-13 16:04:45.729546354 +0100 -@@ -65,7 +65,7 @@ +diff -urEbwB glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java +--- glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java 2020-03-24 16:11:30.751539739 +0100 ++++ glassfish-hk2-2.5.0-RELEASE/hk2-core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java 2020-03-24 16:11:47.559629638 +0100 +@@ -41,7 +41,7 @@ public class SingleModulesRegistry extends ModulesRegistryImpl { final ClassLoader singleClassLoader; @@ -92,7 +92,7 @@ public SingleModulesRegistry(ClassLoader singleCL) { this(singleCL, null); -@@ -90,34 +90,34 @@ +@@ -66,34 +66,34 @@ } @Override @@ -134,10 +134,10 @@ throws IOException { ArrayList<PopulatorPostProcessor> allPostProcessors = new ArrayList<PopulatorPostProcessor>(); -diff -urEbwB hk2-2.4.0/hk2-testing/collections/src/main/java/org/glassfish/hk2/testing/collections/AbstractCollectionTest.java hk2-2.4.0.new/hk2-testing/collections/src/main/java/org/glassfish/hk2/testing/collections/AbstractCollectionTest.java ---- hk2-2.4.0/hk2-testing/collections/src/main/java/org/glassfish/hk2/testing/collections/AbstractCollectionTest.java 2016-01-05 20:52:26.000000000 +0100 -+++ hk2-2.4.0.new/hk2-testing/collections/src/main/java/org/glassfish/hk2/testing/collections/AbstractCollectionTest.java 2019-12-13 16:21:49.071327338 +0100 -@@ -792,7 +792,7 @@ +diff -urEbwB glassfish-hk2-2.5.0-RELEASE/hk2-testing/collections/src/main/java/org/glassfish/hk2/testing/collections/AbstractCollectionTest.java glassfish-hk2-2.5.0-RELEASE/hk2-testing/collections/src/main/java/org/glassfish/hk2/testing/collections/AbstractCollectionTest.java +--- glassfish-hk2-2.5.0-RELEASE/hk2-testing/collections/src/main/java/org/glassfish/hk2/testing/collections/AbstractCollectionTest.java 2020-03-24 16:11:30.791539954 +0100 ++++ glassfish-hk2-2.5.0-RELEASE/hk2-testing/collections/src/main/java/org/glassfish/hk2/testing/collections/AbstractCollectionTest.java 2020-03-24 16:11:47.559629638 +0100 +@@ -769,7 +769,7 @@ public void testCollectionToArrayWithArgumentWithNullThrows() { Collection collection = createEmptyCollection();
