java-sig-commits July 2012

java-sig-commits@lists.fedoraproject.org

18 participants
566 discussions

[maven2] Remove mistaken epoch use in requires
by Stanislav Ochotnicky 26 Jul '12

26 Jul '12

commit afb866743316ac418aeee6f4452541569166914a Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Thu Jul 26 11:54:25 2012 +0200 Remove mistaken epoch use in requires maven2.spec | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) --- diff --git a/maven2.spec b/maven2.spec index 4097aaa..aff4674 100644 --- a/maven2.spec +++ b/maven2.spec @@ -5,7 +5,7 @@ Name: maven2 Version: 2.2.1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Java project management and project comprehension tool Group: Development/Build Tools @@ -114,7 +114,7 @@ Maven plugin registry artifact Group: Development/Libraries Summary: Compatibility Maven profile artifact Requires: jpackage-utils -Requires: maven-model = %{epoch}:%{version}-%{release} +Requires: maven-model = %{version}-%{release} Requires: plexus-utils Requires: plexus-interpolation Requires: plexus-containers-container-default @@ -126,10 +126,10 @@ Maven profile artifact Group: Development/Libraries Summary: Compatibility Maven project artifact Requires: jpackage-utils -Requires: maven-artifact-manager = %{epoch}:%{version}-%{release} -Requires: maven-profile = %{epoch}:%{version}-%{release} -Requires: maven-plugin-registry = %{epoch}:%{version}-%{release} -Requires: maven-model = %{epoch}:%{version}-%{release} +Requires: maven-artifact-manager = %{version}-%{release} +Requires: maven-profile = %{version}-%{release} +Requires: maven-plugin-registry = %{version}-%{release} +Requires: maven-model = %{version}-%{release} Requires: plexus-interpolation Requires: plexus-utils Requires: plexus-containers-container-default @@ -314,6 +314,9 @@ done %changelog +* Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-36 +- Remove mistaken epoch use in requires + * Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-35 - Move artifacts together with maven-3 files - Provide compatibility versions for maven-model

1 0

[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla 26 Jul '12

26 Jul '12

https://bugzilla.redhat.com/show_bug.cgi?id=652183 gil cattaneo <puntogil(a)libero.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On| |843404 -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

1 0

[maven2] Move artifacts together with maven-3 files
by Stanislav Ochotnicky 26 Jul '12

26 Jul '12

commit 94228042524a5a070468a45aac966f4b21069daa Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Jul 25 16:25:09 2012 +0200 Move artifacts together with maven-3 files - Provide compatibility versions for maven-model maven2.spec | 99 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 53 insertions(+), 46 deletions(-) --- diff --git a/maven2.spec b/maven2.spec index be48174..4097aaa 100644 --- a/maven2.spec +++ b/maven2.spec @@ -1,9 +1,11 @@ %global bootstrap 0 %global __jar_repack 0 +%global main_pkg maven + Name: maven2 Version: 2.2.1 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Java project management and project comprehension tool Group: Development/Build Tools @@ -103,7 +105,6 @@ Group: Development/Libraries Summary: Compatibility Maven plugin registry artifact Requires: jpackage-utils Requires: plexus-utils -Requires: plexus-interpolation Requires: plexus-containers-container-default %description -n maven-plugin-registry @@ -113,6 +114,7 @@ Maven plugin registry artifact Group: Development/Libraries Summary: Compatibility Maven profile artifact Requires: jpackage-utils +Requires: maven-model = %{epoch}:%{version}-%{release} Requires: plexus-utils Requires: plexus-interpolation Requires: plexus-containers-container-default @@ -124,10 +126,10 @@ Maven profile artifact Group: Development/Libraries Summary: Compatibility Maven project artifact Requires: jpackage-utils -Requires: maven-artifact-manager -Requires: maven-profile -Requires: maven-plugin-registry -Requires: maven-model +Requires: maven-artifact-manager = %{epoch}:%{version}-%{release} +Requires: maven-profile = %{epoch}:%{version}-%{release} +Requires: maven-plugin-registry = %{epoch}:%{version}-%{release} +Requires: maven-model = %{epoch}:%{version}-%{release} Requires: plexus-interpolation Requires: plexus-utils Requires: plexus-containers-container-default @@ -205,13 +207,12 @@ mkdir $M2_REPO %patch7 -p1 -b .classworlds -# test case is incorrectly assuming that target executed by antcall -# can propagate references to its parent (stopped working with ant 1.8) -rm maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java - -# FIXIT: look why these tests are failing with maven-surefire 2.6 -rm maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java -rm maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java +for nobuild in apache-maven maven-artifact-test \ + maven-compat maven-core maven-plugin-api \ + maven-plugin-parameter-documenter maven-reporting \ + maven-script;do + %pom_disable_module $nobuild +done %build export M2_REPO=`pwd`/.m2 @@ -231,33 +232,35 @@ sed -i -s s:__M2_SETTINGS_FILE__:$M2_HOME/conf/settings.xml:g build.xml %if %{bootstrap} ant -Dmaven.repo.local=$M2_REPO/cache %else -# FIXME: These tests fail when building with maven for an unknown reason -rm -f maven-core/src/test/java/org/apache/maven/WagonSelectorTest.java -rm -f maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java -for nobuild in apache-maven maven-artifact-test \ - maven-compat maven-core maven-plugin-api \ - maven-plugin-parameter-documenter maven-reporting \ - maven-script;do - sed -i "s:<module>$nobuild</module>::" pom.xml -done -mvn-rpmbuild -X -Dmaven.test.skip=true -P all-models -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.depmap.file=%{SOURCE103} install +mvn-rpmbuild -X -Dmaven.local.debug=true -Dmaven.test.skip=true -P all-models -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.depmap.file=%{SOURCE103} install %endif %install # maven2 directory in /usr/share/java -install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{main_pkg} install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir} # parts of maven2 now go into separate subpackages for subdir in maven-artifact-manager maven-error-diagnostics \ - maven-model maven-monitor maven-plugin-registry \ + maven-monitor maven-plugin-registry \ maven-profile maven-project maven-toolchain maven-plugin-descriptor ;do pushd $subdir - install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar - install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$subdir.pom - %add_maven_depmap JPP.%{name}-$subdir.pom %{name}/$subdir.jar -f $subdir + install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{main_pkg}/$subdir.jar + install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{main_pkg}-$subdir.pom + %add_maven_depmap JPP.%{main_pkg}-$subdir.pom %{main_pkg}/$subdir.jar -f $subdir + popd +done + +# these parts are compatibility versions which are available in +# maven-3.x as well. We default to maven-3, but if someone asks for +# 2.x we provide few compat versions +for subdir in maven-model;do + pushd $subdir + install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{main_pkg}/$subdir.jar + install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{main_pkg}-$subdir.pom + %add_maven_depmap JPP.%{main_pkg}-$subdir.pom %{main_pkg}/$subdir.jar -f $subdir -v "2.0.2,2.0.6,2.0.7,2.0.8" popd done @@ -266,51 +269,55 @@ done %files -n maven-artifact-manager %{_mavendepmapfragdir}/%{name}-maven-artifact-manager -%{_javadir}/%{name}/maven-artifact-manager.jar -%{_mavenpomdir}/JPP.%{name}-maven-artifact-manager.pom +%{_javadir}/%{main_pkg}/maven-artifact-manager.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-artifact-manager.pom %files -n maven-error-diagnostics %{_mavendepmapfragdir}/%{name}-maven-error-diagnostics -%{_javadir}/%{name}/maven-error-diagnostics.jar -%{_mavenpomdir}/JPP.%{name}-maven-error-diagnostics.pom +%{_javadir}/%{main_pkg}/maven-error-diagnostics.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-error-diagnostics.pom %files -n maven-model %{_mavendepmapfragdir}/%{name}-maven-model -%{_javadir}/%{name}/maven-model.jar -%{_mavenpomdir}/JPP.%{name}-maven-model.pom +%{_javadir}/%{main_pkg}/maven-model-*.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-model-*.pom %files -n maven-monitor %{_mavendepmapfragdir}/%{name}-maven-monitor -%{_javadir}/%{name}/maven-monitor.jar -%{_mavenpomdir}/JPP.%{name}-maven-monitor.pom +%{_javadir}/%{main_pkg}/maven-monitor.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-monitor.pom %files -n maven-plugin-registry %{_mavendepmapfragdir}/%{name}-maven-plugin-registry -%{_javadir}/%{name}/maven-plugin-registry.jar -%{_mavenpomdir}/JPP.%{name}-maven-plugin-registry.pom +%{_javadir}/%{main_pkg}/maven-plugin-registry.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-plugin-registry.pom %files -n maven-profile %{_mavendepmapfragdir}/%{name}-maven-profile -%{_javadir}/%{name}/maven-profile.jar -%{_mavenpomdir}/JPP.%{name}-maven-profile.pom +%{_javadir}/%{main_pkg}/maven-profile.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-profile.pom %files -n maven-project %{_mavendepmapfragdir}/%{name}-maven-project -%{_javadir}/%{name}/maven-project.jar -%{_mavenpomdir}/JPP.%{name}-maven-project.pom +%{_javadir}/%{main_pkg}/maven-project.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-project.pom %files -n maven-toolchain %{_mavendepmapfragdir}/%{name}-maven-toolchain -%{_javadir}/%{name}/maven-toolchain.jar -%{_mavenpomdir}/JPP.%{name}-maven-toolchain.pom +%{_javadir}/%{main_pkg}/maven-toolchain.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-toolchain.pom %files -n maven-plugin-descriptor %{_mavendepmapfragdir}/%{name}-maven-plugin-descriptor -%{_javadir}/%{name}/maven-plugin-descriptor.jar -%{_mavenpomdir}/JPP.%{name}-maven-plugin-descriptor.pom +%{_javadir}/%{main_pkg}/maven-plugin-descriptor.jar +%{_mavenpomdir}/JPP.%{main_pkg}-maven-plugin-descriptor.pom %changelog +* Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-35 +- Move artifacts together with maven-3 files +- Provide compatibility versions for maven-model + * Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.1-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

1 0

[tomcat/f17] Updated to 7.0.29
by Ivan Afonichev 25 Jul '12

25 Jul '12

commit 5955ecc8dd7ba7afd9de8ad671f98e757c88eab7 Author: Ivan Afonichev <ivan.afonichev(a)gmail.com> Date: Thu Jul 26 00:43:31 2012 +0400 Updated to 7.0.29 sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/sources b/sources index 07223a9..6fc9dbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b84c51041fdd42e3e08747d6c4db6d30 apache-tomcat-7.0.28-src.tar.gz +16b9f637e5ca623cf87a2a1514c8978e apache-tomcat-7.0.29-src.tar.gz diff --git a/tomcat.spec b/tomcat.spec index 2a50b0a..df758e8 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.2 %global major_version 7 %global minor_version 0 -%global micro_version 28 +%global micro_version 29 %global packdname apache-tomcat-%{version}-src %global servletspec 3.0 %global elspec 2.2 @@ -660,6 +660,9 @@ fi %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %changelog +* Thu Jul 26 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.29-1 +- Updated to 7.0.29 + * Mon Jul 2 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.28-1 - Updated to 7.0.28 - Resolves: rhbz 820119 Remove bundled apache-commons-dbcp

1 0

[tycho] Non-bootstrap build.
by Roland Grunberg 25 Jul '12

25 Jul '12

commit 9f4b1c0760dd201c233c049f66a3dfb5e930c2a7 Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Wed Jul 25 11:18:50 2012 -0400 Non-bootstrap build. tycho.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/tycho.spec b/tycho.spec index 3c2c9c8..b9d02fe 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,4 +1,4 @@ -%global bootstrap 1 +%global bootstrap 0 %if %{bootstrap} %global snap -SNAPSHOT @@ -8,7 +8,7 @@ Name: tycho Version: 0.14.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Group: Development/Libraries @@ -199,6 +199,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all %{_javadocdir}/%{name} %changelog +* Wed Jul 25 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-7 +- Non-bootstrap build. + * Mon Jul 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-6 - Detect OSGi jars using presence of Bundle-SymbolicName entry (BZ #838513).

1 0

[maven/f17] Fix exit code of mvn-rpmbuild outside of mock
by Mikolaj Izdebski 25 Jul '12

25 Jul '12

Summary of changes: 6456c72... Fix exit code of mvn-rpmbuild outside of mock (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[maven] Fix exit code of mvn-rpmbuild outside of mock
by Stanislav Ochotnicky 25 Jul '12

25 Jul '12

commit 6456c7238838fb2a3a5eff187e80aba44b8aa10b Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Jul 25 09:59:34 2012 +0200 Fix exit code of mvn-rpmbuild outside of mock - Make sure we look for original asked-for version first version variable can be overwritten later in the function so we make sure to use the original value JavadirWorkspaceReader.java | 3 ++- maven-script-rpmbuild | 2 +- maven.spec | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) --- diff --git a/JavadirWorkspaceReader.java b/JavadirWorkspaceReader.java index 1698929..d231e7d 100644 --- a/JavadirWorkspaceReader.java +++ b/JavadirWorkspaceReader.java @@ -54,6 +54,7 @@ public class JavadirWorkspaceReader implements WorkspaceReader { String artifactId = artifact.getArtifactId(); String groupId = artifact.getGroupId(); String version = artifact.getVersion(); + String wantedVersion = new String(version); MavenJPackageDepmap.debug("Wanted GROUPID=" + groupId); MavenJPackageDepmap.debug("Wanted ARTIFACTID=" + artifactId); @@ -80,7 +81,7 @@ public class JavadirWorkspaceReader implements WorkspaceReader { "/usr/share/maven/repository-java-jni/", "/usr/share/maven/repository-jni/" }; String verRelativeArtifactPath = groupId + "/" + artifactId + "-" - + version + "." + artifact.getExtension(); + + wantedVersion + "." + artifact.getExtension(); String relativeArtifactPath = groupId + "/" + artifactId + "." + artifact.getExtension(); for (String repo : repos) { diff --git a/maven-script-rpmbuild b/maven-script-rpmbuild index f50b2f1..095d14d 100644 --- a/maven-script-rpmbuild +++ b/maven-script-rpmbuild @@ -76,7 +76,7 @@ export JAVA_HOME export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.local.mode ${local_add} ${logfile_add}" $M2_HOME/bin/mvn -o "$@" || exit $? -$mock || exit +$mock || exit 0 sanitize() { for obj in $1; do diff --git a/maven.spec b/maven.spec index c3aa72c..de21e71 100644 --- a/maven.spec +++ b/maven.spec @@ -2,7 +2,7 @@ Name: maven Version: 3.0.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -367,6 +367,10 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP %changelog +* Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-10 +- Fix exit code of mvn-rpmbuild outside of mock +- Fix bug in compatibility jar handling + * Mon Jul 23 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-9 - Run redundant dependency checks only in mock

1 0

[javapackages-tools] Update to upstream version 0.5.0 - add support for add_maven_depmap -v
by Stanislav Ochotnicky 25 Jul '12

25 Jul '12

commit a06eb784e289ec8c410ee223f17de7b13a21ca75 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Jul 25 10:36:57 2012 +0200 Update to upstream version 0.5.0 - add support for add_maven_depmap -v .gitignore | 1 + javapackages-tools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) --- diff --git a/.gitignore b/.gitignore index 859970e..4b8eb4b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /javapackages-0.3.1.tar.xz /javapackages-0.4.0.tar.xz /javapackages-0.4.1.tar.xz +/javapackages-0.5.0.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 1044d25..d809d20 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools -Version: 0.4.1 -Release: 2%{?dist} +Version: 0.5.0 +Release: 1%{?dist} Summary: Fedora macros and scripts for Java packaging support License: BSD @@ -51,6 +51,9 @@ install -pm 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils/ %changelog +* Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.5.0-1 +- Update to upstream version 0.5.0 - add support for add_maven_depmap -v + * Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index ec0f5c1..3b7f79f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1fe1f6f2d035898915e03ca278580de javapackages-0.4.1.tar.xz +520935ccc46b01a09956af8bfa63fa03 javapackages-0.5.0.tar.xz

1 0

[sshj/f17] (2 commits) ...update to 0.8.1
by gil 25 Jul '12

25 Jul '12

Summary of changes: 94558d2... Initial import (#836940) (*) 309f1bd... update to 0.8.1 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

File javapackages-0.5.0.tar.xz uploaded to lookaside cache by sochotni
by Stanislav Ochotnicky 25 Jul '12

25 Jul '12

A file has been added to the lookaside cache for javapackages-tools: 520935ccc46b01a09956af8bfa63fa03 javapackages-0.5.0.tar.xz

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits July 2012