Add backward compatible package path for lifecycles
- Remove temporary BRs/Rs
This commit is contained in:
parent
cbdbaceb2f
commit
012cd02573
@ -35,4 +35,15 @@
|
|||||||
<artifactId>reporting-api</artifactId>
|
<artifactId>reporting-api</artifactId>
|
||||||
</jpp>
|
</jpp>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- for snakeyaml -->
|
||||||
|
<dependency>
|
||||||
|
<maven>
|
||||||
|
<groupId>com.google.gdata</groupId>
|
||||||
|
<artifactId>gdata-core</artifactId>
|
||||||
|
</maven>
|
||||||
|
<jpp>
|
||||||
|
<groupId>JPP</groupId>
|
||||||
|
<artifactId>gdata/gdata-core</artifactId>
|
||||||
|
</jpp>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
29
sisu.spec
29
sisu.spec
@ -1,6 +1,6 @@
|
|||||||
Name: sisu
|
Name: sisu
|
||||||
Version: 2.2.3
|
Version: 2.2.3
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Sonatype dependency injection framework
|
Summary: Sonatype dependency injection framework
|
||||||
|
|
||||||
|
|
||||||
@ -37,26 +37,8 @@ BuildRequires: atinject
|
|||||||
BuildRequires: felix-framework
|
BuildRequires: felix-framework
|
||||||
BuildRequires: forge-parent
|
BuildRequires: forge-parent
|
||||||
BuildRequires: maven-surefire-provider-testng
|
BuildRequires: maven-surefire-provider-testng
|
||||||
|
|
||||||
# to get out of cyclic build failures, should be removed in next release
|
|
||||||
# maven-resources-plugin
|
|
||||||
BuildRequires: plexus-build-api
|
|
||||||
Requires: plexus-build-api
|
|
||||||
|
|
||||||
# maven-compiler-plugin
|
|
||||||
BuildRequires: plexus-compiler
|
|
||||||
Requires: plexus-compiler
|
|
||||||
|
|
||||||
# maven-site-plugin and maven-dependency-plugin
|
|
||||||
BuildRequires: maven-shared-reporting-api
|
|
||||||
Requires: maven-shared-reporting-api
|
|
||||||
|
|
||||||
# maven-surefire providers (various)
|
|
||||||
BuildRequires: maven-surefire-provider-junit4
|
BuildRequires: maven-surefire-provider-junit4
|
||||||
BuildRequires: maven-surefire-provider-junit
|
|
||||||
|
|
||||||
# maven-dependency-plugin
|
|
||||||
BuildRequires: maven-shared-file-management
|
|
||||||
|
|
||||||
Requires: forge-parent
|
Requires: forge-parent
|
||||||
Requires: google-guice
|
Requires: google-guice
|
||||||
@ -82,6 +64,11 @@ Requires: jpackage-utils
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
|
# add backward compatible location
|
||||||
|
cp sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/src/main/java/org/sonatype/guice/plexus/lifecycles/*java \
|
||||||
|
sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/src/main/java/org/codehaus/plexus/
|
||||||
|
sed -i 's/org.sonatype.guice.plexus.lifecycles/org.codehaus.plexus/' \
|
||||||
|
sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/src/main/java/org/codehaus/plexus/*java
|
||||||
|
|
||||||
# TODO enable guice-eclipse
|
# TODO enable guice-eclipse
|
||||||
sed -i 's:.*guice-eclipse.*::g' sisu-inject/pom.xml
|
sed -i 's:.*guice-eclipse.*::g' sisu-inject/pom.xml
|
||||||
@ -186,6 +173,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 19 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.3-2
|
||||||
|
- Add backward compatible package path for lifecycles
|
||||||
|
- Remove temporary BRs/Rs
|
||||||
|
|
||||||
* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.3-1
|
* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.3-1
|
||||||
- Update to latest upstream 2.2.3 (#683795)
|
- Update to latest upstream 2.2.3 (#683795)
|
||||||
- Add forge-parent to Requires
|
- Add forge-parent to Requires
|
||||||
|
Loading…
Reference in New Issue
Block a user