[jenkins-ssh-slaves-plugin] Install as Jenkins plugin
by Michal Srb
commit 0957aec69d74b1e025d550981277d880e0538fa4
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 3 09:46:11 2014 +0200
Install as Jenkins plugin
jenkins-ssh-slaves-plugin.spec | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/jenkins-ssh-slaves-plugin.spec b/jenkins-ssh-slaves-plugin.spec
index 14aa8ec..8e701e3 100644
--- a/jenkins-ssh-slaves-plugin.spec
+++ b/jenkins-ssh-slaves-plugin.spec
@@ -1,9 +1,10 @@
%global mod_name ssh-slaves-plugin
%global short_name ssh-slaves
+%global plugin_home %{_datadir}/jenkins/plugins/%{short_name}
Name: jenkins-ssh-slaves-plugin
Version: 1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jenkins SSH Slaves Plugin
License: MIT
@@ -34,29 +35,41 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{mod_name}-%{short_name}-%{version}
-# do not build HPI yet, JAR is enough for now
+cp %{SOURCE1} .
+
%mvn_package ::hpi: __noinstall
+%mvn_file ::jar:: %{name}/%{short_name} %{plugin_home}/WEB-INF/lib/%{short_name}
# TODO: this should be pulled in from somewhere else
%pom_add_dep org.acegisecurity:acegi-security
%pom_add_dep com.trilead:trilead-ssh2
-cp %{SOURCE1} .
-
%build
# tests are disabled because of missing dep (org.jenkins-ci.main:jenkins-test-harness)
%mvn_build -f
%install
+# unpack hpi file into the correct location
+install -d -m 755 %{buildroot}/%{plugin_home}
+unzip -d %{buildroot}/%{plugin_home} target/%{short_name}.hpi
+rm %{buildroot}/%{plugin_home}/WEB-INF/lib/%{short_name}.jar
+xmvn-subst %{buildroot}/%{plugin_home}/WEB-INF/lib/
+
%mvn_install
+sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles
%files -f .mfiles
%dir %{_javadir}/%{name}
+%dir %{_mavenpomdir}/%{name}
+%{plugin_home}
%doc LICENSE.txt
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Fri Oct 03 2014 Michal Srb <msrb(a)redhat.com> - 1.6-3
+- Install as Jenkins plugin
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 6 months
[Bug 1148579] New: Jenkins: Error 503: Service Unavailable when accessing http://localhost:8080
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1148579
Bug ID: 1148579
Summary: Jenkins: Error 503: Service Unavailable when accessing
http://localhost:8080
Product: Fedora
Version: 21
Component: jenkins
Severity: medium
Assignee: msrb(a)redhat.com
Reporter: anishjp(a)gmail.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
msrb(a)redhat.com
Created attachment 943185
--> https://bugzilla.redhat.com/attachment.cgi?id=943185&action=edit
jenkins log
Description of problem:
When accessing the site http://localhost:8080 in firefox, it gives a Error 503
Service Unavailable. I have disabled the firewalld. Cleared the firefox cache.
Confirmed if jenkins is running.
from /var/log/jenkins/jenkins.log
Oct 01, 2014 8:03:36 PM hudson.WebAppMain contextInitialized
SEVERE: Failed to initialize Jenkins
java.lang.NullPointerException
at com.trilead.ssh2.util.IOUtils.closeQuietly(IOUtils.java:12)
at hudson.WebAppMain.recordBootAttempt(WebAppMain.java:272)
at hudson.WebAppMain.contextInitialized(WebAppMain.java:128)
at
org.eclipse.jetty.server.handler.ContextHandler.callContextInitialized(ContextHandler.java:782)
at
org.eclipse.jetty.servlet.ServletContextHandler.callContextInitialized(ServletContextHandler.java:424)
at
org.eclipse.jetty.server.handler.ContextHandler.startContext(ContextHandler.java:774)
at
org.eclipse.jetty.servlet.ServletContextHandler.startContext(ServletContextHandler.java:249)
at
org.eclipse.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1242)
at
org.eclipse.jetty.server.handler.ContextHandler.doStart(ContextHandler.java:717)
at org.eclipse.jetty.webapp.WebAppContext.doStart(WebAppContext.java:494)
at
org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:64)
at
org.eclipse.jetty.server.handler.HandlerWrapper.doStart(HandlerWrapper.java:95)
at org.eclipse.jetty.server.Server.doStart(Server.java:282)
at
org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:64)
at winstone.Launcher.<init>(Launcher.java:152)
at winstone.Launcher.main(Launcher.java:352)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:483)
at Main._main(Main.java:290)
at Main.main(Main.java:104)
Version-Release number of selected component (if applicable):
jenkins-1.581-2.fc21.noarch
java-1.8.0-openjdk-1.8.0.20-8.b26.fc21.x86_64
How reproducible:
Steps to Reproduce:
1.Open firefox
2.Enter http://localhost:8080
3.
Actual results:
Error 503 Service Unavailable
Expected results:
Should take to the jenkins page.
Additional info:
A quick googling says
1) Jenkins with version 1.548 works only with java-1.7, not sure if this is
applicable to jenkins - 1.581
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=JSyZjXun3b&a=cc_unsubscribe
9 years, 6 months
[jenkins-ssh-credentials-plugin] Install as Jenkins plugin
by Michal Srb
commit 792b90e2fe0f83d7cbd92db17ea7aa260822b59d
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 3 08:46:31 2014 +0200
Install as Jenkins plugin
jenkins-ssh-credentials-plugin.spec | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/jenkins-ssh-credentials-plugin.spec b/jenkins-ssh-credentials-plugin.spec
index bcd8863..66ff19e 100644
--- a/jenkins-ssh-credentials-plugin.spec
+++ b/jenkins-ssh-credentials-plugin.spec
@@ -1,9 +1,10 @@
%global mod_name ssh-credentials-plugin
%global short_name ssh-credentials
+%global plugin_home %{_datadir}/jenkins/plugins/%{short_name}
Name: jenkins-ssh-credentials-plugin
Version: 1.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jenkins SSH Credentials Plugin
License: MIT
@@ -21,6 +22,8 @@ BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
BuildRequires: mvn(org.jenkins-ci.tools:maven-hpi-plugin)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
+BuildRequires: mvn(org.kohsuke:access-modifier-checker)
+BuildRequires: mvn(org.jenkins-ci.main:jenkins-core)
BuildArch: noarch
@@ -36,24 +39,36 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{mod_name}-%{short_name}-%{version}
-# do not build HPI yet, JAR is enough for now
%mvn_package ::hpi: __noinstall
%pom_add_dep net.jcip:jcip-annotations
+%mvn_file ::jar:: %{name}/%{short_name} %{plugin_home}/WEB-INF/lib/%{short_name}
%build
# missing dep org.codehaus.mojo:findbugs-maven-plugin
%mvn_build -f
%install
+# unpack hpi file into the correct location
+install -d -m 755 %{buildroot}/%{plugin_home}
+unzip -d %{buildroot}/%{plugin_home} target/%{short_name}.hpi
+rm %{buildroot}/%{plugin_home}/WEB-INF/lib/%{short_name}.jar
+xmvn-subst %{buildroot}/%{plugin_home}/WEB-INF/lib/
+
%mvn_install
+sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles
%files -f .mfiles
%dir %{_javadir}/%{name}
+%dir %{_mavenpomdir}/%{name}
+%{plugin_home}
%doc LICENSE.txt
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Fri Oct 03 2014 Michal Srb <msrb(a)redhat.com> - 1.6.1-3
+- Install as Jenkins plugin
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 6 months
[jenkins-credentials-plugin] Install as Jenkins plugin
by Michal Srb
commit e3b2cb5f3b70147f90041a7296cabe7b11c47a16
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Oct 3 08:04:27 2014 +0200
Install as Jenkins plugin
jenkins-credentials-plugin.spec | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/jenkins-credentials-plugin.spec b/jenkins-credentials-plugin.spec
index 58c68f4..ace31c9 100644
--- a/jenkins-credentials-plugin.spec
+++ b/jenkins-credentials-plugin.spec
@@ -1,9 +1,10 @@
%global mod_name credentials-plugin
%global short_name credentials
+%global plugin_home %{_datadir}/jenkins/plugins/%{short_name}
Name: jenkins-credentials-plugin
Version: 1.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Jenkins Credentials Plugin
License: MIT
@@ -38,23 +39,35 @@ This package contains the API documentation for %{name}.
%pom_remove_dep :findbugs-annotations
%pom_remove_plugin :findbugs-maven-plugin
-# do not build HPI yet, JAR is enough for now
%mvn_package ::hpi: __noinstall
+%mvn_file ::jar:: %{name}/%{short_name} %{plugin_home}/WEB-INF/lib/%{short_name}
%build
# missing package org.jvnet.hudson.test
%mvn_build -f
%install
+# unpack hpi file into the correct location
+install -d -m 755 %{buildroot}/%{plugin_home}
+unzip -d %{buildroot}/%{plugin_home} target/%{short_name}.hpi
+rm %{buildroot}/%{plugin_home}/WEB-INF/lib/%{short_name}.jar
+xmvn-subst %{buildroot}/%{plugin_home}/WEB-INF/lib/
+
%mvn_install
+sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles
%files -f .mfiles
%dir %{_javadir}/%{name}
+%dir %{_mavenpomdir}/%{name}
+%{plugin_home}
%doc LICENSE.txt
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Fri Oct 03 2014 Michal Srb <msrb(a)redhat.com> - 1.10-4
+- Install as Jenkins plugin
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 6 months
[tycho] Update to build against plexus-archiver 2.6.
by Roland Grunberg
commit 389b9b86dd163d9281ff513c971e54980751432d
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu Oct 2 12:14:02 2014 -0400
Update to build against plexus-archiver 2.6.
tycho-fix-build.patch | 35 +++++++++++++++++++++++++++++++++--
tycho.spec | 15 ++++++++++++++-
2 files changed, 47 insertions(+), 3 deletions(-)
---
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 36a5fa1..c6d15a5 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From f515e677ed605c6fe02842334de19304b8497144 Mon Sep 17 00:00:00 2001
+From bdadf5704a5459c0fb42334c66d617015eab19ea Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora.
@@ -18,6 +18,8 @@ Update to using Jetty 9 API.
Add support for compact profiles (http://openjdk.java.net/jeps/161).
+Update to using plexus-archiver 2.6.
+
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
.../META-INF/MANIFEST.MF | 2 +-
@@ -27,8 +29,9 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../tycho-standalone-p2-director/p2 Director.product | 1 -
.../src/main/java/org/eclipse/tycho/core/ee/EEVersion.java | 13 ++++++++++++-
.../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
+ .../tycho/plugins/p2/director/ProductArchiverMojo.java | 9 +++------
.../eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
- 8 files changed, 28 insertions(+), 14 deletions(-)
+ 9 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
index f59f155..6d3813b 100644
@@ -154,6 +157,34 @@ index 4cc937c..59335b9 100644
validateUniqueBaseDirs(projects);
}
+diff --git a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
+index 6a5c967..957b737 100644
+--- a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
++++ b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
+@@ -26,6 +26,7 @@ import org.apache.maven.project.MavenProjectHelper;
+ import org.codehaus.plexus.archiver.Archiver;
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.tar.TarArchiver;
++import org.codehaus.plexus.archiver.tar.TarArchiver.TarCompressionMethod;
+ import org.codehaus.plexus.archiver.tar.TarLongFileMode;
+ import org.eclipse.tycho.core.facade.TargetEnvironment;
+ import org.eclipse.tycho.plugins.tar.TarGzArchiver;
+@@ -98,13 +99,9 @@ public final class ProductArchiverMojo extends AbstractProductMojo {
+ productArchivers.put("tar.gz", new ProductArchiver() {
+ @Override
+ Archiver getArchiver() throws ArchiverException {
+- TarArchiver.TarCompressionMethod tarCompressionMethod = new TarArchiver.TarCompressionMethod();
+- tarCompressionMethod.setValue("gzip"); // surprisingly, compression names are private in plexus
+- tarArchiver.setCompression(tarCompressionMethod);
++ tarArchiver.setCompression(TarCompressionMethod.gzip);
+ // avoid lots of long file path (> 100 chars) warnings
+- TarLongFileMode gnuMode = new TarLongFileMode();
+- gnuMode.setValue(TarLongFileMode.GNU);
+- tarArchiver.setLongfile(gnuMode);
++ tarArchiver.setLongfile(TarLongFileMode.gnu);
+ return tarArchiver;
+ }
+ });
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
index a8173df..cf2cf57 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
diff --git a/tycho.spec b/tycho.spec
index 67cef4a..18c00a7 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -23,7 +23,7 @@
Name: tycho
Version: 0.21.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -208,6 +208,16 @@ sed -i '/^<unit id=.*$/d' tycho-bundles/tycho-bundles-target/tycho-bundles-targe
# org.hamcrest -> org.hamcrest.core
%pom_xpath_set "pom:requirement[pom:id='org.hamcrest']/pom:id" "org.hamcrest.core" tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests
+# Build against plexus-archiver 2.6
+pushd tycho-its/src/test/java/org/eclipse/tycho/test/
+for f in TYCHO0439repositoryCategories/RepositoryCategoriesTest.java \
+ product/Util.java; do
+sed -i 's/org.codehaus.plexus.archiver.zip.ZipEntry/org.apache.commons.compress.archivers.zip.ZipArchiveEntry/g
+ s/org.codehaus.plexus.archiver.zip.ZipFile/org.apache.commons.compress.archivers.zip.ZipFile/g
+ s/ZipEntry/ZipArchiveEntry/g' $f
+done
+popd
+
# we don't have org.apache.commons:commons-compress:jar:sources
%pom_xpath_remove "pom:dependency[pom:classifier='sources' and pom:artifactId='commons-compress']" tycho-p2/tycho-p2-director-plugin
@@ -403,6 +413,9 @@ ln -s %{_javadir}/%{name}/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/
%{_javadocdir}/%{name}
%changelog
+* Thu Oct 02 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-15
+- Update to build against plexus-archiver 2.6.
+
* Thu Sep 25 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.21.0-14
- fedoraproject-p2: Fix requires generation bug
9 years, 6 months
[jenkins-icon-shim] Use pkg name as plugin home dir
by Michal Srb
commit 56ca3d8b9448337a5a2c7147e73c29a548c77fd4
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Oct 1 15:44:43 2014 +0200
Use pkg name as plugin home dir
jenkins-icon-shim.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/jenkins-icon-shim.spec b/jenkins-icon-shim.spec
index 27cd215..80908f4 100644
--- a/jenkins-icon-shim.spec
+++ b/jenkins-icon-shim.spec
@@ -1,10 +1,10 @@
%global mod_name icon-shim-plugin
%global short_name icon-shim
-%global plugin_home %{_datadir}/jenkins/plugins/%{short_name}
+%global plugin_home %{_datadir}/jenkins/plugins/%{name}
Name: jenkins-icon-shim
Version: 1.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jenkins Icon Shim Plugin
# specified in POM file
@@ -66,6 +66,9 @@ sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles
%doc LICENSE
%changelog
+* Wed Oct 01 2014 Michal Srb <msrb(a)redhat.com> - 1.0.3-3
+- Use pkg name as plugin home dir
+
* Wed Oct 01 2014 Michal Srb <msrb(a)redhat.com> - 1.0.3-2
- Install unpacked (Resolves: rhbz#1147821)
9 years, 6 months