[javapackages-tools] Update to upstream version 0.12.5
by Stanislav Ochotnicky
commit b7c707f00e4ee84ad9d84b80e8f90feb57a1a298
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Mar 1 16:19:39 2013 +0100
Update to upstream version 0.12.5
- Resolves problems with compat package provides and automatic requires
.gitignore | 1 +
javapackages-tools.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93e0b24..a0c9058 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/javapackages-0.12.2.tar.xz
/javapackages-0.12.3.tar.xz
/javapackages-0.12.4.tar.xz
+/javapackages-0.12.5.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 612bc09..4193200 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
-Version: 0.12.4
-Release: 2%{?dist}
+Version: 0.12.5
+Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
@@ -123,6 +123,10 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%changelog
+* Fri Mar 1 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.12.5-1
+- Update to upstream version 0.12.5
+- Resolves problems with compat package provides and automatic requires
+
* Wed Feb 27 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.12.4-2
- Don't mark RPM macro files as configuration
diff --git a/sources b/sources
index 8dd5ff0..8cf8c2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77cfbf19bec0b7cc9d85321efdde98b2 javapackages-0.12.4.tar.xz
+e98c9fe09b2b14dad0a70d2095ee428e javapackages-0.12.5.tar.xz
11 years, 2 months
[javapackages] Created tag 0.12.5
by Stanislav Ochotnicky
The lightweight tag '0.12.5' was created pointing to:
aba9a34... [maven.prov] Generate versioned provides when <skipProvides
11 years, 2 months
[javapackages] [maven.prov] Generate versioned provides when <skipProvides/> is found
by Stanislav Ochotnicky
commit aba9a341e6e7cfb2a58f6db7ee1b19372b7b0085
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Mar 1 16:15:26 2013 +0100
[maven.prov] Generate versioned provides when <skipProvides/> is found
Naming is a bit counter-intuitive, but this means that compat packages
containing versioned jars/poms will not have race conditions with original
packages when autorequires kicks in
depgenerators/maven.prov | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov
index 76ca0c5..1c981d0 100755
--- a/depgenerators/maven.prov
+++ b/depgenerators/maven.prov
@@ -51,14 +51,24 @@ class TagBuilder:
buf.write('</fragments>')
fragments = buf.getvalue()
doc = fromstring(fragments)
+ versioned_provides = False
if doc.find('.//skipProvides') is not None:
- # this is compat package, don't generate mvn provides
- return
+ # this is compat package, generate versioned provides
+ # yes, the naming is weird
+ versioned_provides = True
+
for mpart in doc.findall('.//maven'):
groupId = mpart.find('groupId').text
artifactId = mpart.find('artifactId').text
version = mpart.find('version').text
- print "mvn(%s:%s) = %s" %(groupId, artifactId, version)
+ if versioned_provides:
+ print "mvn({gid}:{aid}:{version}) = {version}".format(gid=groupId,
+ aid=artifactId,
+ version=version)
+ else:
+ print "mvn({gid}:{aid}) = {version}".format(gid=groupId,
+ aid=artifactId,
+ version=version)
if __name__ == "__main__":
11 years, 2 months
[javapackages] [maven_depmap] Add <skipProvides/> tag to compat depmaps
by Stanislav Ochotnicky
commit a75039a3ea0eb6d85938bd44df4eb4162bd8033f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Mar 1 16:14:34 2013 +0100
[maven_depmap] Add <skipProvides/> tag to compat depmaps
scripts/maven_depmap.py | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/scripts/maven_depmap.py b/scripts/maven_depmap.py
index 4129925..e7fd748 100644
--- a/scripts/maven_depmap.py
+++ b/scripts/maven_depmap.py
@@ -193,14 +193,20 @@ def create_mappings(fragment, additions = None):
maps.append((g, a))
return maps
-def output_fragment(fragment_path, fragment, mappings, versions):
+def output_fragment(fragment_path, fragment, mappings, add_versions):
"""Writes fragment into fragment_path in specialised format
compatible with jpp"""
with open(fragment_path, "aw") as ffile:
- if not versions:
+
+ if not add_versions:
versions = []
else:
- versions = versions.split(',')
+ versions = add_versions.split(',')
+
+ if add_versions or add_versions == "":
+ # skip RPM provides in compat packages
+ ffile.write("<skipProvides/>\n")
+
versions.insert(0, fragment.version)
for ver in versions:
for m in mappings:
11 years, 2 months
[maven-wagon/wagon-2.4] Port to jetty 9
by Mikolaj Izdebski
commit e173366260e4e29b95b3d4225c79f299c689263c
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Mar 1 15:32:39 2013 +0100
Port to jetty 9
...-to-jetty-8.patch => 0001-Port-to-jetty-9.patch | 125 ++++++++++++++++----
maven-wagon.spec | 5 +-
wagon-http-shared-pom_xml.patch | 15 ---
3 files changed, 107 insertions(+), 38 deletions(-)
---
diff --git a/0001-Port-to-jetty-8.patch b/0001-Port-to-jetty-9.patch
similarity index 68%
rename from 0001-Port-to-jetty-8.patch
rename to 0001-Port-to-jetty-9.patch
index 3753d05..5a44979 100644
--- a/0001-Port-to-jetty-8.patch
+++ b/0001-Port-to-jetty-9.patch
@@ -1,12 +1,12 @@
-From e7c5fab3875a9e4089277e7d7c9711d974b63601 Mon Sep 17 00:00:00 2001
+From a98d4de91d767519ed9f4680607d466ba170e45d Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb(a)redhat.com>
Date: Wed, 27 Feb 2013 12:38:47 +0100
-Subject: [PATCH] Port to jetty 8
+Subject: [PATCH] Port to jetty 9
---
- wagon-provider-test/pom.xml | 30 ++++++++-
- .../apache/maven/wagon/http/HttpWagonTestCase.java | 77 +++++++++++-----------
- 2 files changed, 67 insertions(+), 40 deletions(-)
+ wagon-provider-test/pom.xml | 30 ++++++-
+ .../apache/maven/wagon/http/HttpWagonTestCase.java | 97 +++++++++++-----------
+ 2 files changed, 78 insertions(+), 49 deletions(-)
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index 1bc9826..efa730d 100644
@@ -50,10 +50,10 @@ index 1bc9826..efa730d 100644
</dependencies>
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
-index 4ee5475..66c77c9 100644
+index 4ee5475..96728d3 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
-@@ -34,20 +34,23 @@
+@@ -34,20 +34,25 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringOutputStream;
import org.codehaus.plexus.util.StringUtils;
@@ -72,10 +72,12 @@ index 4ee5475..66c77c9 100644
-import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Handler;
-+import org.eclipse.jetty.server.AbstractHttpConnection;
++import org.eclipse.jetty.server.HttpConnection;
++import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.NetworkConnector;
+import org.eclipse.jetty.server.UserIdentity;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
@@ -91,7 +93,7 @@ index 4ee5475..66c77c9 100644
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
-@@ -95,7 +98,7 @@ protected void setupWagonTestingFixtures()
+@@ -95,7 +100,7 @@ protected void setupWagonTestingFixtures()
server = new Server( 0 );
PutHandler putHandler = new PutHandler( repositoryDirectory );
@@ -100,7 +102,14 @@ index 4ee5475..66c77c9 100644
createContext( server, repositoryDirectory );
-@@ -119,8 +122,8 @@ protected final int getTestRepositoryPort()
+@@ -113,14 +118,14 @@ protected final int getTestRepositoryPort()
+ {
+ return 0;
+ }
+- return server.getConnectors()[0].getLocalPort();
++ return ((NetworkConnector) (server.getConnectors()[0])).getLocalPort();
+ }
+
protected void createContext( Server server, File repositoryDirectory )
throws IOException
{
@@ -111,7 +120,34 @@ index 4ee5475..66c77c9 100644
ServletHolder servletHolder = new ServletHolder( new DefaultServlet() );
root.addServlet( servletHolder, "/*" );
}
-@@ -368,7 +371,7 @@ public void testGzipGet()
+@@ -160,7 +165,7 @@ public void testHttpHeaders()
+ server.start();
+
+ wagon.connect(
+- new Repository( "id", getProtocol() + "://localhost:" + server.getConnectors()[0].getLocalPort() ) );
++ new Repository( "id", getProtocol() + "://localhost:" + ((NetworkConnector) (server.getConnectors()[0])).getLocalPort() ) );
+
+ wagon.getToStream( "resource", new StringOutputStream() );
+
+@@ -192,7 +197,7 @@ public void testHttpHeadersWithCommonMethods()
+ server.start();
+
+ wagon.connect(
+- new Repository( "id", getProtocol() + "://localhost:" + server.getConnectors()[0].getLocalPort() ) );
++ new Repository( "id", getProtocol() + "://localhost:" + ((NetworkConnector) (server.getConnectors()[0])).getLocalPort() ) );
+
+ wagon.getToStream( "resource", new StringOutputStream() );
+
+@@ -211,7 +216,7 @@ protected void addConnectors( Server server )
+
+ protected String getRepositoryUrl( Server server )
+ {
+- int localPort = server.getConnectors()[0].getLocalPort();
++ int localPort = ((NetworkConnector) (server.getConnectors()[0])).getLocalPort();
+ return getProtocol() + "://localhost:" + localPort;
+ }
+
+@@ -368,7 +373,7 @@ public void testGzipGet()
Server server = new Server( getTestRepositoryPort() );
String localRepositoryPath = FileTestUtils.getTestOutputDir().toString();
@@ -120,7 +156,43 @@ index 4ee5475..66c77c9 100644
root.setResourceBase( localRepositoryPath );
ServletHolder servletHolder = new ServletHolder( new DefaultServlet() );
servletHolder.setInitParameter( "gzip", "true" );
-@@ -901,13 +904,13 @@ public void testRedirectPutFileRelativeUrl()
+@@ -471,7 +476,7 @@ public void testRedirectGetToStream()
+ protocol = "https";
+ }
+
+- String redirectUrl = protocol + "://localhost:" + server.getConnectors()[0].getLocalPort();
++ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) (server.getConnectors()[0])).getLocalPort();
+
+ RedirectHandler redirectHandler = new RedirectHandler( "Found", 303, redirectUrl, null );
+
+@@ -537,7 +542,7 @@ public void testRedirectGet()
+ protocol = "https";
+ }
+
+- String redirectUrl = protocol + "://localhost:" + server.getConnectors()[0].getLocalPort();
++ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) (server.getConnectors()[0])).getLocalPort();
+
+ RedirectHandler redirectHandler = new RedirectHandler( "Found", 303, redirectUrl, null );
+
+@@ -605,7 +610,7 @@ public void testRedirectPutFromStreamWithFullUrl()
+ protocol = "https";
+ }
+
+- String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort();
++ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) (realServer.getConnectors()[0])).getLocalPort();
+
+ RedirectHandler redirectHandler = new RedirectHandler( "Found", 303, redirectUrl, repositoryDirectory );
+
+@@ -776,7 +781,7 @@ public void testRedirectPutFileWithFullUrl()
+ protocol = "https";
+ }
+
+- String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort();
++ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) (realServer.getConnectors()[0])).getLocalPort();
+
+ RedirectHandler redirectHandler = new RedirectHandler( "Found", 303, redirectUrl, repositoryDirectory );
+
+@@ -901,13 +906,13 @@ public void testRedirectPutFileRelativeUrl()
this.repositoryDirectory = repositoryDirectory;
}
@@ -136,7 +208,16 @@ index 4ee5475..66c77c9 100644
handlerRequestResponses.add(
new HandlerRequestResponse( req.getMethod(), ( (Response) resp ).getStatus(),
req.getRequestURI() ) );
-@@ -1062,7 +1065,7 @@ public void runTestSecuredGet( AuthenticationInfo authInfo )
+@@ -935,7 +940,7 @@ private void runTestProxiedRequest( ProxyInfo proxyInfo, TestHeaderHandler handl
+
+ proxyServer.start();
+
+- proxyInfo.setPort( proxyServer.getConnectors()[0].getLocalPort() );
++ proxyInfo.setPort( ((NetworkConnector) (proxyServer.getConnectors()[0])).getLocalPort() );
+
+ System.out.println(
+ "start proxy on host/port " + proxyInfo.getHost() + "/" + proxyInfo.getPort() + " with non proxyHosts "
+@@ -1062,7 +1067,7 @@ public void runTestSecuredGet( AuthenticationInfo authInfo )
assertEquals( "top secret", IOUtil.toString( in ) );
@@ -145,7 +226,7 @@ index 4ee5475..66c77c9 100644
testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() );
}
-@@ -1113,7 +1116,7 @@ public void runTestSecuredGetToStream( AuthenticationInfo authInfo )
+@@ -1113,7 +1118,7 @@ public void runTestSecuredGetToStream( AuthenticationInfo authInfo )
assertEquals( "top secret", out.toString() );
@@ -154,7 +235,7 @@ index 4ee5475..66c77c9 100644
testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() );
}
finally
-@@ -1203,9 +1206,9 @@ private Server createSecurityServer( String localRepositoryPath )
+@@ -1203,9 +1208,9 @@ private Server createSecurityServer( String localRepositoryPath )
SecurityHandler sh = createSecurityHandler();
@@ -166,7 +247,7 @@ index 4ee5475..66c77c9 100644
root.setResourceBase( localRepositoryPath );
ServletHolder servletHolder = new ServletHolder( new DefaultServlet() );
root.addServlet( servletHolder, "/*" );
-@@ -1566,7 +1569,7 @@ public void setStatusToReturn( int status )
+@@ -1566,7 +1571,7 @@ public void setStatusToReturn( int status )
this.status = status;
}
@@ -175,7 +256,7 @@ index 4ee5475..66c77c9 100644
throws IOException, ServletException
{
if ( status != 0 )
-@@ -1622,11 +1625,11 @@ public PutHandler( File repositoryDirectory )
+@@ -1622,11 +1627,11 @@ public PutHandler( File repositoryDirectory )
this.resourceBase = repositoryDirectory;
}
@@ -185,11 +266,11 @@ index 4ee5475..66c77c9 100644
{
Request base_request =
- request instanceof Request ? (Request) request : HttpConnection.getCurrentConnection().getRequest();
-+ request instanceof Request ? (Request) request : AbstractHttpConnection.getCurrentConnection().getRequest();
++ request instanceof Request ? (Request) request : HttpConnection.getCurrentConnection().getHttpChannel().getRequest();
if ( base_request.isHandled() || !"PUT".equals( base_request.getMethod() ) )
{
-@@ -1671,7 +1674,7 @@ public void handle( String target, HttpServletRequest request, HttpServletRespon
+@@ -1671,7 +1676,7 @@ public void handle( String target, HttpServletRequest request, HttpServletRespon
List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>();
@@ -198,7 +279,7 @@ index 4ee5475..66c77c9 100644
throws IOException, ServletException
{
System.out.println( " handle proxy request" );
-@@ -1687,7 +1690,7 @@ public void handle( String target, HttpServletRequest request, HttpServletRespon
+@@ -1687,7 +1692,7 @@ public void handle( String target, HttpServletRequest request, HttpServletRespon
}
handlerRequestResponses.add(
new HandlerRequestResponse( request.getMethod(), 200, request.getRequestURI() ) );
@@ -207,7 +288,7 @@ index 4ee5475..66c77c9 100644
}
}
-@@ -1702,7 +1705,7 @@ public TestHeaderHandler()
+@@ -1702,7 +1707,7 @@ public TestHeaderHandler()
{
}
@@ -216,7 +297,7 @@ index 4ee5475..66c77c9 100644
throws IOException, ServletException
{
headers = new HashMap();
-@@ -1737,31 +1740,29 @@ protected TestSecurityHandler createSecurityHandler()
+@@ -1737,31 +1742,29 @@ protected TestSecurityHandler createSecurityHandler()
cm.setPathSpec( "/*" );
TestSecurityHandler sh = new TestSecurityHandler();
diff --git a/maven-wagon.spec b/maven-wagon.spec
index 7f6208d..3759cd3 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -9,7 +9,7 @@ License: ASL 2.0
URL: http://maven.apache.org/wagon
Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wag...
-Patch0: 0001-Port-to-jetty-8.patch
+Patch0: 0001-Port-to-jetty-9.patch
BuildArch: noarch
@@ -121,6 +121,9 @@ Javadoc for %{name}.
%doc LICENSE NOTICE DEPENDENCIES
%changelog
+* Fri Mar 01 2013 Michal Srb <msrb(a)redhat.com> - 0:2.4-1
+- Port to jetty 9
+
* Thu Feb 28 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.4-1
- Simplify build-requires
11 years, 2 months
[maven] Fix a copy-paste mistake
by Mikolaj Izdebski
commit a88154f287a11e865918b0b5b0dcb27fa9dcc741
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Mar 1 14:00:00 2013 +0100
Fix a copy-paste mistake
maven.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 3af1de6..c7187de 100644
--- a/maven.spec
+++ b/maven.spec
@@ -137,7 +137,7 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name
mv $M2_HOME/bin/m2.conf %{buildroot}%{_sysconfdir}
ln -sf %{_sysconfdir}/m2.conf %{buildroot}%{_datadir}/%{name}/bin/m2.conf
mv $M2_HOME/conf/settings.xml %{buildroot}%{_sysconfdir}/%{name}
-ln -sf %{_sysconfdir}/%{name}/m2.conf %{buildroot}%{_datadir}/%{name}/conf/m2.conf
+ln -sf %{_sysconfdir}/%{name}/settings.xml %{buildroot}%{_datadir}/%{name}/conf/settings.xml
cp -a $M2_HOME/bin/* %{buildroot}%{_datadir}/%{name}/bin
11 years, 2 months
[maven] Update to upstream version 3.0.5
by Mikolaj Izdebski
commit a60e276854718e2beacc8951bf9e8af754a4a36f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Mar 1 13:52:54 2013 +0100
Update to upstream version 3.0.5
- Move settings.xml to /etc
.gitignore | 1 +
maven.spec | 18 ++++++++++++------
sources | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf42837..b9bc2b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/apache-maven-3.0.3-RC1-src.tar.gz
/apache-maven-3.0.3-src.tar.gz
/apache-maven-3.0.4-src.tar.gz
+/apache-maven-3.0.5-src.tar.gz
diff --git a/maven.spec b/maven.spec
index 9a25a64..3af1de6 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,16 +1,14 @@
%global debug_package %{nil}
Name: maven
-Version: 3.0.4
-Release: 32%{?dist}
+Version: 3.0.5
+Release: 1%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
License: ASL 2.0
URL: http://maven.apache.org/
-# Source URL is for testing only, final version will be in different place:
-# http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{versio...
-Source0: http://archive.apache.org/dist/maven/source/apache-%{name}-%{version}-src...
+Source0: http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache...
Source1: maven-bash-completion
Source2: mvn.1
@@ -129,6 +127,7 @@ install -d -m 755 %{buildroot}%{_datadir}/%{name}/boot
install -d -m 755 %{buildroot}%{_datadir}/%{name}/lib
install -d -m 755 %{buildroot}%{_datadir}/%{name}/ext
install -d -m 755 %{buildroot}%{_bindir}
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
install -d -m 755 %{buildroot}%{_sysconfdir}/bash_completion.d
install -d -m 755 %{buildroot}%{_mandir}/man1
@@ -137,9 +136,10 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
mv $M2_HOME/bin/m2.conf %{buildroot}%{_sysconfdir}
ln -sf %{_sysconfdir}/m2.conf %{buildroot}%{_datadir}/%{name}/bin/m2.conf
+mv $M2_HOME/conf/settings.xml %{buildroot}%{_sysconfdir}/%{name}
+ln -sf %{_sysconfdir}/%{name}/m2.conf %{buildroot}%{_datadir}/%{name}/conf/m2.conf
cp -a $M2_HOME/bin/* %{buildroot}%{_datadir}/%{name}/bin
-cp -a $M2_HOME/conf/* %{buildroot}%{_datadir}/%{name}/conf
ln -sf $(build-classpath plexus/classworlds) \
%{buildroot}%{_datadir}/%{name}/boot/plexus-classworlds.jar
@@ -181,7 +181,9 @@ ln -sf $(build-classpath plexus/classworlds) \
%{_datadir}/%{name}
%{_bindir}/mvn
%dir %{_javadir}/%{name}
+%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/m2.conf
+%config(noreplace) %{_sysconfdir}/%{name}/settings.xml
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
%{_mandir}/man1/mvn.1.gz
@@ -190,6 +192,10 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog
+* Fri Mar 1 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.5-1
+- Update to upstream version 3.0.5
+- Move settings.xml to /etc
+
* Mon Feb 11 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-32
- Remove xerces-j2 from plexus.core realm
- Resolves: rhbz#784816
diff --git a/sources b/sources
index ee1aa17..9588e13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17ca94d5be05a78c6ab12425b7a0ee10 apache-maven-3.0.4-src.tar.gz
+b88becd8fe5a9665191e05945942db64 apache-maven-3.0.5-src.tar.gz
11 years, 2 months
[Bug 915191] Display env. is not set
by Red Hat Bugzilla
Product: Fedora
https://bugzilla.redhat.com/show_bug.cgi?id=915191
Mat Booth <fedora(a)matbooth.co.uk> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |fedora(a)matbooth.co.uk
--- Comment #7 from Mat Booth <fedora(a)matbooth.co.uk> ---
This is affecting other non-Eclipse packages too, for example this scratch
build of the jutils package fails with the following exception:
http://koji.fedoraproject.org/koji/taskinfo?taskID=5066298
[ERROR] Failed to execute goal
org.apache.maven.plugins:maven-surefire-plugin:2.13:test (default-test) on
project jutils: Execution default-test of goal
org.apache.maven.plugins:maven-surefire-plugin:2.13:test failed: There was an
error in the forked process
[ERROR] java.awt.HeadlessException:
[ERROR] No X11 DISPLAY variable was set, but this program performed an
operation which requires it.
[ERROR] at
java.awt.GraphicsEnvironment.checkHeadless(GraphicsEnvironment.java:207)
[ERROR] at java.awt.Window.<init>(Window.java:535)
[ERROR] at java.awt.Frame.<init>(Frame.java:420)
[ERROR] at javax.swing.JFrame.<init>(JFrame.java:218)
[ERROR] at
net.java.games.util.plugins.test.PluginTest.<init>(PluginTest.java:97)
[ERROR] at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native
Method)
[ERROR] at
sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
[ERROR] at
sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
[ERROR] at java.lang.reflect.Constructor.newInstance(Constructor.java:525)
[ERROR] at java.lang.Class.newInstance0(Class.java:374)
[ERROR] at java.lang.Class.newInstance(Class.java:327)
[ERROR] at
org.apache.maven.surefire.junit.PojoTestSet.<init>(PojoTestSet.java:63)
[ERROR] at
org.apache.maven.surefire.junit.JUnit3Provider.createTestSet(JUnit3Provider.java:118)
[ERROR] at
org.apache.maven.surefire.junit.JUnit3Provider.invoke(JUnit3Provider.java:108)
[ERROR] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
[ERROR] at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
[ERROR] at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
[ERROR] at java.lang.reflect.Method.invoke(Method.java:601)
[ERROR] at
org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray2(ReflectionUtils.java:208)
[ERROR] at
org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:158)
[ERROR] at
org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:86)
[ERROR] at
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:153)
[ERROR] at
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:95)
--
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=bvMmhEcdHI&a=cc_unsubscribe
11 years, 2 months