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