[maven-scm] Update to upstream 1.5 release.
by Alexander Kurtakov
commit f0134ddb369a9ff5540b8edcfc764beedacbc7ab
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Apr 5 10:25:14 2011 +0300
Update to upstream 1.5 release.
Build with maven 3.
.gitignore | 1 +
002_maven-scm_fix-svn-provider-build.patch | 11 -----
maven-scm-jpp-depmap.xml | 28 +-------------
maven-scm.spec | 58 +++++++++++----------------
sources | 2 +-
5 files changed, 27 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 550a912..18aa7f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-scm-1.2.tar.xz
/maven-scm-1.4.tar.xz
+maven-scm-1.5-source-release.zip
diff --git a/maven-scm-jpp-depmap.xml b/maven-scm-jpp-depmap.xml
index 006bec5..f7f135c 100644
--- a/maven-scm-jpp-depmap.xml
+++ b/maven-scm-jpp-depmap.xml
@@ -1,31 +1,5 @@
<dependencies>
- <dependency>
- <maven>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.3</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>regexp</artifactId>
- <version>1.3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0.3</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0.3</version>
- </jpp>
- </dependency>
-
- <dependency>
+ <dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
diff --git a/maven-scm.spec b/maven-scm.spec
index 16ad2db..2b8fa4b 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -28,39 +28,31 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global maven_settings_file %{_builddir}/%{name}/settings.xml
-%global namedversion 1.4
-
Name: maven-scm
-Version: 1.4
-Release: 6%{?dist}
+Version: 1.5
+Release: 1%{?dist}
Epoch: 0
Summary: Common API for doing SCM operations
License: ASL 2.0
Group: Development/Libraries
URL: http://maven.apache.org/scm
-# svn export
-# http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.4/ maven-scm-1.4/
-# tar cJf maven-scm-1.4.tar.xz maven-scm-1.4/
-Source0: %{name}-%{namedversion}.tar.xz
+Source0: http://repo1.maven.org/maven2/org/apache/maven/scm/%{name}/%{version}/%{n...
Source1: %{name}-jpp-depmap.xml
# remove dependency on mockito per accurev provider tests
Patch0: 001_maven-scm_remove-mockito-test-dep.patch
-# fix package name in svn provider
-Patch1: 002_maven-scm_fix-svn-provider-build.patch
# fix a missing cast (plexus-container-default version mismatch?)
-Patch3: 004_maven-scm_fix-svn-provider-java.patch
+Patch1: 004_maven-scm_fix-svn-provider-java.patch
# fix modello configuration in vss provider pom and the cast as above
-Patch4: 005_maven-scm_fix-vss-provider-pom.patch
-Patch5: 006_maven-scm_fix-vss-provider-java.patch
+Patch2: 005_maven-scm_fix-vss-provider-pom.patch
+Patch3: 006_maven-scm_fix-vss-provider-java.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: maven2 >= 2.0.6
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -70,35 +62,35 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-invoker-plugin
-BuildRequires: maven-shared-invoker
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven2-common-poms >= 0:1.0-21
BuildRequires: modello >= 1.1
BuildRequires: netbeans-cvsclient
BuildRequires: plexus-utils >= 1.5.6
-BuildRequires: saxon-scripts
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-interpolation
BuildRequires: bzr
+BuildRequires: subversion
BuildRequires: plexus-maven-plugin
BuildRequires: plexus-classworlds
Requires: junit >= 3.8.2
-Requires: jakarta-commons-collections >= 3.1
+Requires: apache-commons-collections >= 3.1
Requires: modello >= 1.0-0.a8
Requires: netbeans-cvsclient >= 6.9
Requires: jakarta-oro >= 2.0.8
Requires: plexus-utils >= 1.2
Requires: velocity >= 1.4
+Requires: maven
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
%description
-Maven SCM supports Maven 2.x plugins (e.g. maven-release-plugin) and other
+Maven SCM supports Maven plugins (e.g. maven-release-plugin) and other
tools (e.g. Continum) in providing them a common API for doing SCM operations.
%package test
@@ -112,6 +104,7 @@ Tests for %{name}.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -120,29 +113,22 @@ Javadoc for %{name}.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
# We dont have mockito, needed for accurev tests, disable for now
find maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev -type f -name "*Test*" -exec rm -f '{}' \;
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
install javadoc:aggregate
%install
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
for jar in `find . -type f -name "*.jar" | grep -E "target/.*.jar$"`; do
newname=`basename $jar`
@@ -160,12 +146,12 @@ for i in `find . -name pom.xml | grep -v \\\./pom.xml | \
artifactname=`basename \`dirname $i\``
jarname=`echo $artifactname | sed -e s:^maven-scm-::g`
cp -p $i $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.$artifactname.pom
- %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion} JPP/%{name} $jarname
+ %add_to_maven_depmap org.apache.maven.scm $artifactname %{version} JPP/%{name} $jarname
done
cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-scm-scm.pom
-%add_to_maven_depmap org.apache.maven.scm maven-scm %{namedversion} JPP/maven-scm scm
+%add_to_maven_depmap org.apache.maven.scm maven-scm %{version} JPP/maven-scm scm
-%add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion} JPP/maven-scm plugin
+%add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{version} JPP/maven-scm plugin
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -199,6 +185,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/*
%changelog
+* Tue Apr 5 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.5-1
+- Update to upstream 1.5 release.
+- Build with maven 3.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 07d89d6..988cde5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02b1f6861676b5f89c38073ac33f90ba maven-scm-1.4.tar.xz
+da090d412eb53a2e36042b0c37888f0d maven-scm-1.5-source-release.zip
13 years
[objectweb-asm] - Upgrade to 3.3.1
by Chris Aniszczyk
commit c1801b5ac5cca318d2cd17d1ba358229c992ffef
Author: Chris Aniszczyk <zx(a)redhat.com>
Date: Mon Apr 4 14:18:06 2011 -0500
- Upgrade to 3.3.1
.gitignore | 2 +-
asm-3.2.pom => asm-3.3.1.pom | 2 +-
asm-MANIFEST.MF | 12 +++++-----
asm-all-3.2.pom => asm-all-3.3.1.pom | 2 +-
asm-analysis-3.2.pom => asm-analysis-3.3.1.pom | 2 +-
asm-commons-3.2.pom => asm-commons-3.3.1.pom | 2 +-
asm-parent-3.2.pom => asm-parent-3.3.1.pom | 8 +++---
asm-tree-3.2.pom => asm-tree-3.3.1.pom | 2 +-
asm-util-3.2.pom => asm-util-3.3.1.pom | 2 +-
asm-xml-3.2.pom => asm-xml-3.3.1.pom | 2 +-
objectweb-asm.spec | 25 +++++++++++++----------
sources | 2 +-
12 files changed, 33 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28ae703..1c0ce92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-asm-3.2.tar.gz
+asm-*.tar.gz
diff --git a/asm-3.2.pom b/asm-3.3.1.pom
similarity index 89%
rename from asm-3.2.pom
rename to asm-3.3.1.pom
index c714db0..4b4cea6 100644
--- a/asm-3.2.pom
+++ b/asm-3.3.1.pom
@@ -4,7 +4,7 @@
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
- <version>3.2</version>
+ <version>3.3.1</version>
</parent>
<name>ASM Core</name>
diff --git a/asm-MANIFEST.MF b/asm-MANIFEST.MF
index 3d50d2b..8396138 100644
--- a/asm-MANIFEST.MF
+++ b/asm-MANIFEST.MF
@@ -4,11 +4,11 @@ Bundle-SymbolicName: org.objectweb.asm
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Localization: plugin
-Bundle-Version: 3.2.0
+Bundle-Version: 3.3.1
Bundle-Vendor: %providerName
-Export-Package: org.objectweb.asm;version="3.2.0",org.objectweb.asm.co
- mmons;version="3.2.0",org.objectweb.asm.signature;version="3.2.0",org
- .objectweb.asm.tree;version="3.2.0",org.objectweb.asm.tree.analysis;v
- ersion="3.2.0",org.objectweb.asm.util;version="3.2.0",org.objectweb.a
- sm.xml;version="3.2.0"
+Export-Package: org.objectweb.asm;version="3.3.1",org.objectweb.asm.co
+ mmons;version="3.3.1",org.objectweb.asm.signature;version="3.3.1",org
+ .objectweb.asm.tree;version="3.3.1",org.objectweb.asm.tree.analysis;v
+ ersion="3.3.1",org.objectweb.asm.util;version="3.3.1",org.objectweb.a
+ sm.xml;version="3.3.1"
diff --git a/asm-all-3.2.pom b/asm-all-3.3.1.pom
similarity index 90%
rename from asm-all-3.2.pom
rename to asm-all-3.3.1.pom
index 9899a54..cbcb71f 100644
--- a/asm-all-3.2.pom
+++ b/asm-all-3.3.1.pom
@@ -4,7 +4,7 @@
<parent>
<groupId>asm</groupId>
<artifactId>asm-parent</artifactId>
- <version>3.2</version>
+ <version>3.3.1</version>
</parent>
<name>ASM All</name>
diff --git a/asm-analysis-3.2.pom b/asm-analysis-3.3.1.pom
similarity index 93%
rename from asm-analysis-3.2.pom
rename to asm-analysis-3.3.1.pom
index b393338..f6b7a51 100644
--- a/asm-analysis-3.2.pom
+++ b/asm-analysis-3.3.1.pom
@@ -4,7 +4,7 @@
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
- <version>3.2</version>
+ <version>3.3.1</version>
</parent>
<name>ASM Analysis</name>
diff --git a/asm-commons-3.2.pom b/asm-commons-3.3.1.pom
similarity index 93%
rename from asm-commons-3.2.pom
rename to asm-commons-3.3.1.pom
index 8517715..d0ffe75 100644
--- a/asm-commons-3.2.pom
+++ b/asm-commons-3.3.1.pom
@@ -4,7 +4,7 @@
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
- <version>3.2</version>
+ <version>3.3.1</version>
</parent>
<name>ASM Commons</name>
diff --git a/asm-parent-3.2.pom b/asm-parent-3.3.1.pom
similarity index 96%
rename from asm-parent-3.2.pom
rename to asm-parent-3.3.1.pom
index 740b1d8..0b6914c 100644
--- a/asm-parent-3.2.pom
+++ b/asm-parent-3.3.1.pom
@@ -6,7 +6,7 @@
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
- <version>3.2</version>
+ <version>3.3.1</version>
<packaging>pom</packaging>
<name>ASM</name>
@@ -55,9 +55,9 @@
</developers>
<scm>
- <connection>scm:svn:svn://svn.forge.objectweb.org/svnroot/asm/tags/ASM_3_2</connection>
- <developerConnection>scm:svn:svn+ssh://${maven.username}@svn.forge.objectweb.org/svnroot/asm/tags/ASM_3_2</developerConnection>
- <url>http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/tags/ASM_3_2/</url>
+ <connection>scm:svn:svn://svn.forge.objectweb.org/svnroot/asm/trunk</connection>
+ <developerConnection>scm:svn:svn+ssh://${maven.username}@svn.forge.objectweb.org/svnroot/asm/trunk</developerConnection>
+ <url>http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/</url>
</scm>
<issueManagement>
diff --git a/asm-tree-3.2.pom b/asm-tree-3.3.1.pom
similarity index 92%
rename from asm-tree-3.2.pom
rename to asm-tree-3.3.1.pom
index 9f45452..da8012c 100644
--- a/asm-tree-3.2.pom
+++ b/asm-tree-3.3.1.pom
@@ -4,7 +4,7 @@
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
- <version>3.2</version>
+ <version>3.3.1</version>
</parent>
<name>ASM Tree</name>
diff --git a/asm-util-3.2.pom b/asm-util-3.3.1.pom
similarity index 92%
rename from asm-util-3.2.pom
rename to asm-util-3.3.1.pom
index e302b0f..51abac2 100644
--- a/asm-util-3.2.pom
+++ b/asm-util-3.3.1.pom
@@ -4,7 +4,7 @@
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
- <version>3.2</version>
+ <version>3.3.1</version>
</parent>
<name>ASM Util</name>
diff --git a/asm-xml-3.2.pom b/asm-xml-3.3.1.pom
similarity index 92%
rename from asm-xml-3.2.pom
rename to asm-xml-3.3.1.pom
index 0f3de1f..ab5c335 100644
--- a/asm-xml-3.2.pom
+++ b/asm-xml-3.3.1.pom
@@ -4,7 +4,7 @@
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
- <version>3.2</version>
+ <version>3.3.1</version>
</parent>
<name>ASM XML</name>
diff --git a/objectweb-asm.spec b/objectweb-asm.spec
index 70ab453..22e6070 100644
--- a/objectweb-asm.spec
+++ b/objectweb-asm.spec
@@ -31,22 +31,22 @@
%define section free
Name: objectweb-asm
-Version: 3.2
-Release: 3%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
Epoch: 0
Summary: A code manipulation tool to implement adaptable systems
License: BSD
URL: http://asm.objectweb.org/
Group: Development/Libraries/Java
-Source0: http://download.forge.objectweb.org/asm/asm-3.2.tar.gz
-Source1: http://repo1.maven.org/maven2/asm/asm/3.2/asm-3.2.pom
-Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.2/asm-analysis-3.2.pom
-Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.2/asm-commons-3.2.pom
-Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.2/asm-tree-3.2.pom
-Source5: http://repo1.maven.org/maven2/asm/asm-util/3.2/asm-util-3.2.pom
-Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.2/asm-xml-3.2.pom
-Source7: http://repo1.maven.org/maven2/asm/asm-all/3.2/asm-all-3.2.pom
-Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.2/asm-parent-3.2.pom
+Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
+Source1: http://repo1.maven.org/maven2/asm/asm/3.3.1/asm-3.3.1.pom
+Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.3.1/asm-analysis-3.3.1.pom
+Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
+Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.3.1/asm-tree-3.3.1.pom
+Source5: http://repo1.maven.org/maven2/asm/asm-util/3.3.1/asm-util-3.3.1.pom
+Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.3.1/asm-xml-3.3.1.pom
+Source7: http://repo1.maven.org/maven2/asm/asm-all/3.3.1/asm-all-3.3.1.pom
+Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
Source9: asm-MANIFEST.MF
Patch0: objectweb-asm-no-classpath-in-manifest.patch
# Needed by asm-xml.jar
@@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/%{name}
%changelog
+* Mon Apr 04 2011 Chris Aniszczyk <zx(a)redhat.com> 0:3.3.1
+- Upgrade to 3.3.1
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 2f3802e..4af6a91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2220390f526a6f1879eb0ad7ee3eed4 asm-3.2.tar.gz
+433024df8176f09922646316e415631c asm-3.3.1.tar.gz
13 years
[sat4j] - Update to 2.3.0.
by Chris Aniszczyk
commit d6f44732c7019ad4a0cd6977b11af0f586079904
Author: Chris Aniszczyk <zx(a)redhat.com>
Date: Mon Apr 4 12:31:04 2011 -0500
- Update to 2.3.0.
.gitignore | 1 +
sat4j-fetch.sh | 4 ++--
sat4j.spec | 7 +++++--
sources | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 41364b8..ca4f871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ sat4j-2.1.0.tar.bz2
sat4j-2.1.1.tar.bz2
sat4j-2.1.1.tar.lzma
sat4j-2.2.0.tar.xz
+sat4j-2.3.0.tar.xz
diff --git a/sat4j-fetch.sh b/sat4j-fetch.sh
index 73c0708..faf336e 100644
--- a/sat4j-fetch.sh
+++ b/sat4j-fetch.sh
@@ -1,7 +1,7 @@
#!/bin/sh
name=sat4j
-tag=ECLIPSE_3_6
-version=2.2.0
+tag=org.sat4j.pom-2.3.0
+version=2.3.0
tar_name=$name-$version
rm -fr $tar_name && mkdir $tar_name
diff --git a/sat4j.spec b/sat4j.spec
index c1423dd..fb90ca5 100644
--- a/sat4j.spec
+++ b/sat4j.spec
@@ -3,8 +3,8 @@
%global qualifier 20100429
Name: sat4j
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
Summary: A library of SAT solvers written in Java
Group: Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/org.sat4j*
%changelog
+* Mon Apr 04 2011 Chris Aniszczyk <zx(a)redhat.com> 2.3.0-1
+- Update to 2.3.0.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 7f954db..7ceda3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bbf217038fd9b1df5178a588ca1d2c9 sat4j-2.2.0.tar.xz
+aacb839425184b8059d8471083558960 sat4j-2.3.0.tar.xz
13 years
Broken dependencies: netty
by Fedora Koji Build System
netty has broken dependencies in the F-15 tree:
On sparc64:
netty-3.2.3-3.fc15.noarch requires protobuf-java
On sparc:
netty-3.2.3-3.fc15.noarch requires protobuf-java
Please resolve this as soon as possible.
13 years
