From fd3bda801516c61cac3919af713ee948b4d447b7 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Tue, 29 Jul 2014 12:07:38 +0900
Subject: [PATCH] pom cleanup

---
 hikaricp-java6/pom.xml | 119 --------------------------------
 hikaricp/pom.xml       | 123 ++-------------------------------
 pom.xml                | 152 +++++++++++++++++++++++++++++++----------
 3 files changed, 121 insertions(+), 273 deletions(-)

diff --git a/hikaricp-java6/pom.xml b/hikaricp-java6/pom.xml
index d8ae952a..ada55818 100644
--- a/hikaricp-java6/pom.xml
+++ b/hikaricp-java6/pom.xml
@@ -5,7 +5,6 @@
    <!-- For release: mvn release:perform -Darguments=-Dgpg.passphrase=PASSPHRASE -->
 
    <artifactId>HikariCP-java6</artifactId>
-   <version>2.0.0-SNAPSHOT</version>
    <packaging>bundle</packaging>
 
    <name>HikariCP-java6</name>
@@ -42,96 +41,14 @@
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <felix.bundle.plugin.version>2.4.0</felix.bundle.plugin.version>
       <felix.version>4.2.1</felix.version>
-      <pax.exam.version>3.4.0</pax.exam.version>
-      <pax.url.version>1.6.0</pax.url.version>
    </properties>
 
    <parent>
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
-      <relativePath>../pom.xml</relativePath>
    </parent>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-         <version>1.7.5</version>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-simple</artifactId>
-         <version>1.7.5</version>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.mockito</groupId>
-         <artifactId>mockito-all</artifactId>
-         <version>1.9.5</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.javassist</groupId>
-         <artifactId>javassist</artifactId>
-         <version>3.18.1-GA</version>
-         <scope>compile</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-core</artifactId>
-         <version>4.3.0.Final</version>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>com.codahale.metrics</groupId>
-         <artifactId>metrics-core</artifactId>
-         <version>3.0.2</version>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-
-      <!-- OSGi test -->
-      <dependency>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>org.apache.felix.framework</artifactId>
-         <version>${felix.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.exam</groupId>
-         <artifactId>pax-exam-container-native</artifactId>
-         <version>${pax.exam.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.exam</groupId>
-         <artifactId>pax-exam-junit4</artifactId>
-         <version>${pax.exam.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.exam</groupId>
-         <artifactId>pax-exam-link-mvn</artifactId>
-         <version>${pax.exam.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.url</groupId>
-         <artifactId>pax-url-aether</artifactId>
-         <version>${pax.url.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.url</groupId>
-         <artifactId>pax-url-reference</artifactId>
-         <version>${pax.url.version}</version>
-         <scope>test</scope>
-      </dependency>
-
-   </dependencies>
-
    <build>
       <sourceDirectory>src/main/java</sourceDirectory>
       <testSourceDirectory>src/test/java</testSourceDirectory>
@@ -187,42 +104,6 @@
                </execution>
             </executions>
          </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <configuration>
-               <!-- outputDirectory>/absolute/path/to/the/output/directory</outputDirectory> 
-                  <finalName>filename-of-generated-jar-file</finalName -->
-               <attach>true</attach>
-            </configuration>
-            <executions>
-               <execution>
-                  <id>attach-sources</id>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
-            <configuration>
-               <show>public</show>
-               <!-- excludePackageNames>com.zaxxer.hikari.*</excludePackageNames -->
-               <attach>true</attach>
-               <maxmemory>1024m</maxmemory>
-            </configuration>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
       </plugins>
       <pluginManagement>
          <plugins>
diff --git a/hikaricp/pom.xml b/hikaricp/pom.xml
index 3d46f1f2..44258fd8 100644
--- a/hikaricp/pom.xml
+++ b/hikaricp/pom.xml
@@ -5,7 +5,6 @@
    <!-- For release: mvn release:perform -Darguments=-Dgpg.passphrase=PASSPHRASE -->
 
    <artifactId>HikariCP</artifactId>
-   <version>2.0.0-SNAPSHOT</version>
    <packaging>bundle</packaging>
 
    <name>HikariCP</name>
@@ -38,92 +37,18 @@
       </developer>
    </developers>
 
+   <properties>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <felix.bundle.plugin.version>2.4.0</felix.bundle.plugin.version>
+      <felix.version>4.2.1</felix.version>
+   </properties>
+
    <parent>
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
-      <relativePath>../pom.xml</relativePath>
    </parent>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-         <version>1.7.5</version>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-simple</artifactId>
-         <version>1.7.5</version>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.mockito</groupId>
-         <artifactId>mockito-all</artifactId>
-         <version>1.9.5</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.javassist</groupId>
-         <artifactId>javassist</artifactId>
-         <version>3.18.1-GA</version>
-         <scope>compile</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-core</artifactId>
-         <version>4.3.0.Final</version>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>com.codahale.metrics</groupId>
-         <artifactId>metrics-core</artifactId>
-         <version>3.0.2</version>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-
-      <!-- OSGi test -->
-      <dependency>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>org.apache.felix.framework</artifactId>
-         <version>${felix.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.exam</groupId>
-         <artifactId>pax-exam-container-native</artifactId>
-         <version>${pax.exam.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.exam</groupId>
-         <artifactId>pax-exam-junit4</artifactId>
-         <version>${pax.exam.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.exam</groupId>
-         <artifactId>pax-exam-link-mvn</artifactId>
-         <version>${pax.exam.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.url</groupId>
-         <artifactId>pax-url-aether</artifactId>
-         <version>${pax.url.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.ops4j.pax.url</groupId>
-         <artifactId>pax-url-reference</artifactId>
-         <version>${pax.url.version}</version>
-         <scope>test</scope>
-      </dependency>
-
-   </dependencies>
-
    <build>
       <sourceDirectory>src/main/java</sourceDirectory>
       <testSourceDirectory>src/test/java</testSourceDirectory>
@@ -179,42 +104,6 @@
                </execution>
             </executions>
          </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <configuration>
-               <!-- outputDirectory>/absolute/path/to/the/output/directory</outputDirectory> 
-                  <finalName>filename-of-generated-jar-file</finalName -->
-               <attach>true</attach>
-            </configuration>
-            <executions>
-               <execution>
-                  <id>attach-sources</id>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
-            <configuration>
-               <show>public</show>
-               <!-- excludePackageNames>com.zaxxer.hikari.*</excludePackageNames -->
-               <attach>true</attach>
-               <maxmemory>1024m</maxmemory>
-            </configuration>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
       </plugins>
       <pluginManagement>
          <plugins>
diff --git a/pom.xml b/pom.xml
index a450637c..011c33a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <felix.bundle.plugin.version>2.4.0</felix.bundle.plugin.version>
       <felix.version>4.2.1</felix.version>
       <pax.exam.version>3.4.0</pax.exam.version>
       <pax.url.version>1.6.0</pax.url.version>
@@ -56,54 +55,133 @@
       <module>hikaricp-java6</module>
    </modules>
 
-<!-- 
-   <dependencyManagement>
-      <dependencies>
-         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>${project.version}</version>
-            <classifier>test-sources</classifier>
-         </dependency>
-         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-         </dependency>
-         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-         </dependency>
-         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <type>test-jar</type>
-            <version>${project.version}</version>
-         </dependency>
-      </dependencies>
-   </dependencyManagement>
- -->
    <build>
       <pluginManagement>
          <plugins>
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-release-plugin</artifactId>
-               <version>2.2.2</version>
+               <version>2.5</version>
                <configuration>
                   <autoVersionSubmodules>true</autoVersionSubmodules>
                   <tagNameFormat>HikariCP-@{project.version}</tagNameFormat>
                </configuration>
             </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-source-plugin</artifactId>
+               <version>2.2.1</version>
+               <configuration>
+                  <!-- outputDirectory>/absolute/path/to/the/output/directory</outputDirectory> 
+                     <finalName>filename-of-generated-jar-file</finalName -->
+                  <attach>true</attach>
+               </configuration>
+               <executions>
+                  <execution>
+                     <id>attach-sources</id>
+                     <goals>
+                        <goal>jar</goal>
+                     </goals>
+                  </execution>
+               </executions>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-javadoc-plugin</artifactId>
+               <version>2.9.1</version>
+               <configuration>
+                  <show>public</show>
+                  <!-- excludePackageNames>com.zaxxer.hikari.*</excludePackageNames -->
+                  <attach>true</attach>
+                  <maxmemory>1024m</maxmemory>
+               </configuration>
+               <executions>
+                  <execution>
+                     <goals>
+                        <goal>jar</goal>
+                     </goals>
+                  </execution>
+               </executions>
+            </plugin>
          </plugins>
       </pluginManagement>
    </build>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+         <version>1.7.5</version>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-simple</artifactId>
+         <version>1.7.5</version>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-all</artifactId>
+         <version>1.9.5</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.javassist</groupId>
+         <artifactId>javassist</artifactId>
+         <version>3.18.1-GA</version>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-core</artifactId>
+         <version>4.3.0.Final</version>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>com.codahale.metrics</groupId>
+         <artifactId>metrics-core</artifactId>
+         <version>3.0.2</version>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+
+      <!-- OSGi test -->
+      <dependency>
+         <groupId>org.apache.felix</groupId>
+         <artifactId>org.apache.felix.framework</artifactId>
+         <version>${felix.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.ops4j.pax.exam</groupId>
+         <artifactId>pax-exam-container-native</artifactId>
+         <version>${pax.exam.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.ops4j.pax.exam</groupId>
+         <artifactId>pax-exam-junit4</artifactId>
+         <version>${pax.exam.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.ops4j.pax.exam</groupId>
+         <artifactId>pax-exam-link-mvn</artifactId>
+         <version>${pax.exam.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.ops4j.pax.url</groupId>
+         <artifactId>pax-url-aether</artifactId>
+         <version>${pax.url.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.ops4j.pax.url</groupId>
+         <artifactId>pax-url-reference</artifactId>
+         <version>${pax.url.version}</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
 </project>