[Bug 794913] New: jetty user creation is broken
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: jetty user creation is broken
https://bugzilla.redhat.com/show_bug.cgi?id=794913
Summary: jetty user creation is broken
Product: Fedora
Version: 17
Platform: All
OS/Version: Linux
Status: NEW
Severity: high
Priority: unspecified
Component: jetty
AssignedTo: jjohnstn(a)redhat.com
ReportedBy: orion(a)cora.nwra.com
QAContact: extras-qa(a)fedoraproject.org
CC: jjohnstn(a)redhat.com, overholt(a)redhat.com,
sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
Description of problem:
The BuildRequires on fedora-usermgmt-devel and %{?FE_USERADD_REQ} was removed
but %pre and %postun still make use of the macros defined in there. This
results in those macros not getting expanded at build time:
# rpm -q --scripts jetty
preinstall scriptlet (using /bin/sh):
# Add the "jetty" user and group
%__fe_groupadd 110 -r jetty &>/dev/null || :
# Use /bin/sh so init script will start properly.
%__fe_useradd 110 -r -s /bin/sh -d /usr/share/jetty -M \
-g jetty jetty &>/dev/null || :
postuninstall scriptlet (using /bin/sh):
%__fe_userdel jetty &>/dev/null || :
%__fe_groupdel jetty &>/dev/null || :
12:41:12 Installing jetty-8.1.0-1.fc17.noarch
/var/tmp/rpm-tmp.YheWdg: line 2: fg: no job control
/var/tmp/rpm-tmp.YheWdg: line 4: fg: no job control
warning: user jetty does not exist - using root
warning: group jetty does not exist - using root
warning: user jetty does not exist - using root
warning: group jetty does not exist - using root
warning: user jetty does not exist - using root
warning: group jetty does not exist - using root
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 1 month
[tycho] - Update to 0.14.1 upstream tag. - Allow building against maven-surefire 2.12 (instead of 2.10).
by Roland Grunberg
commit 6ac9cc0acf7ba5318b22d6a273965cd0be20956e
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Mar 9 16:40:39 2012 -0500
- Update to 0.14.1 upstream tag.
- Allow building against maven-surefire 2.12 (instead of 2.10).
.gitignore | 1 +
sources | 2 +-
tycho-maven-surefire.patch | 86 ++++++++++++++++++++++++++++++++++++++++++++
tycho.spec | 22 ++++++-----
4 files changed, 100 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 526c781..29f39f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
maven-repo.tar.xz
tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz
tycho-0.14.0.tar.bz2
+/tycho-0.14.x.tar.bz2
diff --git a/sources b/sources
index 9ee347f..10f7576 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+819980acb31e0c06dca4fdd8320c39c1 tycho-0.14.x.tar.bz2
08dd3f86350287dbb7a57b9c48c3fab1 maven-repo.tar.xz
-a3295a852335596f703a54ab154585f0 tycho-0.14.0.tar.bz2
diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch
new file mode 100644
index 0000000..bf808cf
--- /dev/null
+++ b/tycho-maven-surefire.patch
@@ -0,0 +1,86 @@
+--- ./tycho-0.14.x.old/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java 2012-02-24 06:40:15.000000000 -0500
++++ ./tycho-0.14.x/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java 2012-03-09 15:52:27.000000000 -0500
+@@ -594,7 +594,7 @@
+ case 0:
+ getLog().info("All tests passed!");
+ break;
+- case RunResult.NO_TESTS:
++ case 254:
+ String message = "No tests found.";
+ if (failIfNoTests) {
+ throw new MojoFailureException(message);
+--- ./tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ ./tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-03-09 14:53:53.000000000 -0500
+@@ -5,7 +5,8 @@
+ Eclipse-AutoStart: true
+ Bundle-ClassPath: .,
+ jars/surefire-booter-2.10.jar,
+- jars/surefire-api-2.10.jar
++ jars/surefire-api-2.10.jar,
++ jars/maven-surefire-common-2.10.jar
+ Bundle-Version: 0.14.1
+ Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
+ Bundle-ManifestVersion: 2
+--- ./tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java 2012-02-24 06:40:15.000000000 -0500
++++ ./tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java 2012-03-09 15:44:34.000000000 -0500
+@@ -26,13 +26,14 @@
+ import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
+ import org.apache.maven.surefire.booter.ProviderConfiguration;
+ import org.apache.maven.surefire.booter.StartupConfiguration;
+-import org.apache.maven.surefire.booter.StartupReportConfiguration;
+-import org.apache.maven.surefire.booter.SurefireStarter;
++import org.apache.maven.plugin.surefire.StartupReportConfiguration;
++import org.apache.maven.plugin.surefire.InPluginVMSurefireStarter;
+ import org.apache.maven.surefire.report.ReporterConfiguration;
+ import org.apache.maven.surefire.suite.RunResult;
+ import org.apache.maven.surefire.testset.DirectoryScannerParameters;
+ import org.apache.maven.surefire.testset.TestRequest;
+ import org.apache.maven.surefire.util.RunOrder;
++import org.apache.maven.surefire.testset.RunOrderParameters;
+ import org.eclipse.core.runtime.CoreException;
+ import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.core.runtime.Status;
+@@ -63,22 +64,22 @@
+ boolean printSummary = true;
+ boolean disableXmlReport = false;
+ ClassLoader testClassLoader = getBundleClassLoader(plugin);
+- ClassLoader surefireClassLoader = SurefireStarter.class.getClassLoader();
++ ClassLoader surefireClassLoader = InPluginVMSurefireStarter.class.getClassLoader();
+
+ TychoClasspathConfiguration classPathConfig = new TychoClasspathConfiguration(testClassLoader,
+ surefireClassLoader);
+ StartupConfiguration startupConfiguration = new StartupConfiguration(provider, classPathConfig,
+ new ClassLoaderConfiguration(useSystemClassloader, useManifestOnlyJar), forkMode, inForkedVM);
+ DirectoryScannerParameters dirScannerParams = new DirectoryScannerParameters(testClassesDir, includes,
+- excludes, failIfNoTests, RunOrder.FILESYSTEM);
++ excludes, null, failIfNoTests, RunOrder.FILESYSTEM.name());
+ ReporterConfiguration reporterConfig = new ReporterConfiguration(reportsDir, trimStacktrace);
+ TestRequest testRequest = new TestRequest(null, testClassesDir, null);
+- ProviderConfiguration providerConfiguration = new ProviderConfiguration(dirScannerParams, failIfNoTests,
++ ProviderConfiguration providerConfiguration = new ProviderConfiguration(dirScannerParams, RunOrderParameters.DEFAULT(), failIfNoTests,
+ reporterConfig, null, testRequest, new Properties(), null);
+ StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
+ StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
+- trimStacktrace);
+- SurefireStarter surefireStarter = new SurefireStarter(startupConfiguration, providerConfiguration,
++ trimStacktrace, null, "TESTHASH", false);
++ InPluginVMSurefireStarter surefireStarter = new InPluginVMSurefireStarter(startupConfiguration, providerConfiguration,
+ startupReportConfig);
+
+ RunResult result = surefireStarter.runSuitesInProcess();
+--- ./tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ ./tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-03-09 14:45:54.987999986 -0500
+@@ -51,6 +51,13 @@
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <version>${surefire-version}</version>
++
++ </artifactItem>
++ <artifactItem>
++ <groupId>org.apache.maven.surefire</groupId>
++ <artifactId>maven-surefire-common</artifactId>
++ <version>${surefire-version}</version>
++
+ </artifactItem>
+ </artifactItems>
+ </configuration>
diff --git a/tycho.spec b/tycho.spec
index 71d2b05..b8b0ddb 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 1
+%global bootstrap 0
%global eclipsedir %{_libdir}/eclipse
@@ -9,16 +9,16 @@
%endif
Name: tycho
-Version: 0.14.0
-Release: 4.1%{?dist}
+Version: 0.14.1
+Release: 1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
# license file is missing but all files having some licensing information are ASL 2.0
License: ASL 2.0
URL: http://tycho.sonatype.org/
-# http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.14....
-Source0: %{name}-%{version}.tar.bz2
+# http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.14....
+Source0: %{name}-0.14.x.tar.bz2
# this is a workaround for maven-plugin-plugin changes that happened after
# version 2.4.3 (impossible to have empty mojo created as aggregate). This
@@ -37,6 +37,8 @@ Patch0: %{name}-fix-build.patch
# be cyclic dependencies.
Patch1: %{name}-%{version}-bootstrap.patch
%endif
+# Upstream builds against maven-surefire 2.10 but in rawhide we have 2.12
+Patch2: %{name}-maven-surefire.patch
BuildArch: noarch
@@ -108,12 +110,13 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q
+%setup -q -n %{name}-0.14.x
%patch0 -p2
%if %{bootstrap}
%patch1 -p1
%endif
+%patch2 -p2
find tycho-core -iname '*html' -delete
@@ -125,9 +128,6 @@ popd
%if %{bootstrap}
tar xf %{SOURCE3}
-%else
-mkdir -p .m2/org/eclipse/%{name}/%{name}-bundles-external/%{version}
-unzip -d .m2/org/eclipse/%{name}/%{name}-bundles-external/%{version} %{_javadir}/%{name}/%{name}-bundles-external.zip
%endif
%build
@@ -200,7 +200,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
-* Thu Feb 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.0-4.1
+* Fri Mar 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-1
+- Update to 0.14.1 upstream tag.
+- Allow building against maven-surefire 2.12 (instead of 2.10).
- Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
* Thu Feb 16 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.0-4
12 years, 1 month
[tycho] Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
by Roland Grunberg
commit 8d36c52a2f135f29c897a8770383ab8862e668d5
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu Feb 23 16:31:51 2012 -0500
Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
tycho.spec | 46 +++++-----------------------------------------
1 files changed, 5 insertions(+), 41 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index bc14d1a..71d2b05 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,12 +1,4 @@
-%global bootstrap 0
-
-%global e_osgi org.eclipse.osgi
-%global e_osgi_v 3.6.2.R36x_v20110210
-%global e_osgi_v2 3.8.0.v20120123-1419
-%global e_osgi_v3 3.8.0.v20110726-1606
-%global e_core org.eclipse.jdt.core
-%global e_core_v 3.6.2.v_A76_R36x
-%global e_core_v2 3.8.1.v20120125-1544
+%global bootstrap 1
%global eclipsedir %{_libdir}/eclipse
@@ -18,7 +10,7 @@
Name: tycho
Version: 0.14.0
-Release: 4%{?dist}
+Release: 4.1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -131,7 +123,6 @@ pushd tycho-maven-plugin/src/main/java/org/fedoraproject
cp %{SOURCE1} .
popd
-
%if %{bootstrap}
tar xf %{SOURCE3}
%else
@@ -139,36 +130,6 @@ mkdir -p .m2/org/eclipse/%{name}/%{name}-bundles-external/%{version}
unzip -d .m2/org/eclipse/%{name}/%{name}-bundles-external/%{version} %{_javadir}/%{name}/%{name}-bundles-external.zip
%endif
-# prepare directories for eclipse symlinks
-mkdir -p .m2/org/sonatype/tycho
-mkdir -p .m2/org/sonatype/tycho/%{e_osgi}/%{e_osgi_v}/
-mkdir -p .m2/org/sonatype/tycho/%{e_core}/%{e_core_v}/
-mkdir -p .m2/org/eclipse/tycho
-mkdir -p .m2/org/eclipse/tycho/%{e_osgi}/%{e_osgi_v2}/
-mkdir -p .m2/org/eclipse/tycho/%{e_osgi}/%{e_osgi_v3}/
-mkdir -p .m2/org/eclipse/tycho/%{e_core}/%{e_core_v2}/
-
-# maven resolver doesn't know how to resolve from directories other than _javadir
-pushd .m2/org/sonatype/tycho
-ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \
- %{e_osgi}/%{e_osgi_v}/%{e_osgi}-%{e_osgi_v}.jar
-ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \
- %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar || \
-ln -sf %{eclipsedir}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \
- %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar
-popd
-
-pushd .m2/org/eclipse/tycho
-ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \
- %{e_osgi}/%{e_osgi_v2}/%{e_osgi}-%{e_osgi_v2}.jar
-ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \
- %{e_osgi}/%{e_osgi_v3}/%{e_osgi}-%{e_osgi_v3}.jar
-ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \
- %{e_core}/%{e_core_v2}/%{e_core}-%{e_core_v2}.jar || \
-ln -sf %{eclipsedir}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \
- %{e_core}/%{e_core_v2}/%{e_core}-%{e_core_v2}.jar
-popd
-
%build
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
export TYCHO_TARGET_PLATFORM=%{eclipsedir}
@@ -239,6 +200,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Thu Feb 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.0-4.1
+- Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
+
* Thu Feb 16 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.0-4
- Non-bootstrap build.
12 years, 1 month