Format poms, add names

diff --git a/acid/pom.xml b/acid/pom.xml
index e228316ca20be611971d4894c6c8d27c5347a566..6b9f01a493a23620b01b48c429fad83c9b4f869a 100644 (file)
--- a/acid/pom.xml
+++ b/acid/pom.xml
@@ -1,67 +1,68 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+       <modelVersion>4.0.0</modelVersion>
   
-  <parent>
-    <groupId>net.rizon</groupId>
-    <artifactId>acid</artifactId>
-    <version>4.0-SNAPSHOT</version>
-  </parent>
+       <parent>
+               <groupId>net.rizon</groupId>
+               <artifactId>acid</artifactId>
+               <version>4.0-SNAPSHOT</version>
+       </parent>
   
-  <artifactId>acid-acid</artifactId>
+       <artifactId>acid-acid</artifactId>
+       <name>Acid Core</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>javax.mail-api</artifactId>
-      <version>1.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>1.11</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-      <type>jar</type>
-    </dependency>
-  </dependencies>
+       <dependencies>
+               <dependency>
+                       <groupId>javax.mail</groupId>
+                       <artifactId>javax.mail-api</artifactId>
+                       <version>1.5.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>mysql</groupId>
+                       <artifactId>mysql-connector-java</artifactId>
+                       <version>5.1.8</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.yaml</groupId>
+                       <artifactId>snakeyaml</artifactId>
+                       <version>1.11</version>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.11</version>
+                       <scope>test</scope>
+                       <type>jar</type>
+               </dependency>
+       </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>net.rizon.acid.core.Acidictive</mainClass>
-            </manifest>
-            <manifestEntries>
-              <Author>Adam &lt;Adam@rizon.net&gt;</Author>
-            </manifestEntries>
-          </archive>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifest>
+                                                       <mainClass>net.rizon.acid.core.Acidictive</mainClass>
+                                               </manifest>
+                                               <manifestEntries>
+                                                       <Author>Adam &lt;Adam@rizon.net&gt;</Author>
+                                               </manifestEntries>
+                                       </archive>
+                                       <descriptorRefs>
+                                               <descriptorRef>jar-with-dependencies</descriptorRef>
+                                       </descriptorRefs>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
 </project>

diff --git a/pom.xml b/pom.xml
index 81f9aa83c49a6a3f8dd40ea80b39ab8b83da91f0..451fafaa6fa704f1d1b2e10b3f41893faf6de6c0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,36 +1,36 @@
 <?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>
+       <modelVersion>4.0.0</modelVersion>
 
-  <groupId>net.rizon</groupId>
-  <artifactId>acid</artifactId>
-  <version>4.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+       <groupId>net.rizon</groupId>
+       <artifactId>acid</artifactId>
+       <version>4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
-  <name>acid</name>
-  <url>http://gitlab.com/rizon/acid</url>
+       <name>Acid</name>
+       <url>https://gitlab.com/rizon/acid</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+       <properties>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+       </properties>
 
-  <modules>
-    <module>acid</module>
+       <modules>
+               <module>acid</module>
 
-    <module>pyva</module>
-    <module>trapbot</module>
-  </modules>
+               <module>pyva</module>
+               <module>trapbot</module>
+       </modules>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                               <configuration>
+                                       <source>1.7</source>
+                                       <target>1.7</target>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
 </project>

diff --git a/pyva/core/pom.xml b/pyva/core/pom.xml
index 5dbc01d5baa052e83844261769581622df4042da..8cf3ab981dcf4abc09e691f3098f0e0bf4ce466b 100644 (file)
--- a/pyva/core/pom.xml
+++ b/pyva/core/pom.xml
@@ -1,47 +1,48 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+       <modelVersion>4.0.0</modelVersion>
   
-  <parent>
-    <groupId>net.rizon</groupId>
-    <artifactId>acid-pyva</artifactId>
-    <version>4.0-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>acid-pyva-core</artifactId>
+       <parent>
+               <groupId>net.rizon</groupId>
+               <artifactId>acid-pyva</artifactId>
+               <version>4.0-SNAPSHOT</version>
+       </parent>
+
+       <name>Pyva Native</name>
+       <artifactId>acid-pyva-core</artifactId>
   
-  <dependencies>
-    <dependency>
-      <groupId>net.rizon</groupId>
-      <artifactId>acid-acid</artifactId>
-      <version>4.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.rizon.pyva</groupId>
-      <artifactId>pyva</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
+       <dependencies>
+               <dependency>
+                       <groupId>net.rizon</groupId>
+                       <artifactId>acid-acid</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>net.rizon.pyva</groupId>
+                       <artifactId>pyva</artifactId>
+                       <version>1.0-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <descriptorRefs>
+                                               <descriptorRef>jar-with-dependencies</descriptorRef>
+                                       </descriptorRefs>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
 </project>

diff --git a/pyva/pom.xml b/pyva/pom.xml
index f9f7bdd978f06a3de5027fd41892c45b76164704..b6a159dee0af59c103addac8e991a29075378d09 100644 (file)
--- a/pyva/pom.xml
+++ b/pyva/pom.xml
@@ -1,24 +1,25 @@
 <?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>
+       <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>net.rizon</groupId>
-    <artifactId>acid</artifactId>
-    <version>4.0-SNAPSHOT</version>
-  </parent>
+       <parent>
+               <groupId>net.rizon</groupId>
+               <artifactId>acid</artifactId>
+               <version>4.0-SNAPSHOT</version>
+       </parent>
   
-  <artifactId>acid-pyva</artifactId>
-  <packaging>pom</packaging>
+       <artifactId>acid-pyva</artifactId>
+       <name>Acid Pyva</name>
+       <packaging>pom</packaging>
 
-  <modules>
-    <!-- core module, does nothing, but is packaged with pyva-native, so that the
-        plugin classloader can pick up Pyva from the pyva module below. Can not be reloaded -->
-    <module>core</module>
-    <!-- Pyva interfacer -->
-    <module>pyva</module>
-    <!-- Native pyva library, external (is a submodule). 'Core' packages with this it
-        as a dependency.  -->
-    <module>libpyva</module>
-  </modules>
+       <modules>
+               <!-- core module, does nothing, but is packaged with pyva-native, so that the
+               plugin classloader can pick up Pyva from the pyva module below. Can not be reloaded -->
+               <module>core</module>
+               <!-- Pyva interfacer -->
+               <module>pyva</module>
+               <!-- Native pyva library, external (is a submodule). 'Core' packages with this it
+               as a dependency.  -->
+               <module>libpyva</module>
+       </modules>
 </project>

diff --git a/pyva/pyva/pom.xml b/pyva/pyva/pom.xml
index 887f01262352fe22b10278fa668a8040563f3612..5fe622eddacdb2b1447b0cefc8e89149b850c886 100644 (file)
--- a/pyva/pyva/pom.xml
+++ b/pyva/pyva/pom.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+       <modelVersion>4.0.0</modelVersion>
   
-  <parent>
-    <groupId>net.rizon</groupId>
-    <artifactId>acid-pyva</artifactId>
-    <version>4.0-SNAPSHOT</version>
-  </parent>
+       <parent>
+               <groupId>net.rizon</groupId>
+               <artifactId>acid-pyva</artifactId>
+               <version>4.0-SNAPSHOT</version>
+       </parent>
+
+       <name>Pyva Interfacer</name>
+       <artifactId>acid-pyva-pyva</artifactId>
   
-  <artifactId>acid-pyva-pyva</artifactId>
-  
-  <dependencies>
-    <dependency>
-      <groupId>net.rizon</groupId>
-      <artifactId>acid-acid</artifactId>
-      <version>4.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.rizon.pyva</groupId>
-      <artifactId>pyva</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
+       <dependencies>
+               <dependency>
+                       <groupId>net.rizon</groupId>
+                       <artifactId>acid-acid</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>net.rizon.pyva</groupId>
+                       <artifactId>pyva</artifactId>
+                       <version>1.0-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
 </project>

diff --git a/trapbot/pom.xml b/trapbot/pom.xml
index b2184df740c84aa35630a560e6dd27e10760a9bb..e3b2d6570aa7efe5977a135b9d787cc268f28a00 100644 (file)
--- a/trapbot/pom.xml
+++ b/trapbot/pom.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
+       <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-      <groupId>net.rizon</groupId>
-      <artifactId>acid</artifactId>
-      <version>4.0-SNAPSHOT</version>
-  </parent>
+       <parent>
+               <groupId>net.rizon</groupId>
+               <artifactId>acid</artifactId>
+               <version>4.0-SNAPSHOT</version>
+       </parent>
 
-  <artifactId>acid-trapbot</artifactId>
+       <artifactId>acid-trapbot</artifactId>
+       <name>TrapBot</name>
 
-  <dependencies>
-      <dependency>
-          <groupId>net.rizon</groupId>
-          <artifactId>acid-acid</artifactId>
-          <version>4.0-SNAPSHOT</version>
-      </dependency>
-  </dependencies>
+       <dependencies>
+               <dependency>
+                       <groupId>net.rizon</groupId>
+                       <artifactId>acid-acid</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+       </dependencies>
 </project>