diff --git a/.gitignore b/.gitignore deleted file mode 100644 index adb38ee..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/results_* -/*.src.rpm - -/glassfish-hk2-2.5.0.tar.gz -/glassfish-hk2-extra-1.0.3.tar.gz diff --git a/0001-OSGi-metadata-fixes.patch b/0001-OSGi-metadata-fixes.patch deleted file mode 100644 index 9bae61a..0000000 --- a/0001-OSGi-metadata-fixes.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 01eeca78566d3a867d9e7142e4ef84f0a4f4c6ff Mon Sep 17 00:00:00 2001 -From: Mat Booth -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 - diff --git a/0002-Fixed-tests.patch b/0002-Fixed-tests.patch deleted file mode 100644 index 0ec1712..0000000 --- a/0002-Fixed-tests.patch +++ /dev/null @@ -1,76 +0,0 @@ -From d59ca1ac14b0ebcb9951da35959026514bdcff23 Mon Sep 17 00:00:00 2001 -From: Mat Booth -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 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/glassfish-hk2.spec b/glassfish-hk2.spec deleted file mode 100644 index 967ee00..0000000 --- a/glassfish-hk2.spec +++ /dev/null @@ -1,669 +0,0 @@ -# Set this flag to build with reduced dependency set -%bcond_without jp_minimal - -%global extra_version 1.0.3 - -Name: glassfish-hk2 -Version: 2.5.0 -Release: 6%{?dist} -Summary: Glassfish Hundred Kilobytes Kernel -License: EPL-2.0 or GPLv2 with exceptions -URL: https://github.com/eclipse-ee4j/glassfish-hk2/ -Source0: https://github.com/eclipse-ee4j/glassfish-hk2/archive/%{version}-RELEASE/%{name}-%{version}.tar.gz -Source1: https://github.com/eclipse-ee4j/glassfish-hk2-extra/archive/%{extra_version}-RELEASE/%{name}-extra-%{extra_version}.tar.gz -Source2: hk2-inhabitant-generator-osgi.bundle - -# unbundles tiger-types from hk2-utils osgi metadata and -# fixes invalid whitespace in hk2-core osgi metadata -Patch0: 0001-OSGi-metadata-fixes.patch -# fixed some test failures -Patch1: 0002-Fixed-tests.patch - -BuildRequires: maven-local -BuildRequires: mvn(aopalliance:aopalliance) -BuildRequires: mvn(javax.annotation:javax.annotation-api) -BuildRequires: mvn(javax.enterprise:cdi-api) -BuildRequires: mvn(javax.inject:javax.inject) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.shared:maven-osgi) -BuildRequires: mvn(org.easymock:easymock) -BuildRequires: mvn(org.javassist:javassist) -BuildRequires: mvn(org.osgi:osgi.cmpn) -BuildRequires: mvn(org.osgi:osgi.core) -BuildRequires: mvn(org.ow2.asm:asm-all) -%if %{without jp_minimal} -BuildRequires: mvn(args4j:args4j) -BuildRequires: mvn(com.google.inject:guice) -BuildRequires: mvn(com.google.protobuf:protobuf-java) -BuildRequires: mvn(com.sun:tools) -BuildRequires: mvn(javax.el:javax.el-api) -BuildRequires: mvn(javax.json:javax.json-api) -BuildRequires: mvn(javax.validation:validation-api) -BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(org.apache.bcel:bcel) -BuildRequires: mvn(org.apache.felix:org.apache.felix.bundlerepository) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.assertj:assertj-core) -BuildRequires: mvn(org.glassfish:javax.json) -BuildRequires: mvn(org.hibernate:hibernate-validator) -BuildRequires: mvn(org.mockito:mockito-core) -BuildRequires: mvn(org.springframework:spring-context) -BuildRequires: mvn(org.testng:testng) -%endif - -%if %{with jp_minimal} -Obsoletes: glassfish-hk2-dependency-verifier < %{version}-%{release} -Obsoletes: glassfish-hk2-dependency-visualizer < %{version}-%{release} -Obsoletes: glassfish-hk2-guice-bridge < %{version}-%{release} -Obsoletes: glassfish-hk2-spring-bridge < %{version}-%{release} -Obsoletes: glassfish-hk2-osgi < %{version}-%{release} -%endif - -BuildArch: noarch - -%description -HK2 for Hundred Kilobytes Kernel is an abstraction to -a module subsystem coupled with a simple yet powerful -component model to build server side software. - -%package hk2 -Summary: HK2 module of HK2 itself - -%description hk2 -This is so that other modules can depend on HK2 as an HK2 module. - -%package api -Summary: HK2 API module - -%description api -Hundred Kilobytes Kernel API module. - -%package core -Summary: HK2 core module - -%description core -Hundred Kilobytes Kernel core module. - -%package configuration -Summary: HK2 configuration modules - -%description configuration -Hundred Kilobytes Kernel configuration modules. - -%package extras -Summary: HK2 extras module - -%description extras -Default implementations for HK2 services. - -%package jmx -Summary: HK2 JMX module - -%description jmx -Hundred Kilobytes Kernel JMX module. - -%package locator -Summary: HK2 ServiceLocator Default Implementation - -%description locator -Hundred Kilobytes Kernel ServiceLocator Default Implementation. - -%package metadata-generator -Summary: HK2 Metadata Generator - -%description metadata-generator -HK2 Metadata Generator Subsystem. - -%package runlevel -Summary: HK2 Run Level Service - -%description runlevel -Hundred Kilobytes Kernel Run Level Service. - -%package utils -Summary: HK2 Implementation Utilities - -%description utils -Hundred Kilobytes Kernel Implementation Utilities. - -%package class-model -Summary: Class Model for Hk2 - -%description class-model -Hundred Kilobytes Kernel Class Model. - -%package osgi-resource-locator -Summary: HK2 OSGi resource locator bundle -Obsoletes: osgi-resource-locator < %{version}-%{release} -Provides: osgi-resource-locator = %{version}-%{release} - -%description osgi-resource-locator -Hundred Kilobytes Kernel - OSGi resource locator bundle. Used by -various API providers that rely on META-INF/services mechanism to -locate providers. - -%if %{without jp_minimal} -%package dependency-verifier -Summary: HK2 Static Analyser for verifying module dependency - -%description dependency-verifier -HK2 Static Analyser for verifying module dependency. - -%package dependency-visualizer -Summary: HK2 Tool to visualize the dependencies - -%description dependency-visualizer -Tool to visualize the dependencies generated by HK2's dependency-verifier. - -%package guice-bridge -Summary: HK2 Guice Bridge - -%description guice-bridge -Hundred Kilobytes Kernel Guice Bridge. - -%package spring-bridge -Summary: HK2 Spring Bridge - -%description spring-bridge -Hundred Kilobytes Kernel Spring Bridge. - -%package osgi -Summary: HK2 OSGi Adapter - -%description osgi -Hundred Kilobytes Kernel OSGi Adapter. -%endif - -%package testing -Summary: Utilities for testing with HK2 -# Obsoletes/Provides added in F30 -Obsoletes: %{name}-locator-extras < %{version}-%{release} -Provides: %{name}-locator-extras = %{version}-%{release} -Obsoletes: %{name}-locator-no-proxies < %{version}-%{release} -Provides: %{name}-locator-no-proxies = %{version}-%{release} -Obsoletes: %{name}-locator-no-proxies2 < %{version}-%{release} -Provides: %{name}-locator-no-proxies2 = %{version}-%{release} -Obsoletes: %{name}-runlevel-extras < %{version}-%{release} -Provides: %{name}-runlevel-extras = %{version}-%{release} -Obsoletes: %{name}-testng < %{version}-%{release} -Provides: %{name}-testng = %{version}-%{release} - -%description testing -Hundred Kilobytes Kernel utilities for testing. - -%package maven-plugins -Summary: HK2 Maven Plug-ins -# Obsoletes/Provides added in F30 -Obsoletes: %{name}-maven < %{version}-%{release} -Provides: %{name}-maven < %{version}-%{release} -Obsoletes: %{name}-inhabitant-generator < %{version}-%{release} -Provides: %{name}-inhabitant-generator < %{version}-%{release} - -%description maven-plugins -This package provides various maven plug-ins: -* consolidatedbundle-maven-plugin -* osgiversion-maven-plugin -* hk2-inhabitant-generator - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains API documentation for %{name}. - -%prep -%setup -q -n glassfish-hk2-%{version}-RELEASE -%patch0 -p1 -%patch1 -p1 - -# Disable tests that intermittently fail on ARM arches -sed -i -e '/org\.junit\.Ignore/s/\/\///' \ - hk2-locator/src/test/java/org/glassfish/hk2/tests/locator/multithreaded1/MultiThreaded1Test.java - -# Explode extra bundles and insert into the build -tar xf %{SOURCE1} --strip-components=1 \ - %{name}-extra-%{extra_version}-RELEASE/osgi-resource-locator \ - %{name}-extra-%{extra_version}-RELEASE/dependency-{verifier,visualizer} -%pom_xpath_set "pom:dependency[pom:groupId ='org.glassfish.hk2']/pom:version" %{version} dependency-verifier -for mod in osgi-resource-locator dependency-verifier dependency-visualizer ; do - %pom_xpath_inject "pom:modules" "$mod" - %pom_remove_parent $mod - %pom_add_parent "org.glassfish.hk2:hk2-parent:%{version}" $mod -done - -# Do not remove test resources -find . -name '*.jar' ! -name "gendir.jar" -type f -print -delete -find . -name '*.class' -print -delete - -# EE4j parent pom contains only release/nexus related stuff, we won't miss it -%pom_remove_parent bom . - -# Some Glassfish APIs that moved to the EE4j project are not yet updated in Fedora to -# provide the new Jakarta maven coords, so continue to use the old javax coords for now -%pom_change_dep -r jakarta.servlet:jakarta.servlet-api javax.servlet:javax.servlet-api -%pom_change_dep -r jakarta.annotation:jakarta.annotation-api javax.annotation:javax.annotation-api -%pom_change_dep -r jakarta.el:jakarta.el-api javax.el:javax.el-api -%pom_change_dep -r jakarta.json:jakarta.json-api javax.json:javax.json-api -%pom_change_dep -r org.glassfish:jakarta.json org.glassfish:javax.json -%pom_change_dep -r org.glassfish.hk2.external:jakarta.inject javax.inject:javax.inject - -# Use system libraries, not bundled versions -%pom_change_dep -r org.glassfish.hk2.external:asm-repackaged org.ow2.asm:asm-all:'${asm.version}' -%pom_change_dep -r org.glassfish.hk2.external:aopalliance-repackaged aopalliance:aopalliance:'${aopalliance.version}' -find class-model maven-plugins/hk2-inhabitant-generator hk2-testing/hk2-junitrunner \ - -name "*.java" -exec sed -i "s/org.glassfish.hk2.external.org.objectweb.asm/org.objectweb.asm/g" {} + - -# Fix version of deps from hk2 extra -%pom_change_dep :osgi-resource-locator ::%{extra_version} - -# Enterprise APIs are a subset of those provided by the Compendium APIs -%pom_remove_dep org.osgi:org.osgi.enterprise -%pom_change_dep :org.osgi.enterprise org.osgi:osgi.cmpn:6.0.0 class-model - -# Remove plugins not necessary for RPM builds -%pom_remove_plugin :maven-download-plugin -%pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :maven-eclipse-plugin -%pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :findbugs-maven-plugin -%pom_remove_plugin :jacoco-maven-plugin -%pom_remove_dep :jacoco-maven-plugin -%pom_remove_plugin :maven-jar-plugin osgi-resource-locator -%pom_remove_plugin :maven-source-plugin osgi-resource-locator -%pom_remove_plugin :maven-javadoc-plugin osgi-resource-locator -%pom_remove_plugin :maven-release-plugin osgi-resource-locator -%pom_remove_plugin :maven-gpg-plugin osgi-resource-locator -%pom_xpath_remove "pom:plugin[pom:artifactId ='maven-jar-plugin']/pom:executions" hk2 - -# Don't ship re-packaged external deps or examples -%pom_disable_module external -%pom_disable_module examples - -# Disable modules and tests that require org.ops4j.* -# These are not available in Fedora -%pom_disable_module osgi-adapter-test osgi/adapter-tests -%pom_remove_dep org.ops4j.pax.exam: -%pom_remove_dep org.ops4j.pax.url: -%pom_remove_dep org.ops4j.pax.logging: - -# Disable test that would introduce circular deps -%pom_disable_module jersey hk2-testing - -%if %{with jp_minimal} -# Disable modules with extra deps when building with jp_minimal -%pom_disable_module dependency-verifier -%pom_disable_module dependency-visualizer -%pom_disable_module osgi -%pom_disable_module guice-bridge -%pom_disable_module spring-bridge -%pom_remove_dep :osgi-adapter bom -%pom_remove_dep :guice-bridge bom -%pom_remove_dep :spring-bridge bom -%pom_disable_module hk2-xml hk2-configuration/persistence -# Build minimal testing utilities when building with jp_minimal -%pom_xpath_set "pom:modules" "hk2-junitrunner" hk2-testing -# Avoid dep on hibernate when building with jp_minimal -%pom_remove_dep javax.validation:validation-api hk2-utils -%pom_remove_dep org.hibernate:hibernate-validator hk2-utils -%pom_remove_dep javax.el:javax.el-api hk2-utils -rm hk2-utils/src/main/java/org/glassfish/hk2/utilities/general/ValidatorUtilities.java \ - hk2-utils/src/main/java/org/glassfish/hk2/utilities/general/internal/MessageInterpolatorImpl.java \ - hk2-utils/src/test/java/org/glassfish/hk2/utilities/test/ValidatorTest.java -%endif - -# FIXME remove a broken test -rm hk2-runlevel/src/test/java/org/glassfish/hk2/runlevel/tests/listener/ListenerErrorTest.java - -# Remove pointless unused dependencies -# Patch submitted upstream, see https://github.com/eclipse-ee4j/glassfish-hk2/pull/445 -%pom_remove_dep org.osgi:osgi_R4_core -%pom_remove_dep :com.springsource.org.junit - -# Remove some optional deps -%pom_remove_dep -r :jboss-logging -%pom_remove_dep -r :classmate - -# Disable security policy that interferes with tests -%pom_xpath_remove "pom:plugin[pom:artifactId ='maven-surefire-plugin']/pom:configuration" hk2-api -%pom_xpath_remove "pom:plugin[pom:artifactId ='maven-surefire-plugin']/pom:configuration" hk2-locator - -# Fix reference to JDK tools jar -%pom_xpath_set "pom:dependency[pom:groupId ='com.sun']/pom:artifactId" tools hk2-testing/ant -%pom_xpath_remove "pom:dependency[pom:groupId ='com.sun']/pom:scope" hk2-testing/ant -%pom_xpath_remove "pom:dependency[pom:groupId ='com.sun']/pom:systemPath" hk2-testing/ant -%pom_xpath_remove "pom:profiles/pom:profile[pom:id ='mac']" hk2-testing/ant - -# Don't put classpath in jar manifest -%pom_xpath_set "pom:addClasspath" false dependency-verifier - -mkdir -p hk2/target/classes - -# Drop pre-existent OSGI manifest file -rm maven-plugins/hk2-inhabitant-generator/src/main/resources/META-INF/MANIFEST.MF -%pom_add_plugin org.apache.felix:maven-bundle-plugin maven-plugins/hk2-inhabitant-generator ' - - - maven-plugin - - - - - bundle-manifest - process-classes - - manifest - - -' - -# Add configuration file for osgiversion plugin -cp -p %SOURCE2 maven-plugins/hk2-inhabitant-generator/osgi.bundle -%pom_add_plugin org.glassfish.hk2:osgiversion-maven-plugin:'${project.version}' maven-plugins/hk2-inhabitant-generator - -# Inject manifest file -%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin:2.4 maven-plugins/hk2-inhabitant-generator " - - - \${project.build.outputDirectory}/META-INF/MANIFEST.MF - - foo - - -" - -# fix build failure. 'useDefaultManifestFile' has been removed from the maven-jar-plugin >= 3.0.0 -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-jar-plugin']/pom:configuration/pom:useDefaultManifestFile" . hk2-utils -%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-jar-plugin']/pom:configuration/pom:archive" \ - "\${project.build.outputDirectory}/META-INF/MANIFEST.MF" hk2-utils - -# For every module that generates a OSGi manifest, add it to the jar -# Remove this when upstream moves to maven-jar-plugin >= 3.0.0 -for mod in $(grep -l maven-bundle-plugin $(find */ -name pom.xml) ) ; do - if [ "$(dirname $mod)" = "hk-utils" ] ; then - continue - fi - %pom_add_plugin org.apache.maven.plugins:maven-jar-plugin $mod " - - - \${project.build.outputDirectory}/META-INF/MANIFEST.MF - -" -done - -# Don't package unit test jars -%mvn_package ":::tests:" __noinstall - -# Create subpackages -%mvn_package ":hk2-bom" %{name} -%mvn_package ":hk2-parent" %{name} -%mvn_package ":hk2" hk2 -%mvn_package ":hk2-api" api -%mvn_package ":hk2-core" core -%mvn_package ":hk2-configuration" configuration -%mvn_package ":hk2-configuration-hub" configuration -%mvn_package ":hk2-configuration-integration" configuration -%mvn_package ":hk2-configuration-persistence" configuration -%mvn_package ":hk2-property-file" configuration -%mvn_package ":hk2-xml-parent" configuration -%mvn_package ":hk2-xml-schema" configuration -%mvn_package ":hk2-xml-integration-test" __noinstall -%mvn_package ":hk2-xml-test" __noinstall -%mvn_package ":hk2-json" configuration -%mvn_package ":hk2-pbuf" configuration -%mvn_package ":hk2-xml" configuration -%mvn_package ":hk2-extras" extras -%mvn_package ":hk2-jmx" jmx -%mvn_package ":hk2-locator" locator -%mvn_package ":hk2-metadata-generator" metadata-generator -%mvn_package ":hk2-metadata-generator-parent" metadata-generator -%mvn_package ":hk2-metadata-generator-test1" __noinstall -%mvn_package ":hk2-runlevel" runlevel -%mvn_package ":hk2-utils" utils -%mvn_package ":class-model" class-model -%mvn_package ":osgi-resource-locator" osgi-resource-locator -%mvn_package ":hk2-dependency-verifier" dependency-verifier -%mvn_package ":hk2-dependency-visualizer" dependency-visualizer -%mvn_package ":guice-bridge" guice-bridge -%mvn_package ":spring-bridge" spring-bridge -%mvn_package ":osgi" osgi -%mvn_package ":osgi-adapter" osgi -%mvn_package ":osgi-adapter-tests-parent" __noinstall -%mvn_package ":contract-bundle" __noinstall -%mvn_package ":faux-sdp-bundle" __noinstall -%mvn_package ":no-hk2-bundle" __noinstall -%mvn_package ":osgi-adapter-test" __noinstall -%mvn_package ":sdp-management-bundle" __noinstall -%mvn_package ":test-module-startup" __noinstall - -# Testing modules -%mvn_package ":hk2-testing" testing -%mvn_package ":hk2-ant-test" testing -%mvn_package ":hk2-collections-tests" testing -%mvn_package ":hk2-junitrunner" testing -%mvn_package ":hk2-locator-extras" testing -%mvn_package ":hk2-locator-no-proxies" testing -%mvn_package ":hk2-locator-no-proxies2" testing -%mvn_package ":hk2-mockito" testing -%mvn_package ":hk2-runlevel-extras" testing -%mvn_package ":hk2-testng" testing -%mvn_package ":interceptor-events" testing - -# Maven plug-ins -%mvn_package ":maven-plugins" maven-plugins -%mvn_package ":consolidatedbundle-maven-plugin" maven-plugins -%mvn_package ":hk2-inhabitant-generator" maven-plugins -%mvn_package ":osgiversion-maven-plugin" maven-plugins - -%build -%mvn_build -- -Dhk2.mvn.plugins.version=%{version} - -%install -%mvn_install - -%files -f .mfiles-%{name} -%doc README.md -%license LICENSE.md NOTICE.md - -%files hk2 -f .mfiles-hk2 -%license LICENSE.md NOTICE.md - -%files api -f .mfiles-api -%license LICENSE.md NOTICE.md - -%files core -f .mfiles-core -%license LICENSE.md NOTICE.md - -%files configuration -f .mfiles-configuration -%license LICENSE.md NOTICE.md - -%files extras -f .mfiles-extras -%license LICENSE.md NOTICE.md - -%files jmx -f .mfiles-jmx -%license LICENSE.md NOTICE.md - -%files locator -f .mfiles-locator -%license LICENSE.md NOTICE.md - -%files metadata-generator -f .mfiles-metadata-generator -%license LICENSE.md NOTICE.md - -%files runlevel -f .mfiles-runlevel -%license LICENSE.md NOTICE.md - -%files utils -f .mfiles-utils -%license LICENSE.md NOTICE.md - -%files class-model -f .mfiles-class-model -%license LICENSE.md NOTICE.md - -%files osgi-resource-locator -f .mfiles-osgi-resource-locator -%license LICENSE.md NOTICE.md - -%if %{without jp_minimal} -%files dependency-verifier -f .mfiles-dependency-verifier -%license LICENSE.md NOTICE.md - -%files dependency-visualizer -f .mfiles-dependency-visualizer -%doc dependency-visualizer/README -%license LICENSE.md NOTICE.md - -%files guice-bridge -f .mfiles-guice-bridge -%license LICENSE.md NOTICE.md - -%files spring-bridge -f .mfiles-spring-bridge -%license LICENSE.md NOTICE.md - -%files osgi -f .mfiles-osgi -%license LICENSE.md NOTICE.md -%endif - -%files testing -f .mfiles-testing -%license LICENSE.md NOTICE.md - -%files maven-plugins -f .mfiles-maven-plugins -%license LICENSE.md NOTICE.md - -%files javadoc -f .mfiles-javadoc -%license LICENSE.md NOTICE.md - -%changelog -* Tue Jan 28 2020 Fedora Release Engineering - 2.5.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 10 2019 Fabio Valentini - 2.5.0-5 -- Build only with minimized dependencies. -- Remove a broken test to fix the build. - -* Thu Jul 25 2019 Fedora Release Engineering - 2.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 11 2019 Mat Booth - 2.5.0-3 -- Disable tests that intermittently fail on ARM arches - -* Sat Mar 16 2019 Mat Booth - 2.5.0-2 -- Handle OSGi metadata in a more sensible way - -* Fri Mar 08 2019 Mat Booth - 2.5.0-1 -- Update to latest upstream release -- HK2 moved to Eclipse EE4j project -- Update license tag CDDL->EPL -- Don't ship integration test jars - -* Thu Jan 31 2019 Fedora Release Engineering - 2.4.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Dec 09 2018 Mat Booth - 2.4.0-11 -- Add jp_minimal condition build functionality - -* Fri Jul 13 2018 Fedora Release Engineering - 2.4.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.4.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.4.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.4.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jun 30 2016 Mat Booth - 2.4.0-6 -- Fix invalid osgi metadata due to bnd instructions in osgi.bundle files - being ignored by new bnd version -- Fix syntax errors in osgi.bundle files for strict new bnd version - -* Thu Jun 30 2016 gil cattaneo 2.4.0-5 -- add missing build requires - -* Wed Jun 22 2016 gil cattaneo 2.4.0-4 -- fix build failure - -* Fri Apr 29 2016 gil cattaneo 2.4.0-3 -- rebuilt with tiger-types 2.2 - -* Wed Feb 03 2016 Fedora Release Engineering - 2.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 15 2016 gil cattaneo 2.4.0-1 -- update to 2.4.0 - -* Wed Oct 14 2015 gil cattaneo 2.4.0-0.10.b32 -- update to 2.4.0-b32 - -* Wed Aug 19 2015 gil cattaneo 2.4.0-0.9.b31 -- fix some commit problems - -* Tue Aug 18 2015 gil cattaneo 2.4.0-0.8.b31 -- update to 2.4.0-b31 - -* Wed Jun 17 2015 Fedora Release Engineering - 2.4.0-0.7.b25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Jun 08 2015 gil cattaneo 2.4.0-0.6.b25 -- update to 2.4.0-b25 - -* Wed May 27 2015 gil cattaneo 2.4.0-0.5.b24 -- generate hk2-inhabitant-generator OSGi manifest - -* Mon May 25 2015 gil cattaneo 2.4.0-0.4.b24 -- fix failure on directory creation - -* Mon May 25 2015 gil cattaneo 2.4.0-0.3.b24 -- enable javadoc sub package - -* Mon May 25 2015 gil cattaneo 2.4.0-0.2.b24 -- remove empty javadoc sub package - -* Sat May 23 2015 gil cattaneo 2.4.0-0.1.b24 -- update to 2.4.0-b24 - -* Mon May 04 2015 gil cattaneo 2.3.0-1 -- update to 2.3.0 - -* Fri Feb 27 2015 Michal Srb - 2.1.93-9 -- Use mvn()-like BRs - -* Tue Feb 03 2015 gil cattaneo 2.1.93-8 -- introduce license macro - -* Sat Jun 07 2014 Fedora Release Engineering - 2.1.93-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 09 2014 Michal Srb - 2.1.93-6 -- Remove BR: apt-maven-plugin - -* Fri Mar 28 2014 Michael Simacek - 2.1.93-5 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Nov 14 2013 gil cattaneo 2.1.93-4 -- use objectweb-asm3 - -* Sat Aug 03 2013 Fedora Release Engineering - 2.1.93-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 10 2013 gil cattaneo 2.1.93-2 -- switch to XMvn -- minor changes to adapt to current guideline - -* Tue May 14 2013 gil cattaneo 2.1.93-1 -- update to 2.1.93 - -* Fri Apr 26 2013 gil cattaneo 2.1.92-1 -- update to 2.1.92 - -* Sat Oct 13 2012 gil cattaneo 2.1.37-1 -- update to 2.1.37 - -* Sat Oct 06 2012 gil cattaneo 2.1.35-1 -- update to 2.1.35 - -* Sat Aug 25 2012 gil cattaneo 2.1.34-1 -- initial rpm diff --git a/hk2-inhabitant-generator-osgi.bundle b/hk2-inhabitant-generator-osgi.bundle deleted file mode 100644 index 41797a3..0000000 --- a/hk2-inhabitant-generator-osgi.bundle +++ /dev/null @@ -1,4 +0,0 @@ --exportcontents: \ - org.jvnet.hk2.generator; \ - org.jvnet.hk2.generator.maven; \ - version=${project.osgi.version} \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 30bd737..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (glassfish-hk2-2.5.0.tar.gz) = 636ed19669a7cbbc7bf94b3721f6ada480e9ee5ba0308b5266eafb519c37c7c80222c6b347b2cc50ac65fc915980d1c253aa3296d220171c596f5437c8c0204c -SHA512 (glassfish-hk2-extra-1.0.3.tar.gz) = 2838a3581970c9519b1fb6e9a9435f6b2ee22a909438b7259684e68e2347048f7a95d8b0b605b9b11dce8527e7f4cdf9b4e9d4e100b51bf97fffaccba7007527