February 2013 - java-sig-commits - Fedora Mailing-Lists

[jetty-build-support] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires wi

by Stanislav Ochotnicky

commit 5733bad79aaba564c701342bb74fe81e0284e589 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Feb 6 20:10:05 2013 +0100 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local jetty-build-support.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/jetty-build-support.spec b/jetty-build-support.spec index 1a1b03a..93e30c5 100644 --- a/jetty-build-support.spec +++ b/jetty-build-support.spec @@ -1,6 +1,6 @@ Name: jetty-build-support Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Jetty build support files Group: Development/Libraries @@ -15,7 +15,7 @@ Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.toolchain.git/s BuildArch: noarch BuildRequires: jpackage-utils -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-compiler-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-source-plugin @@ -78,6 +78,10 @@ popd %doc %{_javadocdir}/%{name} %changelog +* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1.1-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Mon Dec 10 2012 Michal Srb <msrb(a)redhat.com> - 1.1-4 - migrated to plexus-components-component-default (#878549)

11 years, 4 months

1
0
0 / 0

[jetty-assembly-descriptors] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires wi

by Stanislav Ochotnicky

commit 663b971faf71df95f51eb63e1976e092e26bc007 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Feb 6 20:09:55 2013 +0100 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local jetty-assembly-descriptors.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/jetty-assembly-descriptors.spec b/jetty-assembly-descriptors.spec index c1383ac..c410da6 100644 --- a/jetty-assembly-descriptors.spec +++ b/jetty-assembly-descriptors.spec @@ -1,6 +1,6 @@ Name: jetty-assembly-descriptors Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Jetty assembly descriptors used for building Group: Development/Libraries @@ -13,7 +13,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: http://www.eclipse.org/legal/epl-v10.html BuildRequires: jpackage-utils -BuildRequires: maven +BuildRequires: maven-local BuildRequires: jetty-toolchain BuildRequires: maven-surefire-provider-junit @@ -48,6 +48,10 @@ install -Dp -m 644 target/%{name}-1.4.jar %{buildroot}%{_javadir}/%{name}.jar %{_mavendepmapfragdir}/%{name} %changelog +* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1.0-6 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Wed Oct 17 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0-5 - Install license files

11 years, 4 months

1
0
0 / 0

[jetty-artifact-remote-resources] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires wi

by Stanislav Ochotnicky

commit 1f7c9b31b6adda14b2fd55cd60169be268b6d5a1 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Feb 6 20:09:45 2013 +0100 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local jetty-artifact-remote-resources.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/jetty-artifact-remote-resources.spec b/jetty-artifact-remote-resources.spec index ea4810f..a006fa8 100644 --- a/jetty-artifact-remote-resources.spec +++ b/jetty-artifact-remote-resources.spec @@ -1,6 +1,6 @@ Name: jetty-artifact-remote-resources Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Jetty toolchain artifact remote resources Group: Development/Libraries @@ -15,7 +15,7 @@ Source2: http://www.apache.org/licenses/LICENSE-2.0.txt Source3: http://www.eclipse.org/legal/epl-v10.html BuildRequires: jpackage-utils -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-remote-resources-plugin >= 1.2.1-3 BuildRequires: maven-surefire-provider-junit BuildRequires: jetty-toolchain @@ -49,6 +49,10 @@ install -Dp -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name} %{_mavendepmapfragdir}/%{name} %changelog +* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1.0-7 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Wed Oct 17 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0-6 - Install license files

11 years, 4 months

1
0
0 / 0

[jetty] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires wi

by Stanislav Ochotnicky

commit e5a3e9a68da9d475849becccb01d7ba5de5ee2c7 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Feb 6 20:09:36 2013 +0100 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local jetty.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/jetty.spec b/jetty.spec index fbd0129..87011e6 100644 --- a/jetty.spec +++ b/jetty.spec @@ -51,7 +51,7 @@ Name: jetty Version: 8.1.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet @@ -76,7 +76,7 @@ BuildRequires: java-devel >= 1:1.7.0 BuildRequires: jpackage-utils BuildRequires: javapackages-tools >= 0.7.0 BuildRequires: jvnet-parent -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-dependency-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-war-plugin @@ -941,6 +941,10 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \ %doc %{_javadocdir}/%{name} %changelog +* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 8.1.5-11 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Fri Dec 14 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.5-10 - Reenable osgi support

11 years, 4 months

1
0
0 / 0

[jdependency] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires wi

by Stanislav Ochotnicky

commit d69d966f0d5b607067674d866bbe97dfb396845f Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Feb 6 20:09:08 2013 +0100 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local jdependency.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/jdependency.spec b/jdependency.spec index 726dde4..9e6fe0c 100644 --- a/jdependency.spec +++ b/jdependency.spec @@ -3,7 +3,7 @@ Name: jdependency Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: This project provides an API to analyse class dependencies Group: Development/Libraries @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin @@ -84,6 +84,10 @@ rm -rf %{buildroot} %doc LICENSE.txt %changelog +* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 0.7-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

11 years, 4 months

1
0
0 / 0

[tycho] Add tycho components to lookaside cache for future bootstrapping.

by Roland Grunberg

commit 08cec05253e867993e21174600349b899fc11900 Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Wed Feb 6 14:05:24 2013 -0500 Add tycho components to lookaside cache for future bootstrapping. sources | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) --- diff --git a/sources b/sources index 0ad679c..fe9d5d6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ e20a738b62efb1da02d5bbd1888bc9a4 tycho-0.16.x.tar.bz2 +ef2ea56bb4866cef0a00f6784431aaef maven-repo.tar.xz

11 years, 4 months

1
0
0 / 0

File maven-repo.tar.xz uploaded to lookaside cache by rgrunber

by Roland Grunberg

A file has been added to the lookaside cache for tycho: ef2ea56bb4866cef0a00f6784431aaef maven-repo.tar.xz

11 years, 4 months

1
0
0 / 0

[jboss-jaxr-1.0-api] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires wi

by Stanislav Ochotnicky

commit 23191605e060799a0a13541232d018e1a44339f2 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Feb 6 20:01:55 2013 +0100 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local jboss-jaxr-1.0-api.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/jboss-jaxr-1.0-api.spec b/jboss-jaxr-1.0-api.spec index f15e398..8e5dc7f 100644 --- a/jboss-jaxr-1.0-api.spec +++ b/jboss-jaxr-1.0-api.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: jboss-jaxr-1.0-api Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java(TM) API for XML Registries 1.0 (JAXR) Group: Development/Libraries License: CDDL or GPLv2 with exceptions @@ -18,7 +18,7 @@ BuildRequires: java-devel BuildRequires: jboss-specs-parent BuildRequires: jpackage-utils -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-install-plugin @@ -76,6 +76,10 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc LICENSE %changelog +* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1.0.2-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

11 years, 4 months

1
0
0 / 0

[jboss-j2eemgmt-1.1-api] - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires wi

by Stanislav Ochotnicky

commit 013c9f102049f7c927376f45b6c601d1dd9d9bbe Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Feb 6 20:00:53 2013 +0100 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven BuildRequires with maven-local jboss-j2eemgmt-1.1-api.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/jboss-j2eemgmt-1.1-api.spec b/jboss-j2eemgmt-1.1-api.spec index 03f1c89..a32fd1c 100644 --- a/jboss-j2eemgmt-1.1-api.spec +++ b/jboss-j2eemgmt-1.1-api.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: jboss-j2eemgmt-1.1-api Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java EE Management 1.1 API Group: Development/Libraries License: LGPLv2+ @@ -17,7 +17,7 @@ BuildRequires: jpackage-utils BuildRequires: jboss-ejb-3.1-api -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin BuildRequires: maven-install-plugin @@ -74,6 +74,10 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1.0.1-4 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

11 years, 4 months

1
0
0 / 0

[tycho] Change BR/R on maven to maven-local for XMvn support.

by Roland Grunberg

commit 39d8ccf4a8d28a3e0171abed70e18dbc8a8cae3b Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Wed Feb 6 12:13:21 2013 -0500 Change BR/R on maven to maven-local for XMvn support. Built bootstrapped to fix missing JavadirWorkspaceReader. FedoraWorkspaceReader cannot be accessed so use DefaultResolver instead. tycho-use-custom-resolver.patch | 47 ++++++++++++++++++++++---------------- tycho.spec | 12 ++++++--- 2 files changed, 35 insertions(+), 24 deletions(-) --- diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index a007aac..1dbaec4 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -1,4 +1,4 @@ -From eed70befcb3c5b55170a9847da2257b416e96314 Mon Sep 17 00:00:00 2001 +From d2140837249eb18247adf7ae9399c1092803f8f5 Mon Sep 17 00:00:00 2001 From: Roland Grunberg <rgrunber(a)redhat.com> Date: Tue, 12 Jun 2012 10:38:51 -0400 Subject: [PATCH] Implement a custom resolver for Tycho in local mode. @@ -23,13 +23,14 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b --- .../tycho/p2/target/TargetDefinitionResolver.java | 11 +++-- .../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++-- + tycho-core/pom.xml | 5 ++ .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++ .../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++ .../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++- .../DefaultTargetPlatformConfigurationReader.java | 6 ++- - .../osgi/runtime/TychoOsgiRuntimeLocator.java | 15 ++++++ + .../osgi/runtime/TychoOsgiRuntimeLocator.java | 12 +++++ .../p2/resolver/P2TargetPlatformResolver.java | 11 +++++ - 8 files changed, 157 insertions(+), 10 deletions(-) + 9 files changed, 159 insertions(+), 10 deletions(-) diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java index 5cc8718..7e4fcc1 100644 @@ -141,6 +142,22 @@ index c56eeff..bb45548 100644 if (logger.isDebugEnabled()) { IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS, +diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml +index c3d5288..d76c229 100644 +--- a/tycho-core/pom.xml ++++ b/tycho-core/pom.xml +@@ -146,6 +146,11 @@ + <artifactId>org.eclipse.tycho.core.shared</artifactId> + <version>${project.version}</version> + </dependency> ++ <dependency> ++ <groupId>org.fedoraproject.xmvn</groupId> ++ <artifactId>xmvn-core</artifactId> ++ <version>0.3.0</version> ++ </dependency> + + <dependency> + <groupId>org.eclipse.tycho</groupId> diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java index cccb6ff..fb8bf78 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java @@ -301,37 +318,27 @@ index 5c4a26f..802c9dd 100644 setTargetPlatformResolver(result, configuration); diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java -index 9935c5f..9e539e6 100644 +index 9935c5f..8f63735 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java -@@ -22,6 +22,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository; - import org.apache.maven.artifact.resolver.ArtifactResolutionException; - import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; - import org.apache.maven.artifact.resolver.ArtifactResolutionResult; -+import org.apache.maven.artifact.resolver.JavadirWorkspaceReader; - import org.apache.maven.artifact.resolver.ResolutionErrorHandler; - import org.apache.maven.execution.MavenSession; - import org.apache.maven.model.Dependency; -@@ -38,6 +39,7 @@ import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator; +@@ -38,6 +38,9 @@ import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator; import org.eclipse.tycho.dev.DevWorkspaceResolver; import org.eclipse.tycho.locking.facade.FileLockService; import org.eclipse.tycho.locking.facade.FileLocker; +import org.sonatype.aether.util.artifact.DefaultArtifact; ++ ++import org.fedoraproject.maven.resolver.DefaultResolver; /** * Implementation of {@link org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator} for Tycho's -@@ -201,6 +203,19 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator { +@@ -201,6 +204,15 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator { Artifact artifact = repositorySystem.createArtifact(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion(), dependency.getType()); + // If we are in local mode, find the artifact on the system + if (System.getenv("TYCHO_MVN_LOCAL") != null || System.getenv("TYCHO_MVN_RPMBUILD") != null) { -+ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader(); -+ DefaultArtifact newArtifact = new DefaultArtifact(artifact.getGroupId() -+ + ":" + artifact.getArtifactId() -+ + ":" + artifact.getType() -+ + ":" + artifact.getVersion()); -+ File file = wReader.findArtifact(newArtifact); ++ DefaultResolver resolver = new DefaultResolver(); ++ File file = resolver.resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType()); + if (file != null) { + artifact.setFile(file); + } diff --git a/tycho.spec b/tycho.spec index 42a353e..0c947a7 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,6 +1,6 @@ # Bootstrap build # Set this if Tycho and Eclipse are not in buildroot -%global bootstrap 0 +%global bootstrap 1 # When building version under development (non-release) # %%global snap -SNAPSHOT @@ -8,7 +8,7 @@ Name: tycho Version: 0.16.0 -Release: 20%{?dist} +Release: 20.1%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Group: Development/Libraries @@ -52,7 +52,7 @@ BuildArch: noarch BuildRequires: jpackage-utils BuildRequires: java-devel -BuildRequires: maven +BuildRequires: maven-local BuildRequires: maven-clean-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-dependency-plugin @@ -77,7 +77,7 @@ BuildRequires: %{name} Requires: jpackage-utils Requires: decentxml -Requires: maven +Requires: maven-local Requires: maven-clean-plugin Requires: maven-dependency-plugin Requires: maven-shared-verifier @@ -259,6 +259,10 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar %{_javadocdir}/%{name} %changelog +* Wed Feb 6 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-20.1 +- Change BR/R on maven to maven-local for XMvn support. +- Build bootstrapped to fix missing Fedora Maven class. + * Thu Jan 24 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-20 - Use TYCHO_MVN_{LOCAL,RPMBUILD} to determine how maven was called. - Update to maven-surefire 2.13.

11 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits February 2013