public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hawtjni] epel10: Upstream release 1.5
@ 2026-07-17 9:03 Marek Goldmann
0 siblings, 0 replies; only message in thread
From: Marek Goldmann @ 2026-07-17 9:03 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/hawtjni
Branch : epel10
Commit : 99dfc9fbf3b8e646e541277a9fd5b6bf6a93ddf7
Author : Marek Goldmann <goldmann@fedoraproject.org>
Date : 2012-01-15T09:28:41-05:00
Stats : +93/-71 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/hawtjni/c/99dfc9fbf3b8e646e541277a9fd5b6bf6a93ddf7?branch=epel10
Log:
Upstream release 1.5
---
diff --git a/.gitignore b/.gitignore
index 8f73fba..a568433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/hawtjni-1.1.tar.xz
/hawtjni-1.2.tar.xz
/hawtjni-1.3.tar.xz
+/hawtjni-1.5.tar.xz
diff --git a/hawtjni-1.3-pom.patch b/hawtjni-1.3-pom.patch
deleted file mode 100644
index 1421ce1..0000000
--- a/hawtjni-1.3-pom.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naur hawtjni-1.3/hawtjni-generator/pom.xml hawtjni-1.3-work//hawtjni-generator/pom.xml
---- hawtjni-1.3/hawtjni-generator/pom.xml 2011-08-08 16:00:43.000000000 -0400
-+++ hawtjni-1.3-work//hawtjni-generator/pom.xml 2011-08-10 07:50:18.047509576 -0400
-@@ -67,33 +67,4 @@
- <version>1.0</version>
- </dependency>
- </dependencies>
--
-- <build>
-- <plugins>
--
-- <!-- include all the dependencies into the jar so it can run standalone -->
-- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-shade-plugin</artifactId>
-- <version>1.3</version>
-- <executions>
-- <execution>
-- <phase>package</phase>
-- <goals>
-- <goal>shade</goal>
-- </goals>
-- <configuration>
-- <artifactSet>
-- <excludes>
-- <exclude>junit:junit</exclude>
-- </excludes>
-- </artifactSet>
-- </configuration>
-- </execution>
-- </executions>
-- </plugin>
--
-- </plugins>
-- </build>
--
- </project>
-diff -Naur hawtjni-1.3/maven-hawtjni-plugin/pom.xml hawtjni-1.3-work//maven-hawtjni-plugin/pom.xml
---- hawtjni-1.3/maven-hawtjni-plugin/pom.xml 2011-08-08 16:00:43.000000000 -0400
-+++ hawtjni-1.3-work//maven-hawtjni-plugin/pom.xml 2011-08-10 08:02:53.922507991 -0400
-@@ -74,6 +74,12 @@
-
- <dependency>
- <groupId>org.apache.maven</groupId>
-+ <artifactId>maven-compat</artifactId>
-+ <version>3.0.3</version>
-+ </dependency>
-+
-+ <dependency>
-+ <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <version>2.0</version>
- </dependency>
-diff -Naur hawtjni-1.3/pom.xml hawtjni-1.3-work//pom.xml
---- hawtjni-1.3/pom.xml 2011-08-08 16:00:43.000000000 -0400
-+++ hawtjni-1.3-work//pom.xml 2011-08-10 07:49:51.090498936 -0400
-@@ -210,8 +210,6 @@
- <module>hawtjni-runtime</module>
- <module>hawtjni-generator</module>
- <module>maven-hawtjni-plugin</module>
-- <module>hawtjni-example</module>
-- <module>hawtjni-website</module>
- </modules>
-
- </project>
diff --git a/hawtjni-1.5-pom.patch b/hawtjni-1.5-pom.patch
new file mode 100644
index 0000000..3e4b04d
--- /dev/null
+++ b/hawtjni-1.5-pom.patch
@@ -0,0 +1,68 @@
+diff -Naur hawtjni-1.5/hawtjni-generator/pom.xml hawtjni-1.5-work/hawtjni-generator/pom.xml
+--- hawtjni-1.5/hawtjni-generator/pom.xml 2011-09-21 12:20:30.000000000 -0400
++++ hawtjni-1.5-work/hawtjni-generator/pom.xml 2012-01-14 21:16:52.849967350 -0500
+@@ -68,32 +68,4 @@
+ </dependency>
+ </dependencies>
+
+- <build>
+- <plugins>
+-
+- <!-- include all the dependencies into the jar so it can run standalone -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-shade-plugin</artifactId>
+- <version>1.3</version>
+- <executions>
+- <execution>
+- <phase>package</phase>
+- <goals>
+- <goal>shade</goal>
+- </goals>
+- <configuration>
+- <artifactSet>
+- <excludes>
+- <exclude>junit:junit</exclude>
+- </excludes>
+- </artifactSet>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+-
+- </plugins>
+- </build>
+-
+ </project>
+diff -Naur hawtjni-1.5/maven-hawtjni-plugin/pom.xml hawtjni-1.5-work/maven-hawtjni-plugin/pom.xml
+--- hawtjni-1.5/maven-hawtjni-plugin/pom.xml 2011-09-21 12:20:30.000000000 -0400
++++ hawtjni-1.5-work/maven-hawtjni-plugin/pom.xml 2012-01-15 08:58:39.970261531 -0500
+@@ -74,9 +74,16 @@
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0</version>
+ </dependency>
++
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+diff -Naur hawtjni-1.5/pom.xml hawtjni-1.5-work/pom.xml
+--- hawtjni-1.5/pom.xml 2011-09-21 12:20:30.000000000 -0400
++++ hawtjni-1.5-work/pom.xml 2012-01-14 21:15:42.238961785 -0500
+@@ -210,8 +210,6 @@
+ <module>hawtjni-runtime</module>
+ <module>hawtjni-generator</module>
+ <module>maven-hawtjni-plugin</module>
+- <module>hawtjni-example</module>
+- <module>hawtjni-website</module>
+ </modules>
+
+ </project>
diff --git a/hawtjni-1.5-xbean.patch b/hawtjni-1.5-xbean.patch
new file mode 100644
index 0000000..e9ccf6e
--- /dev/null
+++ b/hawtjni-1.5-xbean.patch
@@ -0,0 +1,12 @@
+diff -Naur hawtjni-1.5/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java hawtjni-1.5-work/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java
+--- hawtjni-1.5/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java 2011-09-21 12:20:30.000000000 -0400
++++ hawtjni-1.5-work/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java 2012-01-15 09:15:52.681253759 -0500
+@@ -402,7 +402,7 @@
+
+ @SuppressWarnings("unchecked")
+ private void collectMatchingClasses(ClassFinder finder, Class annotation, LinkedHashSet<Class<?>> collector) {
+- List<Class> annotated = finder.findAnnotatedClasses(annotation);
++ List<Class<?>> annotated = finder.findAnnotatedClasses(annotation);
+ for (Class<?> clazz : annotated) {
+ if( packages.isEmpty() ) {
+ collector.add(clazz);
diff --git a/hawtjni.spec b/hawtjni.spec
index 228a61c..ad27e70 100644
--- a/hawtjni.spec
+++ b/hawtjni.spec
@@ -1,15 +1,16 @@
Name: hawtjni
-Version: 1.3
-Release: 2%{?dist}
+Version: 1.5
+Release: 1%{?dist}
Summary: Code generator that produces the JNI code
Group: Development/Libraries
License: ASL 2.0 and EPL and BSD
URL: http://hawtjni.fusesource.org/
# git clone git://github.com/fusesource/hawtjni.git
-# cd hawtjni && git archive --format=tar --prefix=hawtjni-1.3/ hawtjni-project-1.3 | xz > hawtjni-1.3.tar.xz
+# cd hawtjni && git archive --format=tar --prefix=hawtjni-1.5/ hawtjni-project-1.5 | xz > hawtjni-1.5.tar.xz
Source0: %{name}-%{version}.tar.xz
Patch0: %{name}-%{version}-pom.patch
+Patch1: %{name}-%{version}-xbean.patch
BuildArch: noarch
@@ -17,6 +18,7 @@ BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: maven
BuildRequires: maven-compiler-plugin
+BuildRequires: plexus-maven-plugin
BuildRequires: maven-idea-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-surefire-report-plugin
@@ -30,11 +32,11 @@ BuildRequires: maven-surefire-provider-junit4
BuildRequires: log4j
BuildRequires: junit4
BuildRequires: fusesource-pom
-BuildRequires: xbean >= 3.7-7
+BuildRequires: xbean
Requires: java
Requires: jpackage-utils
-Requires: xbean >= 3.7-7
+Requires: xbean
Requires: apache-commons-cli
Requires: asm2
@@ -69,6 +71,7 @@ This package allows to use HawtJNI from a maven plugin.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
mvn-rpmbuild install javadoc:aggregate
@@ -114,6 +117,9 @@ install -pm 644 maven-%{name}-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-
%{_javadir}/maven-%{name}-plugin.jar
%changelog
+* Sun Jan 15 2012 Marek Goldmann <mgoldman@redhat.com> 1.5-1
+- Upstream release 1.5
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 32a592e..690d831 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5fdbe48e91eb0b49febb2fe0562ca8b hawtjni-1.3.tar.xz
+84ae53887776bf12b5e9ec6d8fa2644b hawtjni-1.5.tar.xz
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-17 9:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-17 9:03 [rpms/hawtjni] epel10: Upstream release 1.5 Marek Goldmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox