[RPM (6.0)] activeio3-3.1.1-1.jpp6

Ralph Apel <[email protected]> Mon, 14 Jul 2014 19:58:42 +0200
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : activeio3                    Relocations: (not relocatable)
Version     : 3.1.1                             Vendor: JPackage Project
Release     : 1.jpp6                        Build Date: Mon 14 Jul 2014 07:54:41 PM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Libraries/Java    Source RPM: (none)
Size        : 89129                            License: Apache Software License 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://activeio.codehaus.org/
Summary     : ActiveIO Protocol Implementation Framework
Description :
ActiveIO provides a high performance IO framework
for implementing protocols.

---------------
Ralph Apel <r.apel at r-apel.de> 0:3.1.1-1
- 3.1.1
---------------

---------------
Index: activeio3-core-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/activeio3/activeio3-core-pom.patch,v
retrieving revision 1.2
diff -u -r1.2 activeio3-core-pom.patch
--- activeio3-core-pom.patch	2 Jun 2011 07:53:50 -0000	1.2
+++ activeio3-core-pom.patch	14 Jul 2014 17:58:40 -0000
@@ -1,49 +1,66 @@
---- activeio-core/pom.xml.sav2	2008-04-03 22:45:25.000000000 +0200
-+++ activeio-core/pom.xml	2011-06-02 09:43:56.000000000 +0200
-@@ -31,7 +31,6 @@
+--- activeio-core/pom.xml.sav2	2009-07-15 10:43:26.000000000 +0200
++++ activeio-core/pom.xml	2014-07-13 18:53:42.066019947 +0200
+@@ -29,6 +29,26 @@
+   <name>ActiveIO :: Core</name>
+   <description>A high performance IO abstraction framework</description>
+ 
++  <properties>
++    <siteId>activeio</siteId>
++    <projectName>Apache ActiveMQ ActiveIO</projectName>
++    <!-- base url for site deployment.  See distribution management for full url.  Override this in settings.xml for staging -->
++    <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
++    
++    <howl-version>0.1.8</howl-version>
++    <commons-logging-version>1.1</commons-logging-version>
++    <felix-version>1.0.0</felix-version>
++
++    <!-- OSGi bundles properties -->
++    <activeio.osgi.import.pkg>*</activeio.osgi.import.pkg>
++    <activeio.osgi.export.pkg>org.apache.activeio*</activeio.osgi.export.pkg>
++    <activeio.osgi.private.pkg>!*</activeio.osgi.private.pkg>
++    <activeio.osgi.export>${activeio.osgi.export.pkg}*;version=${activeio.osgi.export.version}</activeio.osgi.export>
++    <activeio.osgi.export.version>${project.version}</activeio.osgi.export.version>
++    <activeio.osgi.import>${activeio.osgi.import.pkg}</activeio.osgi.import>
++    <activeio.osgi.symbolic.name>${groupId}.${artifactId}</activeio.osgi.symbolic.name>
++  </properties>
++
    <build>
      <plugins>
  
--<!--
-      <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-compiler-plugin</artifactId>
-@@ -40,7 +39,6 @@
-           <target>1.5</target>
+@@ -61,12 +81,36 @@
          </configuration>
        </plugin>
---->
-       <!-- generate the attached tests jar -->
-       <plugin>
-         <artifactId>maven-jar-plugin</artifactId>
-@@ -103,8 +101,21 @@
-       <artifactId>commons-collections</artifactId>
-       <scope>test</scope>
-     </dependency>
-+    <dependency>
+ 
++      <!--
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <version>${felix-version}</version>
++        <extensions>true</extensions>
++        <configuration>
++          <instructions>
++            <Bundle-Name>${artifactId}</Bundle-Name>
++            <Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
++            <Export-Package>${activemq.osgi.export.pkg}</Export-Package>
++            <Import-Package>${activemq.osgi.import.pkg}</Import-Package>
++            <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
++            <Implementation-Title>Apache ActiveMQ</Implementation-Title>
++            <Implementation-Version>${project.version}</Implementation-Version>
++          </instructions>
++        </configuration>
++      </plugin>
++      -->
+     </plugins>
+   </build>
+ 
+   <dependencies>
+ 
+     <dependency>
 +      <groupId>junit</groupId>
 +      <artifactId>junit</artifactId>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.apache.geronimo.specs</groupId>
-+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-+      <version>1.1</version>
-+      <scope>test</scope>
-+    </dependency>
-+
- 
-     <!-- Used by xnet GBean code -->
-+<!--
-     <dependency>
-       <groupId>geronimo</groupId>
-       <artifactId>geronimo-kernel</artifactId>
-@@ -115,7 +126,7 @@
-       <artifactId>geronimo-j2ee</artifactId>
-       <optional>true</optional>
+       <groupId>org.apache.geronimo.specs</groupId>
+       <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
      </dependency>
--
-+-->
-     <dependency>
-       <groupId>backport-util-concurrent</groupId>
-       <artifactId>backport-util-concurrent</artifactId>
Index: activeio3-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/activeio3/activeio3-jpp-depmap.xml,v
retrieving revision 1.2
diff -u -r1.2 activeio3-jpp-depmap.xml
--- activeio3-jpp-depmap.xml	2 Jun 2011 07:53:50 -0000	1.2
+++ activeio3-jpp-depmap.xml	14 Jul 2014 17:58:40 -0000
@@ -1,28 +1,16 @@
 <dependencies>
- <dependency>
+<dependency>
    <maven>
-     <groupId>geronimo</groupId>
-     <artifactId>geronimo-kernel</artifactId>
-     <version>1.0</version>
+       <groupId>org.apache.maven.shared</groupId>
+       <artifactId>maven-common-artifact-filters</artifactId>
+       <version>1.4</version>
    </maven>
    <jpp>
-     <groupId>JPP/geronimo11</groupId>
-     <artifactId>kernel</artifactId>
-     <version>1.1</version>
+       <groupId>JPP</groupId>
+       <artifactId>maven-common-artifact-filters</artifactId>
+       <version>1.4</version>
    </jpp>
- </dependency>
- <dependency>
-   <maven>
-     <groupId>geronimo</groupId>
-     <artifactId>geronimo-j2ee</artifactId>
-     <version>1.0</version>
-   </maven>
-   <jpp>
-     <groupId>JPP/geronimo11</groupId>
-     <artifactId>j2ee</artifactId>
-     <version>1.1</version>
-   </jpp>
- </dependency>
+</dependency>
 
  <dependency>
    <maven>
@@ -37,4 +25,317 @@
    </jpp>
  </dependency>
 
+<dependency>
+   <maven>
+     <groupId>junit</groupId>
+     <artifactId>junit</artifactId>
+     <version>4.4</version>
+   </maven>
+   <jpp>
+     <groupId>JPP</groupId>
+     <artifactId>junit</artifactId>
+     <version>3.8.2</version>
+   </jpp>
+</dependency>
+
+<dependency>
+   <maven>
+     <groupId>org.apache.felix</groupId>
+     <artifactId>org.apache.felix.bundlerepository</artifactId>
+     <version>1.6.4</version>
+   </maven>
+   <jpp>
+     <groupId>JPP/apache-felix</groupId>
+     <artifactId>org.apache.felix.bundlerepository</artifactId>
+     <version>1.6.4</version>
+   </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact-manager</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact-manager</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact-test</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact-test</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-core</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>core</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-error-diagnostics</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>error-diagnostics</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>model</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-monitor</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>monitor</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-api</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-api</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-descriptor</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-descriptor</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-parameter-documenter</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-parameter-documenter</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-registry</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-registry</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-profile</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>profile</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-project</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>project</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-repository-metadata</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>repository-metadata</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-settings</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>settings</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.reporting</groupId>
+        <artifactId>maven-reporting-api</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>reporting-api</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script-ant</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script-ant</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script-beanshell</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script-beanshell</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.reporting</groupId>
+        <artifactId>maven-reporting</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>reporting</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>10</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>10</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>maven</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+
 </dependencies>
Index: activeio3-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/activeio3/activeio3-pom.patch,v
retrieving revision 1.2
diff -u -r1.2 activeio3-pom.patch
--- activeio3-pom.patch	2 Jun 2011 07:53:50 -0000	1.2
+++ activeio3-pom.patch	14 Jul 2014 17:58:40 -0000
@@ -1,60 +1,67 @@
---- pom.xml.sav0	2008-04-03 22:45:25.000000000 +0200
-+++ pom.xml	2011-06-02 09:42:56.000000000 +0200
+--- pom.xml.sav0	2009-07-15 10:43:26.000000000 +0200
++++ pom.xml	2014-07-13 18:58:09.004507726 +0200
 @@ -19,7 +19,7 @@
    </modules>
  
    <prerequisites>
--    <maven>2.0.8</maven>
-+    <maven>2.0.7</maven>
+-    <maven>2.0.9</maven>
++    <maven>2.0.8</maven>
    </prerequisites>
  
    <url>http://activemq.apache.org/</url>
-@@ -48,6 +48,7 @@
- 
-   <dependencyManagement>
-     <dependencies>
-+<!--
-       <dependency>
-         <groupId>geronimo</groupId>
-         <artifactId>geronimo-kernel</artifactId>
-@@ -58,6 +59,7 @@
-         <artifactId>geronimo-j2ee</artifactId>
-         <version>${geronimo-version}</version>
-       </dependency>
-+-->
-       <dependency>
-         <groupId>log4j</groupId>
-         <artifactId>log4j</artifactId>
-@@ -65,6 +67,11 @@
-         <scope>runtime</scope>
-       </dependency>
-       <dependency>
-+        <groupId>junit</groupId>
-+        <artifactId>junit</artifactId>
-+        <version>${junit-version}</version>
-+      </dependency>
-+      <dependency>
-         <groupId>commons-collections</groupId>
-         <artifactId>commons-collections</artifactId>
-         <version>${commons-collections-version}</version>
-@@ -108,6 +115,7 @@
-     <howl-version>0.1.8</howl-version>
-     <commons-beanutils-version>1.6.1</commons-beanutils-version>
-     <commons-collections-version>2.1</commons-collections-version>
-+    <junit-version>3.8.2</junit-version>
-     <log4j-version>1.2.12</log4j-version>
-     <mx4j-version>2.1.1</mx4j-version>
-     <commons-logging-version>1.1</commons-logging-version>
-@@ -313,7 +321,7 @@
-             </goals>
+@@ -187,13 +187,14 @@
              <configuration>
-               <!-- Fail the build if no legal files were found -->
--              <strict>true</strict>
-+              <strict>false</strict>
+               <rules>
+                 <requireMavenVersion>
+-                  <version>[2.0.9,)</version>
++                  <version>[2.0.8,)</version>
+                 </requireMavenVersion>
+               </rules>
              </configuration>
            </execution>
          </executions>
-@@ -497,4 +505,4 @@
+       </plugin>
++      <!--
+       <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>ianal-maven-plugin</artifactId>
+@@ -208,6 +209,9 @@
+           </execution>
+         </executions>
+       </plugin>
++      -->
++    <activeio.osgi.import>${activeio.osgi.import.pkg}</activeio.osgi.import>
++    <activeio.osgi.symbolic.name>${groupId}.${artifactId}</activeio.osgi.symbolic.name>
+       <plugin>
+         <groupId>org.apache.felix</groupId>
+         <artifactId>maven-bundle-plugin</artifactId>
+@@ -217,13 +221,22 @@
+           <instructions>
+             <Bundle-Name>${artifactId}</Bundle-Name>
+             <Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
+-            <Export-Package>${activemq.osgi.export}</Export-Package>
+-            <Import-Package>${activemq.osgi.import}</Import-Package>
+-            <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
++            <Export-Package>org.apache.activeio*</Export-Package>
++            <Import-Package>*</Import-Package>
++            <Private-Package>!*</Private-Package>
+             <Implementation-Title>Apache ActiveMQ</Implementation-Title>
+             <Implementation-Version>${project.version}</Implementation-Version>
+           </instructions>
+         </configuration>
++          <executions>
++            <execution>
++              <id>bundle-manifest</id>
++              <phase>process-classes</phase>
++              <goals>
++                <goal>manifest</goal>
++              </goals>
++          </execution>
++        </executions>
+       </plugin>
+     </plugins>
+   </build>
+@@ -314,4 +327,4 @@
  
    </profiles>
  
Index: activeio3.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/activeio3/activeio3.spec,v
retrieving revision 1.2
diff -u -r1.2 activeio3.spec
--- activeio3.spec	2 Jun 2011 07:53:50 -0000	1.2
+++ activeio3.spec	14 Jul 2014 17:58:40 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2011, JPackage Project
+# Copyright (c) 2000-2014, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,21 +28,19 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %define section free
 %define oname activeio
 
 Name:           activeio3
 Summary:        ActiveIO Protocol Implementation Framework
 Url:            http://activeio.codehaus.org/
-Version:        3.0.1
-Release:        2%{?dist}
+Version:        3.1.1
+Release:        1%{?dist}
 Epoch:          0
 License:        Apache Software License 2.0
 Group:          Development/Libraries/Java
-Source0:        activeio-3.0.1.tar.gz
-# svn export http://svn.apache.org/repos/asf/activemq/activeio/tags/activeio-3.0.1/
+Source0:        activeio-3.1.1.tar.gz
+# svn export http://svn.apache.org/repos/asf/activemq/activeio/tags/activeio-3.1.1/
 
 Source1:        activeio3-settings.xml
 Source2:        activeio3-jpp-depmap.xml
@@ -56,47 +54,38 @@
 BuildRequires:  java-devel >= 0:1.6.0
 BuildRequires:  junit
 BuildRequires:  maven2 >= 0:2.0.8
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-eclipse
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-remote-resources
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-stage
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-eclipse-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-remote-resources-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-stage-plugin
 BuildRequires:  maven-release
 BuildRequires:  maven-surefire-plugin
-BuildRequires:  mojo-maven2-plugin-rat
+BuildRequires:  maven-surefire-provider-junit3
 BuildRequires:  apache-commons-parent
 BuildRequires:  apache-jar-resource-bundle >= 0:1.4
-#BuildRequires:  felix-maven2
 BuildRequires:  geronimo-genesis
 
 BuildRequires:  geronimo-specs
-BuildRequires:  geronimo-j2ee-management-1.0-api
+BuildRequires:  geronimo-j2ee-management-1.1-api
 BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-logging
-#BuildRequires:  geronimo11-base
 BuildRequires:  howl-logger
 BuildRequires:  log4j
 
 Requires:  java >= 0:1.6.0
 Requires:  backport-util-concurrent
+Requires:  geronimo-j2ee-management-1.1-api
 Requires:  howl-logger
 Requires:  apache-commons-logging
 
 Requires(post):   jpackage-utils >= 0:1.7.5
 Requires(postun): jpackage-utils >= 0:1.7.5
 
-%if %{gcj_support}
-BuildRequires:    gnu-crypto
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
 
 %description
@@ -120,10 +109,6 @@
 %patch1 -b .sav1
 %patch2 -b .sav2
 
-# needs geronimo10
-rm activeio-core/src/main/java/org/apache/activeio/xnet/StandardServiceStackGBean.java
-
-
 cp %{SOURCE1} settings.xml
 
 %build
@@ -172,31 +157,14 @@
 cp -pr activeio-core/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-%if %{gcj_support}
-export CLASSPATH=$(build-classpath gnu-crypto)
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(-,root,root)
@@ -204,10 +172,6 @@
 %{_javadir}/*
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}/*
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
 
 %files javadoc
 %defattr(-,root,root)
@@ -215,6 +179,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sun Jul 13 2014 Ralph Apel <r.apel at r-apel.de> 0:3.1.1-1
+- 3.1.1
+
 * Wed Jun 01 2011 Ralph Apel <r.apel at r-apel.de> 0:3.0.1-2
 - Add the -tests jar
 - Drop geronimo11-base BR