rpms/maven
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix exit code of mvn-rpmbuild outside of mock

Browse Source 
- 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
This commit is contained in:
Stanislav Ochotnicky 2012-07-25 09:59:34 +02:00
parent 7d259eee4b
commit 6456c72388
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
JavadirWorkspaceReader.java
View File

@ -54,6 +54,7 @@ public class JavadirWorkspaceReader implements WorkspaceReader {
String artifactId = artifact.getArtifactId(); String artifactId = artifact.getArtifactId();
String groupId = artifact.getGroupId(); String groupId = artifact.getGroupId();
String version = artifact.getVersion(); String version = artifact.getVersion();
String wantedVersion = new String(version);
MavenJPackageDepmap.debug("Wanted GROUPID=" + groupId); MavenJPackageDepmap.debug("Wanted GROUPID=" + groupId);
MavenJPackageDepmap.debug("Wanted ARTIFACTID=" + artifactId); MavenJPackageDepmap.debug("Wanted ARTIFACTID=" + artifactId);
@ -80,7 +81,7 @@ public class JavadirWorkspaceReader implements WorkspaceReader {
"/usr/share/maven/repository-java-jni/", "/usr/share/maven/repository-java-jni/",
"/usr/share/maven/repository-jni/" }; "/usr/share/maven/repository-jni/" };
String verRelativeArtifactPath = groupId + "/" + artifactId + "-" String verRelativeArtifactPath = groupId + "/" + artifactId + "-"
+ version + "." + artifact.getExtension(); + wantedVersion + "." + artifact.getExtension();
String relativeArtifactPath = groupId + "/" + artifactId + "." String relativeArtifactPath = groupId + "/" + artifactId + "."
+ artifact.getExtension(); + artifact.getExtension();
for (String repo : repos) { for (String repo : repos) {

2
maven-script-rpmbuild
View File

@ -76,7 +76,7 @@ export JAVA_HOME
export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.local.mode ${local_add} ${logfile_add}" export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.local.mode ${local_add} ${logfile_add}"
$M2_HOME/bin/mvn -o "$@" || exit $? $M2_HOME/bin/mvn -o "$@" || exit $?
$mock || exit $mock || exit 0
sanitize() { sanitize() {
for obj in $1; do for obj in $1; do

6
maven.spec
View File

@ -2,7 +2,7 @@
Name: maven Name: maven
Version: 3.0.4 Version: 3.0.4
Release: 9%{?dist} Release: 10%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
Group: Development/Tools Group: Development/Tools
@ -367,6 +367,10 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog %changelog
* Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky@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@redhat.com> - 3.0.4-9 * Mon Jul 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.4-9
- Run redundant dependency checks only in mock - Run redundant dependency checks only in mock