java-sig-commits November 2012

java-sig-commits@lists.fedoraproject.org

14 participants
540 discussions

[hibernate/f18] (3 commits) ...fixed changelog.
by Marek Goldmann 20 Nov '12

20 Nov '12

Summary of changes: b953ad3... Initial import (#852330). (*) 9d28526... fixed changelog. (*) 45065c3... fixed changelog. (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[tycho] Make additional changes to get Tycho building bootstrapped.
by Roland Grunberg 19 Nov '12

19 Nov '12

commit aba279566561430fd0fdbf1941851b24e612d58b Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Sat Nov 17 13:04:34 2012 -0500 Make additional changes to get Tycho building bootstrapped. depmap.xml | 18 ++++++ tycho-fix-bootstrap-build.patch | 112 +++++++++++++++++++++++++++++++++++++++ tycho.spec | 16 ++++-- 3 files changed, 142 insertions(+), 4 deletions(-) --- diff --git a/depmap.xml b/depmap.xml index ce74541..1a44a4d 100644 --- a/depmap.xml +++ b/depmap.xml @@ -11,4 +11,22 @@ <version>3.0.3</version> </jpp> </dependency> + +<dependency> + <maven> + <groupId>org.eclipse.tycho</groupId> + <artifactId>org.eclipse.osgi</artifactId> + <version>0</version> + </maven> + <jpp> + <groupId>JPP/eclipse</groupId> + <artifactId>osgi</artifactId> + <version>0</version> + </jpp> +</dependency> </dependencies> diff --git a/tycho-fix-bootstrap-build.patch b/tycho-fix-bootstrap-build.patch new file mode 100644 index 0000000..a0669e8 --- /dev/null +++ b/tycho-fix-bootstrap-build.patch @@ -0,0 +1,112 @@ +From 354a8a3e10fac409b9d0115d1cb377ee711d2025 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg <rgrunber(a)redhat.com> +Date: Mon, 19 Nov 2012 10:33:43 -0500 +Subject: [PATCH] Minor fixes of limited scope to get a Tycho bootstrapped + build. + +Eclipse p2 repositories can change subtly (disappear, become composites) +causing bizare failures in resolving from the reactor cache so we must +keep the URLs up to date. + +When doing a bootstrap build, we're using upstream jars with class files +compiled as 'jsr14' (Allows running on 1.4 JDK and can compile against +1.5 sources). JDK 1.7 is not backwards compatible (eg. info on generics +is ignored in these jars). +--- + tycho-bundles/tycho-bundles-target/tycho.target | 10 +++++----- + .../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------ + tycho-surefire/pom.xml | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target +index 3436ba6..67ba8c6 100644 +--- a/tycho-bundles/tycho-bundles-target/tycho.target ++++ b/tycho-bundles/tycho-bundles-target/tycho.target +@@ -2,11 +2,11 @@ + <?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="8"> + <locations> + <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> +-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120913-142258-7P7OG2BFLWUl7Unz-8OO8IEVz-8"/> +-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20121002-0800"/> +-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120913-170722-84FAgGhRFnbPjaFro9s2VXtitW"/> +-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N8BHpPGMMn84SxoTtoj_mfujQDR"/> +-<repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20121002-0800"/> ++<unit id="org.eclipse.equinox.executable.feature.group"/> ++<unit id="org.eclipse.sdk.ide"/> ++<unit id="org.eclipse.equinox.core.sdk.feature.group"/> ++<unit id="org.eclipse.equinox.p2.sdk.feature.group"/> ++<repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20121113-0800"/> + </location> + </locations> + </target> +diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java +index 37ce827..4cc7644 100644 +--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java ++++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java +@@ -25,7 +25,7 @@ public class OsgiManifest { + private static final StandardExecutionEnvironment[] EMPTY_EXEC_ENV = new StandardExecutionEnvironment[0]; + + private String location; +- private Headers<String, String> headers; ++ private Headers headers; + + // cache for parsed values of commonly used headers + private String bundleSymbolicName; +@@ -78,7 +78,7 @@ public class OsgiManifest { + } + + private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException { +- String value = headers.get(headerKey); ++ String value = (String) headers.get(headerKey); + if (value == null) { + throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found"); + } +@@ -100,12 +100,12 @@ public class OsgiManifest { + && "dir".equals(bundleShapeElements[0].getValue()); + } + +- public Headers<String, String> getHeaders() { ++ public Headers getHeaders() { + return headers; + } + + public String getValue(String key) { +- return headers.get(key); ++ return (String) headers.get(key); + } + + public String getBundleSymbolicName() { +@@ -141,7 +141,7 @@ public class OsgiManifest { + } + + private ManifestElement[] parseHeader(String key) { +- String value = headers.get(key); ++ String value = (String) headers.get(key); + if (value == null) { + return null; + } +@@ -154,7 +154,7 @@ public class OsgiManifest { + + public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException { + try { +- return ManifestElement.parseHeader(key, headers.get(key)); ++ return ManifestElement.parseHeader(key, (String) headers.get(key)); + } catch (BundleException e) { + throw new OsgiManifestParserException(location, e); + } +diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml +index eab06be..6622176 100644 +--- a/tycho-surefire/pom.xml ++++ b/tycho-surefire/pom.xml +@@ -41,7 +41,7 @@ + <repository> + <id>eclipse</id> + <layout>p2</layout> +- <url>http://download.eclipse.org/releases/indigo</url> ++ <url>http://download.eclipse.org/releases/indigo/201202240900</url> + </repository> + </repositories> + +-- +1.7.11.7 + diff --git a/tycho.spec b/tycho.spec index 4c071ab..da21470 100644 --- a/tycho.spec +++ b/tycho.spec @@ -8,7 +8,7 @@ Name: tycho Version: 0.16.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Group: Development/Libraries @@ -41,7 +41,10 @@ Patch4: %{name}-bootstrap.patch # Maven local mode will look in reactor cache for exact version (path lookup) # Set the built intermediary version of Tycho to be found in the reactor cache Patch5: %{name}-set-reactor-cache-version.patch +# These units cannot be found during a regular build Patch6: %{name}-remove-units.patch +# Additional changes needed just for bootstrap build +Patch7: %{name}-fix-bootstrap-build.patch BuildArch: noarch @@ -134,10 +137,12 @@ pushd tycho-maven-plugin/src/main/java/org/fedoraproject cp %{SOURCE1} . popd -export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m" - +# Bootstrap Build %if %{bootstrap} tar -xf %{SOURCE4} +%patch7 -p1 + +# Non-Bootstrap Build %else %patch6 -p1 @@ -233,7 +238,7 @@ mvn-rpmbuild org.apache.maven.plugins:maven-install-plugin:install-file \ -DartifactId=org.eclipse.osgi \ -Dversion=$osgiVer -osgiPomPath=`find ".m2/org/eclipse/tycho/org.eclipse.osgi" -name "org.eclipse.osgi-*.pom"` +osgiPomPath=`find ".m2/org/eclipse/tycho/org.eclipse.osgi" -name "org.eclipse.osgi-$osgiVer.pom"` install -pm 644 $osgiPomPath $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.pom install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar @@ -250,6 +255,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar %{_javadocdir}/%{name} %changelog +* Mon Nov 19 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-17 +- Make additional changes to get Tycho building bootstrapped. + * Mon Nov 5 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-16 - Add capability to build without depending on Tycho or Eclipse.

1 0

[plexus-bsh-factory/f18] (2 commits) ...fix incomplete license.txt
by Mikolaj Izdebski 19 Nov '12

19 Nov '12

Summary of changes: 72bdba9... Don't own _mavenfragdir (*) 9bb6e0b... fix incomplete license.txt (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[maven-shared] Fix verifier License tag
by Mikolaj Izdebski 19 Nov '12

19 Nov '12

Summary of changes: ab16b94... Fix verifier License tag (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[maven-shared/f18] Fix verifier License tag
by Mikolaj Izdebski 19 Nov '12

19 Nov '12

Summary of changes: ab16b94... Fix verifier License tag (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[maven-shared/f17: 2/2] Fix verifier License tag
by Mikolaj Izdebski 19 Nov '12

19 Nov '12

commit ab16b94d90714530f416cfeceaf0a6607f466b21 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Nov 19 17:39:45 2012 +0100 Fix verifier License tag - Install licelse files maven-shared.spec | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) --- diff --git a/maven-shared.spec b/maven-shared.spec index 7da6525..6f6cb5b 100644 --- a/maven-shared.spec +++ b/maven-shared.spec @@ -67,7 +67,7 @@ Summary: Maven Shared Components URL: http://maven.apache.org/shared/ Name: maven-shared Version: 15 -Release: 24%{?dist} +Release: 25%{?dist} License: ASL 2.0 Group: Development/Libraries @@ -332,6 +332,7 @@ Requires: plexus-containers-container-default Summary: Maven Verifier Component Group: Development/Libraries Version: %{verifier_version} +License: ASL 2.0 and BSD and MIT Requires: %{name} = 0:%{shared_components_version}-%{release} Requires: junit @@ -531,6 +532,7 @@ cp -pr target/site/apidocs/* \ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %files +%doc LICENSE.txt NOTICE.txt %dir %{_javadir}/%{name} %{_mavenpomdir}/JPP.%{name}-components-parent.pom %{_mavendepmapfragdir}/%{name} @@ -626,9 +628,14 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_mavendepmapfragdir}/%{name}-runtime %files javadoc +%doc LICENSE.txt NOTICE.txt %{_javadocdir}/%{name} %changelog +* Mon Nov 19 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 15-25 +- Fix verifier License tag +- Install licelse files + * Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 15-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

1 0

[maven-shared/f17] (2 commits) ...Fix verifier License tag
by Mikolaj Izdebski 19 Nov '12

19 Nov '12

Summary of changes: ac9df28... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*) ab16b94... Fix verifier License tag (*) This commit already existed in another branch; no separate mail sent

1 0

[maven] Fix license tag
by Mikolaj Izdebski 19 Nov '12

19 Nov '12

commit 5003b5412a7a4b42f6cbde3376e6510c6462fdd0 Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Nov 19 16:18:44 2012 +0100 Fix license tag maven.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/maven.spec b/maven.spec index 3375f38..9e222a0 100644 --- a/maven.spec +++ b/maven.spec @@ -2,11 +2,11 @@ Name: maven Version: 3.0.4 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools -License: ASL 2.0 and MIT and BSD +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}-%{version}… @@ -424,6 +424,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP %changelog +* Mon Nov 19 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-25 +- Fix license tag + * Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-24 - Install NOTICE file with javadoc package

1 0

[maven/f18] Fix license tag
by Mikolaj Izdebski 19 Nov '12

19 Nov '12

commit 4c8002472f44af6960c443f3d145f777d2f6236d Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Mon Nov 19 16:19:21 2012 +0100 Fix license tag maven.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/maven.spec b/maven.spec index 3789129..b7e3b03 100644 --- a/maven.spec +++ b/maven.spec @@ -2,11 +2,11 @@ Name: maven Version: 3.0.4 -Release: 21.1%{?dist} +Release: 21.2%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools -License: ASL 2.0 and MIT and BSD +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}-%{version}… @@ -385,6 +385,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP %changelog +* Mon Nov 19 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-21.2 +- Fix license tag + * Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-21.1 - Install NOTICE file with javadoc package

1 0

[cargo-resources] update to 1.3.1
by gil 19 Nov '12

19 Nov '12

commit 41ab3bbe5ff1e216296f81938dd50fd9194cbbf9 Author: gil <puntogil(a)libero.it> Date: Mon Nov 19 16:12:50 2012 +0100 update to 1.3.1 .gitignore | 1 + cargo-resources.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index cf9147f..bee72c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cargo-resources-1.2.4-src-svn.tar.gz +/cargo-resources-1.3.1-src-svn.tar.gz diff --git a/cargo-resources.spec b/cargo-resources.spec index cfe29a1..5dc8e9c 100644 --- a/cargo-resources.spec +++ b/cargo-resources.spec @@ -1,6 +1,6 @@ %global oname cargo Name: cargo-resources -Version: 1.2.4 +Version: 1.3.1 Release: 1%{?dist} Summary: Cargo Shared Resources Group: Development/Libraries @@ -146,6 +146,9 @@ cp -p build-tools/NOTICE . %doc LICENSE NOTICE %changelog +* Mon Nov 19 2012 gil cattaneo <puntogil(a)libero.it> 1.3.1-1 +- Update to 1.3.1 + * Thu Aug 23 2012 gil cattaneo <puntogil(a)libero.it> 1.2.4-1 - Update to 1.2.4 diff --git a/sources b/sources index e23b9ef..d7a76e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4cb8e4743af4865a91689f2c31a8938b cargo-resources-1.2.4-src-svn.tar.gz +c604d4ab4f67d84e6d283e29d4590d77 cargo-resources-1.3.1-src-svn.tar.gz

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits November 2012