public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hawtjni] epel10: Update to upstream version 1.15
@ 2026-07-17 9:03 Michael Simacek
0 siblings, 0 replies; only message in thread
From: Michael Simacek @ 2026-07-17 9:03 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/hawtjni
Branch : epel10
Commit : b526b22cf394c4056ba8b224a0c4aba02f07424b
Author : Michael Simacek <msimacek@redhat.com>
Date : 2017-06-15T10:41:17+02:00
Stats : +15/-195 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/hawtjni/c/b526b22cf394c4056ba8b224a0c4aba02f07424b?branch=epel10
Log:
Update to upstream version 1.15
---
diff --git a/.gitignore b/.gitignore
index def4846..4a73cf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/hawtjni-1.8.tar.xz
/hawtjni-project-1.9.tar.gz
/hawtjni-project-1.10.tar.gz
+/hawtjni-project-1.15.tar.gz
diff --git a/0001-Fix-shading-and-remove-unneeded-modules.patch b/0001-Fix-shading-and-remove-unneeded-modules.patch
deleted file mode 100644
index 1a08e02..0000000
--- a/0001-Fix-shading-and-remove-unneeded-modules.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 226e8614bd078479c3f99712f63f6dfbf1c46b0c Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Thu, 19 Jan 2012 17:12:16 +0100
-Subject: [PATCH 1/3] Fix shading and remove unneeded modules
-
----
- hawtjni-generator/pom.xml | 28 ----------------------------
- maven-hawtjni-plugin/pom.xml | 7 +++++++
- pom.xml | 2 --
- 3 files changed, 7 insertions(+), 30 deletions(-)
-
-diff --git a/hawtjni-generator/pom.xml b/hawtjni-generator/pom.xml
-index fac8cc2..35b8aaa 100644
---- a/hawtjni-generator/pom.xml
-+++ b/hawtjni-generator/pom.xml
-@@ -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 --git a/maven-hawtjni-plugin/pom.xml b/maven-hawtjni-plugin/pom.xml
-index 8ef99be..c0f4109 100644
---- a/maven-hawtjni-plugin/pom.xml
-+++ b/maven-hawtjni-plugin/pom.xml
-@@ -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 --git a/pom.xml b/pom.xml
-index fe2e17b..dfad938 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -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>
---
-1.7.7.4
-
diff --git a/0002-Fix-xbean-compatibility.patch b/0002-Fix-xbean-compatibility.patch
deleted file mode 100644
index e0286d0..0000000
--- a/0002-Fix-xbean-compatibility.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6ffdfd242299afb283d619c8ff9d5ce96853f160 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Thu, 19 Jan 2012 17:12:42 +0100
-Subject: [PATCH 2/3] Fix xbean compatibility
-
----
- .../org/fusesource/hawtjni/generator/HawtJNI.java | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java
-index b4727c2..bf710eb 100755
---- a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java
-+++ b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/HawtJNI.java
-@@ -402,7 +402,7 @@ public class HawtJNI {
-
- @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);
---
-1.7.7.4
-
diff --git a/0003-Remove-plexus-maven-plugin-dependency.patch b/0003-Remove-plexus-maven-plugin-dependency.patch
deleted file mode 100644
index bdf6336..0000000
--- a/0003-Remove-plexus-maven-plugin-dependency.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 61963f6f7827459c551a03985e273d5feb65e55c Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Thu, 19 Jan 2012 17:13:50 +0100
-Subject: [PATCH 3/3] Remove plexus-maven-plugin dependency
-
----
- maven-hawtjni-plugin/pom.xml | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/maven-hawtjni-plugin/pom.xml b/maven-hawtjni-plugin/pom.xml
-index c0f4109..efdd192 100644
---- a/maven-hawtjni-plugin/pom.xml
-+++ b/maven-hawtjni-plugin/pom.xml
-@@ -139,12 +139,12 @@
- </plugin>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
-- <artifactId>plexus-maven-plugin</artifactId>
-- <version>1.3.8</version>
-+ <artifactId>plexus-component-metadata</artifactId>
-+ <version>1.5.5</version>
- <executions>
- <execution>
- <goals>
-- <goal>descriptor</goal>
-+ <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
---
-1.7.7.4
-
diff --git a/0004-Remove-eclipse-plugin.patch b/0004-Remove-eclipse-plugin.patch
deleted file mode 100644
index 5cd63a9..0000000
--- a/0004-Remove-eclipse-plugin.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2d5b5a47b8b4eccaa053261728b438966bf6c44f Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Wed, 18 Apr 2012 18:24:31 +0200
-Subject: [PATCH 4/4] Remove eclipse plugin
-
----
- pom.xml | 10 ----------
- 1 files changed, 0 insertions(+), 10 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index dfad938..40cab61 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -132,16 +132,6 @@
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-eclipse-plugin</artifactId>
-- <version>2.5.1</version>
-- <configuration>
-- <downloadSources>true</downloadSources>
-- <downloadJavadocs>true</downloadJavadocs>
-- </configuration>
-- </plugin>
--
-- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
---
-1.7.7.6
-
diff --git a/hawtjni.spec b/hawtjni.spec
index cde826c..6b3c2f2 100644
--- a/hawtjni.spec
+++ b/hawtjni.spec
@@ -1,6 +1,6 @@
Name: hawtjni
-Version: 1.10
-Release: 9%{?dist}
+Version: 1.15
+Release: 1%{?dist}
Summary: Code generator that produces the JNI code
License: ASL 2.0 and EPL and BSD
URL: http://hawtjni.fusesource.org/
@@ -8,11 +8,6 @@ BuildArch: noarch
Source0: https://github.com/fusesource/hawtjni/archive/hawtjni-project-%{version}.tar.gz
-Patch0: 0001-Fix-shading-and-remove-unneeded-modules.patch
-Patch1: 0002-Fix-xbean-compatibility.patch
-Patch2: 0003-Remove-plexus-maven-plugin-dependency.patch
-Patch3: 0004-Remove-eclipse-plugin.patch
-
BuildRequires: maven-local
BuildRequires: mvn(commons-cli:commons-cli)
BuildRequires: mvn(org.apache.maven:maven-archiver)
@@ -65,22 +60,19 @@ This package allows to use HawtJNI from a maven plugin.
%prep
%setup -q -n hawtjni-hawtjni-project-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%pom_disable_module hawtjni-example
+%pom_add_dep org.apache.maven:maven-compat maven-hawtjni-plugin
+%pom_remove_plugin -r :maven-shade-plugin
+%pom_remove_plugin -r :maven-eclipse-plugin
-# Ready to replace patch0
-# %pom_disable_module hawtjni-example
-# %pom_disable_module hawtjni-website
-# %pom_add_dep "org.apache.maven:maven-compat:3.0.3" maven-hawtjni-plugin/pom.xml
-# %pom_remove_plugin ":maven-shade-plugin" hawtjni-generator/pom.xml
+pushd maven-hawtjni-plugin
+%pom_xpath_set 'pom:plugin[pom:artifactId="plexus-maven-plugin"]/pom:artifactId' plexus-component-metadata
+%pom_xpath_set 'pom:plugin[pom:artifactId="plexus-component-metadata"]//pom:goal' generate-metadata
+popd
%mvn_package ":hawtjni-runtime" runtime
%mvn_package ":maven-hawtjni-plugin" maven-plugin
-%pom_xpath_set "pom:groupId[text()='asm']" org.ow2.asm hawtjni-generator
-
# javadoc generation fails due to strict doclint in JDK 8
%pom_remove_plugin :maven-javadoc-plugin hawtjni-runtime
@@ -91,7 +83,6 @@ This package allows to use HawtJNI from a maven plugin.
%mvn_install
%files runtime -f .mfiles-runtime
-%dir %{_javadir}/%{name}
%doc readme.md license.txt changelog.md
%files -f .mfiles
@@ -102,6 +93,9 @@ This package allows to use HawtJNI from a maven plugin.
%files -n maven-hawtjni-plugin -f .mfiles-maven-plugin
%changelog
+* Wed Jun 14 2017 Michael Simacek <msimacek@redhat.com> - 1.15-1
+- Update to upstream version 1.15
+
* Mon Feb 13 2017 Michael Simacek <msimacek@redhat.com> - 1.10-9
- Add Requires on make
diff --git a/sources b/sources
index b0ffee9..44db691 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc37edc5858f9e647150a3813bbab347 hawtjni-project-1.10.tar.gz
+SHA512 (hawtjni-project-1.15.tar.gz) = 1a93658bf8621c770cf97b546c6a5c0cf1821b06cb16dbc872ad0c830c599d3947ffe56b4cca16217a510d4e929ebcfc5eabdf4ad4364f5225b53d22c7d48abb
^ 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: Update to upstream version 1.15 Michael Simacek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox