Some serious project clean-up.

This commit is contained in:
Harald Kuhr 2010-06-07 09:53:02 +02:00
parent 823854d40e
commit 1f60b62626
7 changed files with 205 additions and 85 deletions

View File

@ -1,35 +1,36 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.common</groupId> <groupId>com.twelvemonkeys.common</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>common-image</artifactId> <artifactId>common-image</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>TwelveMonkeys :: Common :: Image</name> <name>TwelveMonkeys :: Common :: Image</name>
<description> <description>
The TwelveMonkeys Common Image support The TwelveMonkeys Common Image support
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>common-lang</artifactId> <artifactId>common-lang</artifactId>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>common-io</artifactId> <groupId>${project.groupId}</groupId>
</dependency> <artifactId>common-io</artifactId>
<dependency> </dependency>
<groupId>jmagick</groupId>
<dependency>
<groupId>jmagick</groupId>
<artifactId>jmagick</artifactId> <artifactId>jmagick</artifactId>
<version>6.2.4</version> <version>6.2.4</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -2,30 +2,31 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.twelvemonkeys.common</groupId> <groupId>com.twelvemonkeys.common</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>common-io</artifactId> <artifactId>common-io</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>TwelveMonkeys :: Common :: IO</name> <name>TwelveMonkeys :: Common :: IO</name>
<description> <description>
The TwelveMonkeys IO support The TwelveMonkeys Common IO support
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>common-lang</artifactId> <artifactId>common-lang</artifactId>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>common-lang</artifactId> <groupId>${project.groupId}</groupId>
<classifier>tests</classifier> <artifactId>common-lang</artifactId>
<scope>test</scope> <classifier>tests</classifier>
</dependency> <scope>test</scope>
</dependencies> </dependency>
</dependencies>
</project> </project>

View File

@ -17,33 +17,34 @@
</description> </description>
<modules> <modules>
<module>common-io</module> <module>common-lang</module>
<module>common-lang</module> <module>common-io</module>
<module>common-image</module> <module>common-image</module>
</modules> </modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common-lang</artifactId>
<version>${project.version}</version>
</dependency>
<dependencyManagement> <dependency>
<dependencies> <groupId>${project.groupId}</groupId>
<dependency> <artifactId>common-lang</artifactId>
<groupId>${project.groupId}</groupId> <version>${project.version}</version>
<artifactId>common-lang</artifactId> <classifier>tests</classifier>
<version>${project.version}</version> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>common-lang</artifactId> <groupId>${project.groupId}</groupId>
<version>${project.version}</version> <artifactId>common-io</artifactId>
<classifier>tests</classifier> <version>${project.version}</version>
<scope>test</scope> </dependency>
</dependency> </dependencies>
<dependency> </dependencyManagement>
<groupId>${project.groupId}</groupId>
<artifactId>common-io</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -58,6 +59,5 @@
<version>1.0.1</version> <version>1.0.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

21
pom.xml
View File

@ -13,7 +13,7 @@
<module>common</module> <module>common</module>
<module>servlet</module> <module>servlet</module>
<module>imageio</module> <module>imageio</module>
<!--<module>sandbox</module>--> <module>sandbox</module>
</modules> </modules>
<developers> <developers>
@ -40,17 +40,15 @@
</contributors> </contributors>
<build> <build>
<finalName>twelvemonkeys-${project.artifactId}-${project.version}</finalName> <finalName>twelvemonkeys-${project.artifactId}-${project.version}</finalName>
<pluginManagement> <plugins>
<plugins> <plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>
<Implementation-Title>${project.name}</Implementation-Title> <Implementation-Title>twelvemonkeys-${project.artifactId}</Implementation-Title>
<Implementation-Vendor>TwelveMonkeys</Implementation-Vendor> <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
<Implementation-Version>${project.version}</Implementation-Version> <Implementation-Version>${project.version}</Implementation-Version>
<Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL> <Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL>
@ -58,6 +56,15 @@
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<configuration> <configuration>

87
sandbox/pom.xml Normal file
View File

@ -0,0 +1,87 @@
<?xml version="1.0"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.twelvemonkeys.sandbox</groupId>
<artifactId>sandbox</artifactId>
<version>3.0-SNAPSHOT</version>
<name>TwelveMonkeys :: Sandbox</name>
<packaging>pom</packaging>
<description>
The TwelveMonkeys Sandbox. Experimental stuff, in progress, not for production use.
</description>
<parent>
<groupId>com.twelvemonkeys</groupId>
<artifactId>twelvemonkeys</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
<modules>
<module>sandbox-common</module>
</modules>
<dependencies>
<dependency>
<groupId>com.twelvemonkeys.common</groupId>
<artifactId>common-image</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.common</groupId>
<artifactId>common-image</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
<version>1.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
<archive>
<manifestEntries>
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-URL>http://github.com/haraldk/TwelveMonkeys</Implementation-URL>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.twelvemonkeys.sandbox</groupId>
<artifactId>sandbox</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
<artifactId>sandbox-common</artifactId>
<packaging>jar</packaging>
<name>TwelveMonkeys :: Sandbox :: Common</name>
<description>
The TwelveMonkeys Sandbox Common. Experimental stuff.
</description>
</project>

View File

@ -87,6 +87,12 @@
<version>1.0.1</version> <version>1.0.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>