X-Git-Url: https://juplo.de/gitweb/?p=percentcodec;a=blobdiff_plain;f=pom.xml;h=624e53dc780f791b4296ba6300da9b9ed98ebadf;hp=b837bd96afe206cd5f7cc9b58db0073e12f6ad8e;hb=9743e0050c184bf4c2a871ab7224b7041822941e;hpb=576bdc0cc542da20480d0ea34ec2bb42011ec4f5

diff --git a/pom.xml b/pom.xml
index b837bd96..624e53dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>de.halbekunst</groupId>
-  <artifactId>fotos</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Fotos</name>
+  <artifactId>juplo</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <name>Juplo</name>
   <packaging>pom</packaging>
   <url>http://www.halbekunst.de</url>
 
@@ -24,7 +24,9 @@
   </developers>
 
   <modules>
-    <module>web</module>
+    <module>test</module>
+    <module>cachecontrol</module>
+    <module>cachecontrol-example-jsp</module>
   </modules>
 
   <properties>
@@ -33,11 +35,17 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Verwendete Versionen -->
+    <aspectj.version>1.6.11</aspectj.version>
+    <httpunit.version>1.7.1</httpunit.version>
+    <jasper.version>6.0.29</jasper.version>
+    <jpa.version>1.0</jpa.version>
+    <jstl.version>1.2</jstl.version>
     <junit.version>4.8.1</junit.version>
-    <log4j.version>1.2.15</log4j.version>
+    <log4j.version>1.2.16</log4j.version>
     <servlet-api.version>2.5</servlet-api.version>
-    <slf4j.version>1.5.11</slf4j.version>
-    <springframework.version>3.0.4.RELEASE</springframework.version>
+    <slf4j.binding>slf4j-log4j12</slf4j.binding>
+    <slf4j.version>1.6.1</slf4j.version>
+    <springframework.version>3.0.6.RELEASE</springframework.version>
 
   </properties>
 
@@ -49,48 +57,6 @@
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.jms</groupId>
-          <artifactId>jms</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jdmk</groupId>
-          <artifactId>jmxtools</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jmx</groupId>
-          <artifactId>jmxri</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>runtime</scope>
-    </dependency>
 
     <!-- Test -->
     <dependency>
@@ -109,8 +75,27 @@
       <url>http://repository.jboss.org/maven2</url>
       <snapshots><enabled>false</enabled></snapshots>
     </repository>
+    <repository>
+      <id>halbekunst.internal</id>
+      <name>Internal Release Repository</name>
+      <url>http://halbekunst.de/archiva/repository/internal/</url>
+      <snapshots><enabled>false</enabled></snapshots>
+    </repository>
   </repositories>
 
+  <distributionManagement>
+    <repository>
+      <id>halbekunst.internal</id>
+      <name>Internal Release Repository</name>
+      <url>http://halbekunst.de/archiva/repository/internal/</url>
+    </repository>
+    <snapshotRepository>
+      <id>halbekunst.snapshots</id>
+      <name>Internal Snapshot Repository</name>
+      <url>http://halbekunst.de/archiva/repository/snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+
   <build>
     <plugins>
       <plugin>
@@ -136,6 +121,19 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>