Blob Blame History Raw
diff -Nru activeio-3.1.4/activeio-core/pom.xml activeio-3.1.4-gil/activeio-core/pom.xml
--- activeio-3.1.4/activeio-core/pom.xml	2012-04-19 17:40:34.000000000 +0200
+++ activeio-3.1.4-gil/activeio-core/pom.xml	2012-05-18 13:30:38.165132211 +0200
@@ -30,7 +30,6 @@
   <description>A high performance IO abstraction framework</description>
   <properties>
       <activeio.osgi.import.pkg>
-          org.objectweb.howl.log*;resolution:=optional,
           *
       </activeio.osgi.import.pkg>
   </properties>      
@@ -63,18 +62,50 @@
             
             <!-- This test often fails on unix -->
             <exclude>**/NIOAsyncChannelTest.*</exclude>
+            <exclude>**/JournalPerfTool.*</exclude>
           </excludes>
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <phase>compile</phase>
+            <configuration>
+              <excludes>
+                <exclude>**/HowlJournal.*</exclude>
+              </excludes>
+            </configuration>
+            <goals>
+                <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>test-compile</phase>
+            <configuration>
+              <testExcludes>
+                <exclude>**/JournalPerfTool.*</exclude>
+              </testExcludes>
+            </configuration> 
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+      <groupId>org.jboss.spec.javax.management.j2ee</groupId>
+      <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -82,12 +113,17 @@
     </dependency>
 
     <!-- For HOWL integration -->
-    <dependency>
+    <!--dependency>
       <groupId>howl</groupId>
       <artifactId>howl-logger</artifactId>
       <optional>true</optional>
+    </dependency-->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
     </dependency>
-
   </dependencies>
 
 
diff -Nru activeio-3.1.4/pom.xml activeio-3.1.4-gil/pom.xml
--- activeio-3.1.4/pom.xml	2012-04-19 17:40:34.000000000 +0200
+++ activeio-3.1.4-gil/pom.xml	2012-05-18 13:26:13.055140793 +0200
@@ -54,15 +54,15 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-        <version>1.0.1</version>
+        <groupId>org.jboss.spec.javax.management.j2ee</groupId>
+        <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
+        <version>1.0.1.Final</version>
       </dependency>
-      <dependency>
+      <!--dependency>
         <groupId>howl</groupId>
         <artifactId>howl-logger</artifactId>
         <version>${howl-version}</version>
-      </dependency>
+      </dependency-->
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
@@ -164,15 +164,15 @@
           <artifactId>maven-bundle-plugin</artifactId>
           <version>1.0.0</version>
         </plugin>
-        <plugin>
+        <!--plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>ianal-maven-plugin</artifactId>
           <version>1.0-alpha-1</version>
-        </plugin>
+        </plugin-->
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>rat-maven-plugin</artifactId>
-          <version>1.0-alpha-3</version>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.8-SNAPSHOT</version>
           <configuration>
             <excludeSubProjects>false</excludeSubProjects>
           </configuration>
@@ -212,7 +212,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
+      <!--plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>ianal-maven-plugin</artifactId>
         <executions>
@@ -225,7 +225,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin-->
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -285,11 +285,11 @@
         <artifactId>cobertura-maven-plugin</artifactId>
         <version>2.5.1</version>
       </plugin>
-      <plugin>
+      <!--plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
         <version>2.4</version>
-      </plugin>
+      </plugin-->
     </plugins>
   </reporting>
 
@@ -304,7 +304,7 @@
       </activation>
       <build>
         <plugins>
-          <plugin>
+          <!--plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
             <executions>
@@ -324,16 +324,16 @@
               </execution>
             </executions>
             <dependencies>
-              <dependency>
+              <dependency-->
                 <!-- apache version not yet released -->
                 <!--<groupId>org.apache</groupId>-->
-                <groupId>org.apache.geronimo.genesis</groupId>
-                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                <!--groupId>org.apache.geronimo.genesis</groupId>
+                <artifactId>apache-source-release-assembly-descriptor</artifactId-->
                 <!-- apache version not yet known -->
-                <version>2.0</version>
+                <!--version>2.0</version>
               </dependency>
             </dependencies>
-          </plugin>
+          </plugin-->
         </plugins>
       </build>
     </profile>