[ini4j] Update to newer upstream release - 0.5.1
Omair Majid
omajid at fedoraproject.org
Tue Jun 28 16:02:45 UTC 2011
commit 317930dbfdeae407859cf09232d237cbb2d43f30
Author: Omair Majid <omajid at redhat.com>
Date: Tue Jun 28 12:02:08 2011 -0400
Update to newer upstream release - 0.5.1
.gitignore | 1 +
ini4j.spec | 24 ++++++++-----
remove-checkstyle-and-pmd-checks.patch | 59 ++++++++++++++++++++++++++++++++
remove-test-dependencies.patch | 18 ++++++---
remove-translator.patch | 48 ++++++++++++-------------
remove-wagon.patch | 8 ++--
sources | 2 +-
7 files changed, 115 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb22408..a5298bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
ini4j-0.4.1-src.zip
/ini4j-0.4.1-src.zip
+/ini4j-0.5.1-src.zip
diff --git a/ini4j.spec b/ini4j.spec
index bb48346..92b752a 100644
--- a/ini4j.spec
+++ b/ini4j.spec
@@ -1,24 +1,29 @@
Name: ini4j
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
Summary: Java API for handling files in Windows .ini format
Group: Development/Libraries
License: ASL 2.0
URL: http://www.ini4j.org/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.zip
-# bug 665544: problem in depmap supplied by plexus-mail-sender
+# maven-changes-plugin requires javax-activation (which is part of JRE)
Source1: %{name}.depmap
Patch0: remove-translator.patch
Patch1: remove-wagon.patch
Patch2: fix-maven-license-plugin.patch
Patch3: remove-test-dependencies.patch
-Patch4: javadoc-encoding.patch
+# disable checkstyle and pmd; both fail when running over the release
+# thanks to heffer for pointing this out
+Patch4: remove-checkstyle-and-pmd-checks.patch
BuildArch: noarch
# See http://ini4j.sourceforge.net/dependencies.html
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: maven
+
+BuildRequires: javamail
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-changes-plugin
@@ -60,7 +65,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q
# remove existing binaries
-find . -type f \( -iname "*.jar" -o -iname "*.class" -o -iname "*.exe" \) | \
+find . -type f \( -iname "*.jar" -o -iname "*.class" -o -iname "*.exe" -o -iname "*.so" \) | \
xargs -t rm -f
%patch0 -p1
%patch1 -p1
@@ -77,8 +82,8 @@ mkdir -p $MAVEN_REPO_LOCAL
# available in fedora yet. So disable tests for now.
# Will also need to add the correct depmap for jetty when tests are enabled.
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+mvn-rpmbuild \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:javadoc
@@ -121,8 +126,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Tue Jun 28 2011 Omair Majid <omajid at redhat.com> 0.5.1-1
+- Update to newer upstream release
+- Use maven 3 to build
* Thu Jan 13 2011 Omair Majid <omajid at redhat.com> 0.4.1-3
- Update based on package review.
diff --git a/remove-checkstyle-and-pmd-checks.patch b/remove-checkstyle-and-pmd-checks.patch
new file mode 100644
index 0000000..31c47a3
--- /dev/null
+++ b/remove-checkstyle-and-pmd-checks.patch
@@ -0,0 +1,59 @@
+--- ini4j-0.5.1/pom.xml 2011-06-27 19:30:51.780845266 -0400
++++ ini4j-0.5.1/pom.xml 2011-06-27 19:31:42.466470001 -0400
+@@ -119,56 +119,6 @@
+ </activation>
+ <build>
+ <plugins>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-checkstyle-plugin</artifactId>
+- <configuration>
+- <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
+- <failOnViolation>true</failOnViolation>
+- <consoleOutput>true</consoleOutput>
+- <encoding>UTF-8</encoding>
+- <skip>${check.skip}</skip>
+- </configuration>
+- <executions>
+- <execution>
+- <phase>verify</phase>
+- <goals>
+- <goal>check</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+-
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-pmd-plugin</artifactId>
+- <dependencies>
+- <dependency>
+- <groupId>pmd</groupId>
+- <artifactId>pmd-jdk14</artifactId>
+- <version>4.2.5</version>
+- </dependency>
+- </dependencies>
+- <configuration>
+- <failOnViolation>true</failOnViolation>
+- <rulesets>
+- <ruleset>${basedir}/src/conf/pmd.xml</ruleset>
+- </rulesets>
+- <skip>${check.skip}</skip>
+- <verbose>true</verbose>
+- <sourceEncoding>UTF-8</sourceEncoding>
+- <targetJdk>1.5</targetJdk>
+- </configuration>
+- <executions>
+- <execution>
+- <phase>verify</phase>
+- <goals>
+- <goal>check</goal>
+-<!-- <goal>cpd-check</goal> -->
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
diff --git a/remove-test-dependencies.patch b/remove-test-dependencies.patch
index add026f..96eb5d3 100644
--- a/remove-test-dependencies.patch
+++ b/remove-test-dependencies.patch
@@ -1,9 +1,9 @@
---- a/pom.xml 2010-12-23 13:11:11.143336083 -0500
-+++ b/pom.xml 2010-12-23 14:21:30.860359960 -0500
-@@ -58,30 +58,6 @@
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
+--- ini4j-0.5.1.orig/pom.xml 2011-06-16 13:50:39.956171740 -0400
++++ ini4j-0.5.1/pom.xml 2011-06-16 14:08:51.919296514 -0400
+@@ -53,36 +53,12 @@
+ </developer>
+ </developers>
+ <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
@@ -28,6 +28,12 @@
- <version>2.3</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>2.0b4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
<upload.url>scp://shell.sourceforge.net/incoming/s/sz/szkiba/uploads</upload.url>
diff --git a/remove-translator.patch b/remove-translator.patch
index 453c4ec..35ddef8 100644
--- a/remove-translator.patch
+++ b/remove-translator.patch
@@ -1,26 +1,24 @@
---- a/pom.xml 2010-12-23 13:11:11.143336083 -0500
-+++ b/pom.xml 2010-12-23 13:12:36.712711766 -0500
-@@ -253,23 +253,6 @@
- </plugin>
+--- ini4j-0.5.1.orig/pom.xml 2011-06-16 13:50:39.956171740 -0400
++++ ini4j-0.5.1/pom.xml 2011-06-16 13:52:29.587296502 -0400
+@@ -171,21 +171,6 @@
+ </plugin>
- <plugin>
-- <groupId>org.codehaus.mojo</groupId>
-- <artifactId>retrotranslator-maven-plugin</artifactId>
-- <executions>
-- <execution>
-- <phase>deploy</phase>
-- <goals>
-- <goal>translate-project</goal>
-- </goals>
-- <configuration>
-- <classifier>jdk14</classifier>
-- <attach>true</attach>
-- </configuration>
-- </execution>
-- </executions>
-- </plugin>
--
-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
+ <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>retrotranslator-maven-plugin</artifactId>
+- <executions>
+- <execution>
+- <goals>
+- <goal>translate-project</goal>
+- </goals>
+- <configuration>
+- <classifier>jdk14</classifier>
+- <attach>true</attach>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
diff --git a/remove-wagon.patch b/remove-wagon.patch
index 2866122..b5c37fd 100644
--- a/remove-wagon.patch
+++ b/remove-wagon.patch
@@ -1,6 +1,6 @@
---- a/pom.xml 2010-12-23 13:11:11.143336083 -0500
-+++ b/pom.xml 2010-12-23 13:29:22.504462645 -0500
-@@ -318,25 +318,6 @@
+--- ini4j-0.5.1.orig/pom.xml 2011-06-16 13:50:39.956171740 -0400
++++ ini4j-0.5.1/pom.xml 2011-06-16 14:01:20.809171404 -0400
+@@ -359,25 +344,6 @@
</executions>
</plugin>
<plugin>
@@ -25,4 +25,4 @@
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <configuration>
+ <version>2.0</version>
diff --git a/sources b/sources
index 7b3c35a..0b86fa0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73f7c4a5f010d5b968425b8415132eb1 ini4j-0.4.1-src.zip
+39c71adf786b5ee0a95ccf348f838951 ini4j-0.5.1-src.zip
More information about the scm-commits
mailing list