[jenkins] Symlink remoting and cli JAR
by Michal Srb
commit 0567fd930ef61031ba6478a8ee28ab0af11a86f2
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Apr 3 09:41:20 2014 +0200
Symlink remoting and cli JAR
jenkins.spec | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index a8770d7..e833aae 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
Name: jenkins
Version: 1.557
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -549,6 +549,13 @@ pushd %{buildroot}/%{jenkins_catalina_base}
ln -s %{homedir}/webapp webapps/jenkins
popd
+# symlink remoting and cli JAR into WEB-INF/
+pushd %{buildroot}/%{homedir}/webapp/WEB-INF/
+ln -s `build-classpath jenkins-remoting/remoting` remoting.jar
+ln -s `build-classpath jenkins-remoting/remoting` slave.jar
+ln -s `build-classpath jenkins/cli` jenkins-cli.jar
+popd
+
install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
cp -p %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/tomcat@%{name}
@@ -579,6 +586,9 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%doc LICENSE.txt
%changelog
+* Thu Apr 03 2014 Michal Srb <msrb(a)redhat.com> - 1.557-4
+- Symlink remoting and cli JAR
+
* Wed Apr 02 2014 Michal Srb <msrb(a)redhat.com> - 1.557-3
- Build with stapler-adjunct-codemirror
10 years
[jenkins-remoting] Remove unneeded patch
by Michal Srb
commit 85c5a074be12184d69eca618fe57d1964a1ce021
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Apr 3 09:02:28 2014 +0200
Remove unneeded patch
0001-Proper-dependency-on-commons-io.patch | 128 ----------------------------
jenkins-remoting.spec | 7 +-
2 files changed, 4 insertions(+), 131 deletions(-)
---
diff --git a/jenkins-remoting.spec b/jenkins-remoting.spec
index cf371a6..a3f65f5 100644
--- a/jenkins-remoting.spec
+++ b/jenkins-remoting.spec
@@ -2,7 +2,7 @@
Name: jenkins-remoting
Version: 2.37
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jenkins remoting module
# License is specified in pom file
@@ -17,7 +17,6 @@ Source2: LICENSE-MIT
Patch0: 0001-Remove-findbugs-annotation.patch
# TODO possibly upstreamable, need testing
Patch1: 0001-Use-base64-implementation-from-JDK.patch
-Patch2: 0001-Proper-dependency-on-commons-io.patch
BuildArch: noarch
@@ -52,7 +51,6 @@ cp %{SOURCE2} .
%patch0 -p1
%patch1 -p1
-%patch2 -p1
# Nothing really interesting in parent
%pom_remove_parent
@@ -88,6 +86,9 @@ cp %{SOURCE2} .
%doc LICENSE-MIT LICENSE-ASL
%changelog
+* Thu Apr 03 2014 Michal Srb <msrb(a)redhat.com> - 2.37-3
+- Remove unneeded patch
+
* Thu Apr 03 2014 Michal Srb <msrb(a)redhat.com> - 2.37-2
- Remove unneeded pom_ macro
10 years
[jenkins-remoting] Remove unneeded pom_ macro
by Michal Srb
commit 9df84bbeac4dff84a8995acac9df6ce8abc99e6d
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Apr 3 08:48:48 2014 +0200
Remove unneeded pom_ macro
jenkins-remoting.spec | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/jenkins-remoting.spec b/jenkins-remoting.spec
index ad1eee2..cf371a6 100644
--- a/jenkins-remoting.spec
+++ b/jenkins-remoting.spec
@@ -2,7 +2,7 @@
Name: jenkins-remoting
Version: 2.37
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Jenkins remoting module
# License is specified in pom file
@@ -60,10 +60,6 @@ cp %{SOURCE2} .
# missing dep org.jenkins-ci:remoting-test-client
%pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-dependency-plugin']]/pom:executions/pom:execution[pom:id[text()='resgen']]"
-# args4j dependency should have scope 'compile', not 'provided'
-%pom_xpath_replace "pom:dependency[pom:artifactId[text()='args4j']]/pom:scope" \
- "<scope>compile</scope>"
-
# We don't have or don't need following plugins
%pom_remove_plugin :maven-jarsigner-plugin
%pom_remove_plugin :build-helper-maven-plugin
@@ -92,6 +88,9 @@ cp %{SOURCE2} .
%doc LICENSE-MIT LICENSE-ASL
%changelog
+* Thu Apr 03 2014 Michal Srb <msrb(a)redhat.com> - 2.37-2
+- Remove unneeded pom_ macro
+
* Thu Apr 03 2014 Michal Srb <msrb(a)redhat.com> - 2.37-1
- Update to upstream version 2.37
10 years
[jenkins-remoting] Update to upstream version 2.37
by Michal Srb
commit fb87052dab5aa4bd4f0cde7286e9ffe11ad5fecc
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Apr 3 08:29:11 2014 +0200
Update to upstream version 2.37
.gitignore | 1 +
jenkins-remoting.spec | 20 ++++++++++++++++----
sources | 2 +-
3 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 604aa3a..5fb2ed7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/remoting-2.33.tar.gz
/remoting-2.34.tar.gz
/remoting-2.35.tar.gz
+/remoting-2.37.tar.gz
diff --git a/jenkins-remoting.spec b/jenkins-remoting.spec
index 0c821c5..ad1eee2 100644
--- a/jenkins-remoting.spec
+++ b/jenkins-remoting.spec
@@ -1,8 +1,8 @@
%global shortname remoting
Name: jenkins-remoting
-Version: 2.35
-Release: 2%{?dist}
+Version: 2.37
+Release: 1%{?dist}
Summary: Jenkins remoting module
# License is specified in pom file
@@ -23,10 +23,17 @@ BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(args4j:args4j)
+BuildRequires: mvn(asm:asm-all)
+BuildRequires: mvn(com.google.code.findbugs:jsr305)
+BuildRequires: mvn(com.google.guava:guava)
BuildRequires: mvn(commons-io:commons-io)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-pmd-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin)
BuildRequires: mvn(org.jenkins-ci:constant-pool-scanner)
-
%description
This package is primarily used by Jenkins for slave node management,
but it could be potentially reused outside of this project.
@@ -50,6 +57,9 @@ cp %{SOURCE2} .
# Nothing really interesting in parent
%pom_remove_parent
+# missing dep org.jenkins-ci:remoting-test-client
+%pom_xpath_remove "pom:plugin[pom:artifactId[text()='maven-dependency-plugin']]/pom:executions/pom:execution[pom:id[text()='resgen']]"
+
# args4j dependency should have scope 'compile', not 'provided'
%pom_xpath_replace "pom:dependency[pom:artifactId[text()='args4j']]/pom:scope" \
"<scope>compile</scope>"
@@ -58,7 +68,6 @@ cp %{SOURCE2} .
%pom_remove_plugin :maven-jarsigner-plugin
%pom_remove_plugin :build-helper-maven-plugin
%pom_remove_plugin :animal-sniffer-maven-plugin
-%pom_remove_plugin :maven-dependency-plugin
# Not really used in source files
%pom_remove_dep :animal-sniffer-annotation
@@ -83,6 +92,9 @@ cp %{SOURCE2} .
%doc LICENSE-MIT LICENSE-ASL
%changelog
+* Thu Apr 03 2014 Michal Srb <msrb(a)redhat.com> - 2.37-1
+- Update to upstream version 2.37
+
* Tue Apr 01 2014 Michal Srb <msrb(a)redhat.com> - 2.35-2
- Update to upstream version 2.35
diff --git a/sources b/sources
index 1a48e9c..0fc43fc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-9ee7c6eec17d8211be74d32b2b2d9c7e remoting-2.35.tar.gz
+a7d5d7fb4185a5dce82bdede65c72b50 remoting-2.37.tar.gz
10 years
[jenkins-ssh-slaves-plugin] Initial commit
by Michal Srb
commit 876396c81a0ad44cb138882c2af067c27d567e0d
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Apr 3 06:53:46 2014 +0200
Initial commit
.gitignore | 1 +
LICENSE.txt | 23 ++++++++++++++
jenkins-ssh-slaves-plugin.spec | 65 ++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 90 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..a9a6f4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/ssh-slaves-1.6.tar.gz
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..7461905
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,23 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004-, all the contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
diff --git a/jenkins-ssh-slaves-plugin.spec b/jenkins-ssh-slaves-plugin.spec
new file mode 100644
index 0000000..75d53ad
--- /dev/null
+++ b/jenkins-ssh-slaves-plugin.spec
@@ -0,0 +1,65 @@
+%global mod_name ssh-slaves-plugin
+%global short_name ssh-slaves
+
+Name: jenkins-ssh-slaves-plugin
+Version: 1.6
+Release: 1%{?dist}
+Summary: Jenkins SSH Slaves Plugin
+
+License: MIT
+URL: https://github.com/jenkinsci/ssh-slaves-plugin
+Source0: https://github.com/jenkinsci/%{mod_name}/archive/%{short_name}-%{version}...
+# Taken from src/main/java/hudson/plugins/sshslaves/SSHLauncher.java
+Source1: LICENSE.txt
+
+BuildRequires: maven-local
+BuildRequires: mvn(com.trilead:trilead-ssh2)
+BuildRequires: mvn(org.acegisecurity:acegi-security)
+BuildRequires: mvn(org.jenkins-ci.plugins:credentials)
+BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
+BuildRequires: mvn(org.jenkins-ci.plugins:ssh-credentials)
+BuildRequires: mvn(org.jenkins-ci.tools:maven-hpi-plugin)
+
+BuildArch: noarch
+
+%description
+This packages provides a means to launch Jenkins slaves via SSH.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+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
+
+# 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
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc LICENSE.txt
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
+
+%changelog
+* Wed Apr 02 2014 Michal Srb <msrb(a)redhat.com> - 1.6-1
+- Update to upstream version 1.6
+
+* Fri Nov 08 2013 Michal Srb <msrb(a)redhat.com> - 1.2-1
+- Initial packaging
+
diff --git a/sources b/sources
index e69de29..9a9140a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+409fb17dc15c4def088a4917c5e70000 ssh-slaves-1.6.tar.gz
10 years
[tycho] Non-bootstrap build.
by Roland Grunberg
commit a8dbaea70aa06450d858b0d266183edc083d1d79
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Wed Apr 2 16:42:08 2014 -0400
Non-bootstrap build.
tycho.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index e4a2a64..0e65f06 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -6,7 +6,7 @@
# This basically uses javac + xmvn to build only the Tycho components
# required to perform a full Tycho build
# Most common usage : A library (in Fedora) used by Tycho's runtime broke API
-%global tycho_bootstrap 1
+%global tycho_bootstrap 0
# Set 'eclipse_bootstrap' if Eclipse from buildroot cannot help build Tycho
# This basically provides a location for usage of pre-bundled Eclipse
# Possible uses : Need to build Tycho before Eclipse in fresh buildroot
@@ -19,7 +19,7 @@
Name: tycho
Version: 0.20.0
-Release: 1.1%{?dist}
+Release: 2%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -350,6 +350,9 @@ install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compati
%{_javadocdir}/%{name}
%changelog
+* Wed Apr 02 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-2
+- Non-bootstrap build.
+
* Thu Mar 27 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.20.0-1.1
- Update to Eclipse Luna (4.4).
10 years