[maven] Update to Sisu 0.1.0 and Guice 3.1.6
by Mikolaj Izdebski
commit dbd13e666c7f6c12615bb3ef70905e45c01c2f58
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Nov 13 14:58:56 2013 +0100
Update to Sisu 0.1.0 and Guice 3.1.6
0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch | 197 +++++++++++++++++++++++
maven.spec | 14 ++-
2 files changed, 207 insertions(+), 4 deletions(-)
---
diff --git a/0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch b/0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch
new file mode 100644
index 0000000..801b287
--- /dev/null
+++ b/0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch
@@ -0,0 +1,197 @@
+From 2247f2e0b045c4b7a99e830ee0c032c787560cbc Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Wed, 13 Nov 2013 14:32:23 +0100
+Subject: [PATCH] Update to Sisu 0.1.0 and Guice 3.1.6
+
+Sisu depends on Guice, but dependency scope changed from "compile" to
+"provided" in Sisu 0.1.0. As a Sisu user, Maven needs to have runtime
+dependency on Guice.
+---
+ apache-maven/pom.xml | 12 ++++++++++++
+ maven-aether-provider/pom.xml | 6 +++++-
+ maven-compat/pom.xml | 12 ++++++++++++
+ maven-core/pom.xml | 11 +++++++++++
+ maven-embedder/pom.xml | 11 +++++++++++
+ maven-model-builder/pom.xml | 12 ++++++++++++
+ maven-plugin-api/pom.xml | 12 ++++++++++++
+ pom.xml | 4 ++--
+ 8 files changed, 77 insertions(+), 3 deletions(-)
+
+diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
+index 0b56fa8..f7b1267 100644
+--- a/apache-maven/pom.xml
++++ b/apache-maven/pom.xml
+@@ -57,6 +57,18 @@
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </dependency>
++ <dependency>
++ <groupId>org.sonatype.sisu</groupId>
++ <artifactId>sisu-guice</artifactId>
++ <classifier>no_aop</classifier>
++ <scope>runtime</scope>
++ <exclusions>
++ <exclusion>
++ <groupId>aopalliance</groupId>
++ <artifactId>aopalliance</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
+ <!-- CLI -->
+ <dependency>
+ <groupId>commons-cli</groupId>
+diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
+index 62ce127..a71fa47 100644
+--- a/maven-aether-provider/pom.xml
++++ b/maven-aether-provider/pom.xml
+@@ -80,7 +80,6 @@ under the License.
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ <classifier>no_aop</classifier>
+- <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+@@ -88,6 +87,11 @@ under the License.
+ </exclusion>
+ </exclusions>
+ </dependency>
++ <dependency>
++ <groupId>javax.inject</groupId>
++ <artifactId>javax.inject</artifactId>
++ <version>1</version>
++ </dependency>
+ <!-- Testing -->
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
+index ee6ace7..cf690b8 100644
+--- a/maven-compat/pom.xml
++++ b/maven-compat/pom.xml
+@@ -64,6 +64,18 @@
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </dependency>
+ <dependency>
++ <groupId>org.sonatype.sisu</groupId>
++ <artifactId>sisu-guice</artifactId>
++ <classifier>no_aop</classifier>
++ <scope>runtime</scope>
++ <exclusions>
++ <exclusion>
++ <groupId>aopalliance</groupId>
++ <artifactId>aopalliance</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+diff --git a/maven-core/pom.xml b/maven-core/pom.xml
+index 713ffcc..b873e0b 100644
+--- a/maven-core/pom.xml
++++ b/maven-core/pom.xml
+@@ -82,6 +82,17 @@
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </dependency>
+ <dependency>
++ <groupId>org.sonatype.sisu</groupId>
++ <artifactId>sisu-guice</artifactId>
++ <classifier>no_aop</classifier>
++ <exclusions>
++ <exclusion>
++ <groupId>aopalliance</groupId>
++ <artifactId>aopalliance</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ </dependency>
+diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
+index 01f6179..0b464ca 100644
+--- a/maven-embedder/pom.xml
++++ b/maven-embedder/pom.xml
+@@ -65,6 +65,17 @@
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </dependency>
+ <dependency>
++ <groupId>org.sonatype.sisu</groupId>
++ <artifactId>sisu-guice</artifactId>
++ <classifier>no_aop</classifier>
++ <exclusions>
++ <exclusion>
++ <groupId>aopalliance</groupId>
++ <artifactId>aopalliance</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
+index 9150460..a7317c0 100644
+--- a/maven-model-builder/pom.xml
++++ b/maven-model-builder/pom.xml
+@@ -54,6 +54,18 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
++ <groupId>org.sonatype.sisu</groupId>
++ <artifactId>sisu-guice</artifactId>
++ <classifier>no_aop</classifier>
++ <scope>test</scope>
++ <exclusions>
++ <exclusion>
++ <groupId>aopalliance</groupId>
++ <artifactId>aopalliance</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.3</version>
+diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
+index d899721..5a41bcd 100644
+--- a/maven-plugin-api/pom.xml
++++ b/maven-plugin-api/pom.xml
+@@ -58,6 +58,18 @@ under the License.
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </dependency>
++ <dependency>
++ <groupId>org.sonatype.sisu</groupId>
++ <artifactId>sisu-guice</artifactId>
++ <classifier>no_aop</classifier>
++ <scope>runtime</scope>
++ <exclusions>
++ <exclusion>
++ <groupId>aopalliance</groupId>
++ <artifactId>aopalliance</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
+ </dependencies>
+
+ <build>
+diff --git a/pom.xml b/pom.xml
+index 889ba1d..f6c3246 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -51,8 +51,8 @@
+ <plexusUtilsVersion>3.0.15</plexusUtilsVersion>
+ <!-- last Java5 release of Guava -->
+ <guavaVersion>11.0.2</guavaVersion>
+- <guiceVersion>3.1.3</guiceVersion>
+- <sisuInjectVersion>0.0.0.M5</sisuInjectVersion>
++ <guiceVersion>3.1.6</guiceVersion>
++ <sisuInjectVersion>0.1.0</sisuInjectVersion>
+ <wagonVersion>2.4</wagonVersion>
+ <securityDispatcherVersion>1.3</securityDispatcherVersion>
+ <cipherVersion>1.7</cipherVersion>
+--
+1.8.1.4
+
diff --git a/maven.spec b/maven.spec
index 684dba4..db09d94 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,6 +1,6 @@
Name: maven
Version: 3.1.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -19,6 +19,8 @@ Patch101: 0001-Migrate-from-easymock-1-to-easymock-3.patch
# Forwarded upstream (MNG-5502)
Patch200: 0001-Update-Aether-to-0.9.0.M3.patch
+# Forwarded upstream (MNG-5534)
+Patch201: 0001-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch
BuildArch: noarch
@@ -44,7 +46,7 @@ BuildRequires: atinject
BuildRequires: buildnumber-maven-plugin
BuildRequires: cglib
BuildRequires: easymock3
-BuildRequires: google-guice >= 3.0
+BuildRequires: google-guice >= 3.1.6
BuildRequires: hamcrest
BuildRequires: httpcomponents-core
BuildRequires: httpcomponents-client
@@ -70,8 +72,8 @@ BuildRequires: plexus-containers-container-default
BuildRequires: plexus-interpolation
BuildRequires: plexus-sec-dispatcher
BuildRequires: plexus-utils >= 3.0.10
-BuildRequires: sisu-inject >= 1:0
-BuildRequires: sisu-plexus >= 1:0
+BuildRequires: sisu-inject >= 1:0.1
+BuildRequires: sisu-plexus >= 1:0.1
BuildRequires: slf4j
BuildRequires: xmlunit
BuildRequires: mvn(ch.qos.logback:logback-classic)
@@ -143,6 +145,7 @@ Group: Documentation
%patch100 -p1
%patch101 -p1
%patch200 -p1
+%patch201 -p1
# not really used during build, but a precaution
rm maven-ant-tasks-*.jar
@@ -265,6 +268,9 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog
+* Wed Nov 13 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-14
+- Update to Sisu 0.1.0 and Guice 3.1.6
+
* Fri Nov 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-13
- Add wagon-http-shared4 to plexus.core
10 years, 7 months
Broken dependencies: maven-doxia
by Fedora Koji Build System
maven-doxia has broken dependencies in the rawhide tree:
On x86_64:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On i386:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On armhfp:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
Please resolve this as soon as possible.
10 years, 7 months
[sisu-mojos] Update to upstream version 0.1.0
by Mikolaj Izdebski
commit 5f4b7725373177b7b3fba8270aee21160b711ce4
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Nov 13 13:35:38 2013 +0100
Update to upstream version 0.1.0
.gitignore | 1 +
sisu-mojos.spec | 13 +++++++------
sources | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7119db7..37875c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/sisu-mojos-0.0.0.M5.tar.bz2
+/sisu-mojos-0.1.0.tar.bz2
diff --git a/sisu-mojos.spec b/sisu-mojos.spec
index e2d7987..7021a9f 100644
--- a/sisu-mojos.spec
+++ b/sisu-mojos.spec
@@ -1,14 +1,12 @@
-%global vertag M5
-
Name: sisu-mojos
-Version: 0.0.0
-Release: 0.1.%{vertag}%{?dist}
+Version: 0.1.0
+Release: 1%{?dist}
Summary: Sisu plugin for Apache Maven
License: EPL
URL: http://www.eclipse.org/sisu
BuildArch: noarch
-Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.mojos.git/snapshot/milesto...
+Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.mojos.git/snapshot/release...
BuildRequires: maven-local
BuildRequires: mvn(com.google.guava:guava)
@@ -34,7 +32,7 @@ This package contains %{summary}.
%prep
%setup -q -c
-mv milestones/%{version}.%{vertag}/* .
+mv releases/%{version}/* .
# Animal Sniffer is not useful in Fedora
%pom_remove_plugin :animal-sniffer-maven-plugin
@@ -52,6 +50,9 @@ mv milestones/%{version}.%{vertag}/* .
%doc LICENSE.txt
%changelog
+* Wed Nov 13 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.1.0-1
+- Update to upstream version 0.1.0
+
* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.0.0-0.1.M5
- Initial packaging.
- Fix unowned directory
diff --git a/sources b/sources
index 32e891c..343e922 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98dbb74be073a82b6548ab67a95f3ea8 sisu-mojos-0.0.0.M5.tar.bz2
+cfe1dd17da15e126accf29d8b08987a8 sisu-mojos-0.1.0.tar.bz2
10 years, 7 months
[sisu-mojos] Fix unowned directory
by Mikolaj Izdebski
commit 26056b7acbb7e82be7a18b78ba742fcfe6d35c87
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Nov 13 13:30:54 2013 +0100
Fix unowned directory
sisu-mojos.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/sisu-mojos.spec b/sisu-mojos.spec
index 7d8d31c..e2d7987 100644
--- a/sisu-mojos.spec
+++ b/sisu-mojos.spec
@@ -45,6 +45,7 @@ mv milestones/%{version}.%{vertag}/* .
%mvn_install
%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc LICENSE.txt
%files javadoc -f .mfiles-javadoc
@@ -53,3 +54,4 @@ mv milestones/%{version}.%{vertag}/* .
%changelog
* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.0.0-0.1.M5
- Initial packaging.
+- Fix unowned directory
10 years, 7 months
[sisu-mojos] Initial packaging.
by Mikolaj Izdebski
commit d301903d3aa8f7b7b30967aface10ad27e3a12f4
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Nov 13 13:28:26 2013 +0100
Initial packaging.
.gitignore | 1 +
sisu-mojos.spec | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 57 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..7119db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/sisu-mojos-0.0.0.M5.tar.bz2
diff --git a/sisu-mojos.spec b/sisu-mojos.spec
new file mode 100644
index 0000000..7d8d31c
--- /dev/null
+++ b/sisu-mojos.spec
@@ -0,0 +1,55 @@
+%global vertag M5
+
+Name: sisu-mojos
+Version: 0.0.0
+Release: 0.1.%{vertag}%{?dist}
+Summary: Sisu plugin for Apache Maven
+License: EPL
+URL: http://www.eclipse.org/sisu
+BuildArch: noarch
+
+Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.mojos.git/snapshot/milesto...
+
+BuildRequires: maven-local
+BuildRequires: mvn(com.google.guava:guava)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.slf4j:slf4j-nop)
+BuildRequires: mvn(org.sonatype.oss:oss-parent)
+BuildRequires: mvn(org.sonatype.sisu:sisu-guice)
+
+%description
+The Sisu Plugin for Maven provides mojos to generate
+META-INF/sisu/javax.inject.Named index files for the Sisu container.
+
+%package javadoc
+Summary: API documentation for %{name}
+
+%description javadoc
+This package contains %{summary}.
+
+%prep
+%setup -q -c
+mv milestones/%{version}.%{vertag}/* .
+# Animal Sniffer is not useful in Fedora
+%pom_remove_plugin :animal-sniffer-maven-plugin
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE.txt
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
+
+%changelog
+* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.0.0-0.1.M5
+- Initial packaging.
diff --git a/sources b/sources
index e69de29..32e891c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+98dbb74be073a82b6548ab67a95f3ea8 sisu-mojos-0.0.0.M5.tar.bz2
10 years, 7 months
[javapackages] [doc] Change section name
by Michal Srb
commit 2306a7096c3795bed2be81abb61cc32893b14454
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Nov 13 10:49:55 2013 +0100
[doc] Change section name
"OpenJDK" -> "Java implementation in Fedora"
doc/fedora_java_specifics.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/doc/fedora_java_specifics.txt b/doc/fedora_java_specifics.txt
index 91bfd10..d4eba69 100644
--- a/doc/fedora_java_specifics.txt
+++ b/doc/fedora_java_specifics.txt
@@ -2,7 +2,7 @@ This section contains information about default Java implementation in
Fedora, switching between different Java runtime environments and about
few useful tools which can be used during packaging/development.
-=== OpenJDK
+=== Java implementation in Fedora
Fedora ships with reference implementation of Java Standard Edition 7
called http://openjdk.java.net/OpenJDK[OpenJDK]. OpenJDK provides Java
Runtime Environment for Java applications and set of development tools
10 years, 7 months
[javapackages] [doc] Use list
by Michal Srb
commit 83b03f63ef7659448eac2f18323098489a7255ec
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Nov 13 10:47:51 2013 +0100
[doc] Use list
doc/fedora_java_specifics.txt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/doc/fedora_java_specifics.txt b/doc/fedora_java_specifics.txt
index 41527e8..91bfd10 100644
--- a/doc/fedora_java_specifics.txt
+++ b/doc/fedora_java_specifics.txt
@@ -21,14 +21,14 @@ $ java org/fedoraproject/helloworld/HelloWorld.class
OpenJDK provides a lot of interesting tools for Java developers:
-`javac` is a Java compiler which translates source files
+ - `javac` is a Java compiler which translates source files
to Java bytecode, which can be later interpreted by JVM.
-`jdb` is a simple command-line debugger for Java applications.
+ - `jdb` is a simple command-line debugger for Java applications.
-`javadoc` is a tool for generating Javadoc documentation.
+ - `javadoc` is a tool for generating Javadoc documentation.
-`javap` can be used for disassembling Java class files.
+ - `javap` can be used for disassembling Java class files.
==== Switching between different Java implementations
10 years, 7 months
