[plexus-containers/f20] Remove system-scoped dependency on com.sun:tools
by Mikolaj Izdebski
commit cfe3c9e77161f66272f38821a816269ec62194e4
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 13 09:26:12 2014 +0200
Remove system-scoped dependency on com.sun:tools
plexus-containers.spec | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/plexus-containers.spec b/plexus-containers.spec
index b74981e..a07df5b 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -109,11 +109,7 @@ cp %{SOURCE2} plexus-component-annotations/build.xml
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
# OpenJDK7 compatibility
-%pom_xpath_replace "pom:profile[pom:id[text()='default-tools.jar']]/pom:activation" "
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-" plexus-component-javadoc
+%pom_add_dep com.sun:tools plexus-component-javadoc
# Generate OSGI info
%pom_xpath_inject "pom:project" "
@@ -165,6 +161,7 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
%changelog
* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.5.5-13.1
- Update to Plexus Classworlds 2.5, resolves: rhbz#1015124
+- Remove system-scoped dependency on com.sun:tools
* Mon Oct 6 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.5.5-13.1
- Obsolete plexus-container-default
9 years, 7 months
[plexus-containers/f20] Update to classworlds 2.5
by Mikolaj Izdebski
commit 4638573c852941833b1db557bbc0c443d7a6e20f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Dec 5 14:24:33 2013 +0100
Update to classworlds 2.5
0002-Update-to-Plexus-Classworlds-2.5.patch | 71 +++++++++++++++++++++++++++
plexus-containers.spec | 9 +++-
2 files changed, 78 insertions(+), 2 deletions(-)
---
diff --git a/0002-Update-to-Plexus-Classworlds-2.5.patch b/0002-Update-to-Plexus-Classworlds-2.5.patch
new file mode 100644
index 0000000..d977139
--- /dev/null
+++ b/0002-Update-to-Plexus-Classworlds-2.5.patch
@@ -0,0 +1,71 @@
+From b0d63f977a529a2a782ebf9473e4333416b9cc96 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Thu, 5 Dec 2013 14:36:05 +0100
+Subject: [PATCH 2/2] Update to Plexus Classworlds 2.5
+
+---
+ .../org/codehaus/plexus/component/repository/ComponentDescriptor.java | 4 ++--
+ .../org/codehaus/plexus/component/repository/ComponentDescriptor.java | 4 ++--
+ pom.xml | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+index 1139d17..51e78ee 100644
+--- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
++++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+@@ -189,7 +189,7 @@ public class ComponentDescriptor<T>
+ {
+ try
+ {
+- roleClass = realm.loadClass( role );
++ roleClass = (Class) realm.loadClass( role );
+ Thread.currentThread();
+ }
+ catch ( Throwable ignored )
+@@ -299,7 +299,7 @@ public class ComponentDescriptor<T>
+ {
+ try
+ {
+- implementationClass = realm.loadClass( implementation );
++ implementationClass = (Class) realm.loadClass( implementation );
+ Thread.currentThread();
+ }
+ catch ( Throwable ignored )
+diff --git a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+index ef23e19..35fd85e 100644
+--- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
++++ b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+@@ -189,7 +189,7 @@ public class ComponentDescriptor<T>
+ {
+ try
+ {
+- roleClass = getRealm().loadClass( getRole() );
++ roleClass = (Class) getRealm().loadClass( getRole() );
+ Thread.currentThread();
+ }
+ catch ( Throwable ignored )
+@@ -299,7 +299,7 @@ public class ComponentDescriptor<T>
+ {
+ try
+ {
+- implementationClass = getRealm().loadClass( getImplementation() );
++ implementationClass = (Class) getRealm().loadClass( getImplementation() );
+ Thread.currentThread();
+ }
+ catch ( Throwable ignored )
+diff --git a/pom.xml b/pom.xml
+index 890fca3..b262fe0 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -31,7 +31,7 @@
+ </scm>
+
+ <properties>
+- <classWorldsVersion>2.2.2</classWorldsVersion>
++ <classWorldsVersion>2.5</classWorldsVersion>
+ <plexusUtilsVersion>1.4.5</plexusUtilsVersion>
+ <xbeanReflectVersion>3.4</xbeanReflectVersion>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+--
+1.8.1.4
+
diff --git a/plexus-containers.spec b/plexus-containers.spec
index ed248b2..b74981e 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -23,6 +23,7 @@ Source2: plexus-component-annotations-build.xml
Source3: plexus-containers-settings.xml
Patch0: 0001-Fix-test-oom.patch
+Patch1: 0002-Update-to-Plexus-Classworlds-2.5.patch
BuildArch: noarch
@@ -34,13 +35,13 @@ BuildRequires: maven-site-plugin
BuildRequires: maven-shared-invoker
BuildRequires: maven-release
BuildRequires: maven-plugin-plugin
-BuildRequires: plexus-classworlds
+BuildRequires: plexus-classworlds >= 2.5
BuildRequires: plexus-utils
BuildRequires: plexus-cli
BuildRequires: xbean
BuildRequires: guava
-Requires: plexus-classworlds >= 2.2.3
+Requires: plexus-classworlds >= 2.5
Requires: plexus-utils
Requires: xbean
Requires: guava
@@ -102,6 +103,7 @@ cp %{SOURCE1} plexus-container-default/build.xml
cp %{SOURCE2} plexus-component-annotations/build.xml
%patch0 -p1
+%patch1 -p1
# For Maven 3 compat
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
@@ -161,6 +163,9 @@ sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|"
%files javadoc -f .mfiles-javadoc
%changelog
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.5.5-13.1
+- Update to Plexus Classworlds 2.5, resolves: rhbz#1015124
+
* Mon Oct 6 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.5.5-13.1
- Obsolete plexus-container-default
9 years, 7 months
[apache-commons-compress] Update to upstream version 1.9
by Mikolaj Izdebski
commit 76342b8ddc21d6aa800960a95ab26277e299ed38
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 13 09:10:13 2014 +0200
Update to upstream version 1.9
.gitignore | 1 +
apache-commons-compress.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 502d62d..80afc14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ commons-compress-1.0-src.tar.gz
/commons-compress-1.7-src.tar.gz
/commons-compress-1.8-src.tar.gz
/commons-compress-1.8.1-src.tar.gz
+/commons-compress-1.9-src.tar.gz
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index ba026f4..467c334 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.8.1
-Release: 3%{?dist}
+Version: 1.9
+Release: 1%{?dist}
Summary: Java API for working with compressed files and archivers
Group: Development/Libraries
License: ASL 2.0
@@ -54,6 +54,9 @@ This package provides %{summary}.
%changelog
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.9-1
+- Update to upstream version 1.9
+
* Wed Jul 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.8.1-3
- Fix build-requires on apache-commons-parent
diff --git a/sources b/sources
index c3b2182..db1cb7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5aaa32681260f71cdc440493f475c42 commons-compress-1.8.1-src.tar.gz
+b25aadefc1ba0017f5ee3be75a29f733 commons-compress-1.9-src.tar.gz
9 years, 7 months
[checkstyle] Skip test that requires network
by Mikolaj Izdebski
commit 5ce284200161f3f32e57c97ae8a4b96aeb56310e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 13 09:03:56 2014 +0200
Skip test that requires network
checkstyle.spec | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/checkstyle.spec b/checkstyle.spec
index 06f6d79..a68ff00 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -109,7 +109,7 @@ sed -i 's/\r//' LICENSE LICENSE.apache20 README.md RIGHTS.antlr \
java.header
# The following test needs network access, so it would fail on Koji
-rm -f src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
+sed -i '/testLoadFromURL/s/ *.*/ @org.junit.Ignore&/' src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
%build
%mvn_file : %{name}
@@ -174,6 +174,7 @@ fi
%changelog
* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 5.8-1
- Update to upstream version 5.8
+- Skip test that requires network
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 5.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 7 months
[plexus-compiler] Update to upstream version 2.4
by Mikolaj Izdebski
commit cadbb58ed620ec261c0d1fb2e60a7b17fae75ee9
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 13 08:50:20 2014 +0200
Update to upstream version 2.4
.gitignore | 2 ++
plexus-compiler.spec | 7 +++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5a992c..69c6e27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz
/sonatype-plexus-compiler-plexus-compiler-1.9.1-0-g233d1ab.tar.gz
/plexus-compiler-2.1.tar.gz
/plexus-compiler-2.3.tar.gz
+/LICENSE-2.0.txt
+/plexus-compiler-2.4.tar.gz
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index e83e416..369ac31 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -1,8 +1,8 @@
%global parent plexus
Name: plexus-compiler
-Version: 2.3
-Release: 6%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Epoch: 0
Summary: Compiler call initiators for Plexus
# extras subpackage has a bit different licensing
@@ -95,6 +95,9 @@ cp %{SOURCE2} LICENSE.MIT
%doc LICENSE LICENSE.MIT
%changelog
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.4-1
+- Update to upstream version 2.4
+
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.3-6
- Fix build-requires on POM packages
diff --git a/sources b/sources
index cf9f0b5..df78864 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-77e87e5c0ff677fa908c36ec80ba5331 plexus-compiler-2.3.tar.gz
+a3718dba1d831c4d81a855187ff14d6d plexus-compiler-2.4.tar.gz
9 years, 7 months