move to airbase

jimsimon-wk · Mar 5, 2013 · da8793e · da8793e
1 parent 280d3e4
commit da8793e
Show file tree

Hide file tree

Showing 37 changed files with 603 additions and 2,195 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,21 @@
 * 0.71
 
 - JMXAgent now uses NodeInfo to find IP address to bind to.
+- Use airbase to build.
+- Upgrade to Jetty 8.1.9
+- Upgrade to Guava 13.0.1
+- Upgrade to Apache BVal 0.5
+- Upgrade to slf4j 1.7.2
+- Upgrade to logback 1.0.9
+- Upgrade to Jersey 1.17
+- Upgrade to Joda Time 2.1
+- Upgrade to JCommander 1.30
+- Upgrade to MySQL Connector 5.1.23
+- Upgrade to h2 1.3.170
+- Upgrade to TestNG 6.8
+- Upgrade to Mockito 1.9.5
+- Upgrade to Hamcrest 1.3
+
 
 * 0.70
 

diff --git a/NEWS b/NEWS
@@ -1,3 +1,89 @@
+Airlift 0.71
+
+* New build system
+
+Removed the library POM. Uses the airbase project as base pom for building.
+
+* Global dependency upgrades
+
+- Jetty to 8.1.9
+- Guava to 14.0
+- BVal to 0.5
+- slf4j to 1.7.2
+- logback to 1.0.9
+- Jersey to 1.17.1
+- Joda Time to 2.1
+- TestNG to 6.8
+- Mockito to 1.9.5
+- Hamcrest to 1.3
+
+* Specific dependency upgrades
+
+- JMX: jcommander to 1.30
+- DBPool: mysql connector to 5.1.23
+- DBPool: h2 to 1.3.170
+- httpclient: httpclient to 4.2.3
+- httpclient: httpcore to 4.2.3
+
+* Dependency changes
+
+com.google.code.findbugs:jsr305 was replaced with com.google.code.findbugs:annotations
+
+The jsr305 jar contains only the JSR 305 annotations while the
+annotations jar also contains additional, Findbugs specific
+annotations.
+
+* Replacing the library and rest-server-base pom with airbase
+
+Projects using the airlift/library and airlift/rest-server-base poms as their
+parent must switch to use airbase (https://github.com/airlift/airbase/).
+
+Replace the parent section with
+
+    <parent>
+        <groupId>io.airlift</groupId>
+        <artifactId>airbase</artifactId>
+        <version>... latest version ...</version>
+    </parent>
+
+when replacing the rest-server-base, it must also activate the airlift
+packaging by creating a file called `.build-airlift` in the directory
+of the module or sub-module that should be packaged as an airlift
+packaged project.
+
+As airbase provides packaging independently, the version of airlift
+used for packaging and launcher is controlled with
+`dep.packaging.version`. To ensure that a project uses the same
+version for airbase while building and packaging, factoring out the
+version of airlift in the parent pom is recommended:
+
+    <properties>
+        <dep.airlift.version>0.71-SNAPSHOT</dep.airlift.version>
+        <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
+    </properties>
+    ...
+    <dependencyManagement>
+        <dependencies>
+            ...
+            <dependency>
+                <groupId>io.airlift</groupId>
+                <artifactId>bootstrap</artifactId>
+                <version>${dep.airlift.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.airlift</groupId>
+                <artifactId>configuration</artifactId>
+                <version>${dep.airlift.version}</version>
+            </dependency>
+            ...
+        </dependencies>
+    </dependencyManagement>
+
+`dep.airlift.version` is picked up when the project is built and
+`dep.packaging.version` is used when the project is packaged.
+
+
 Airlift 0.70
 
 * Upgrade to Jackson 2.1.x

diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.airlift</groupId>
     <artifactId>bootstrap</artifactId>
     <packaging>jar</packaging>
-    <version>0.71-SNAPSHOT</version>
     <name>bootstrap</name>
 
     <parent>
@@ -13,6 +11,10 @@
         <version>0.71-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.airlift</groupId>
@@ -29,11 +31,6 @@
             <artifactId>jmx</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -49,31 +46,17 @@
             <artifactId>guice</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
 
diff --git a/configuration/pom.xml b/configuration/pom.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.airlift</groupId>
     <artifactId>configuration</artifactId>
     <packaging>jar</packaging>
-    <version>0.71-SNAPSHOT</version>
     <name>configuration</name>
 
     <parent>
@@ -13,6 +11,10 @@
         <version>0.71-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>javax.validation</groupId>
@@ -37,7 +39,6 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.2.2</version>
         </dependency>
 
         <dependency>
@@ -49,27 +50,8 @@
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>testing</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
 
diff --git a/dbpool/pom.xml b/dbpool/pom.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.airlift</groupId>
     <artifactId>dbpool</artifactId>
     <packaging>jar</packaging>
-    <version>0.71-SNAPSHOT</version>
     <name>dbpool</name>
 
     <parent>
@@ -13,6 +11,10 @@
         <version>0.71-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.airlift</groupId>
@@ -34,6 +36,11 @@
             <artifactId>units</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -52,14 +59,12 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.15</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.154</version>
             <optional>true</optional>
         </dependency>
 
@@ -78,28 +83,9 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.8.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 
diff --git a/discovery/pom.xml b/discovery/pom.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>io.airlift</groupId>
     <artifactId>discovery-experimental</artifactId>
     <packaging>jar</packaging>
-    <version>0.71-SNAPSHOT</version>
 
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airlift</artifactId>
         <version>0.71-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.airlift</groupId>
@@ -47,6 +48,7 @@
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -90,8 +92,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty.orbit</groupId>
-            <artifactId>javax.servlet</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -113,23 +115,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>