[java-parent-project COMMIT] in /trunk: pom.xml resources/eclipse/.checkstyle

[noreply at shibboleth.net]

Author: lajoie
Date: Tue Sep 20 12:50:32 2011
New Revision: 13

URL: http://svn.shibboleth.net/view/java-parent-project?rev=13&view=rev
Log:
Fix intra-config checkstyle config reference
Add JSP and test-jar generation to parent POM

Modified:
    trunk/pom.xml
    trunk/resources/eclipse/.checkstyle

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-parent-project/trunk/pom.xml?rev=13&r1=12&r2=13&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Sep 20 12:50:32 2011
@@ -6,7 +6,7 @@
 
     <groupId>net.shibboleth</groupId>
     <artifactId>parent</artifactId>
-    <version>1</version>
+    <version>2</version>
     <packaging>pom</packaging>
 
     <name>Shibboleth Project Super POM</name>
@@ -166,6 +166,12 @@
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
                 <version>2.5</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet.jsp</groupId>
+                <artifactId>jsp-api</artifactId>
+                <version>2.1</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -326,6 +332,27 @@
                                 <id>attach-sources</id>
                                 <goals>
                                     <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <!-- To depend on a test jar us something a dependency definition that looks like this
+                        <dependency>
+                            <groupId>GROUPID</groupId>
+                            <artifactId>ARTIFACTID</artifactId>
+                            <version>VERSION</version>
+                            <type>test-jar</type>
+                            <scope>test</scope>
+                        </dependency>
+                         -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <version>2.3.1</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>test-jar</goal>
                                 </goals>
                             </execution>
                         </executions>

Modified: trunk/resources/eclipse/.checkstyle
URL: http://svn.shibboleth.net/view/java-parent-project/trunk/resources/eclipse/.checkstyle?rev=13&r1=12&r2=13&view=diff
==============================================================================
--- trunk/resources/eclipse/.checkstyle (original)
+++ trunk/resources/eclipse/.checkstyle Tue Sep 20 12:50:32 2011
@@ -9,7 +9,7 @@
     <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
   </local-check-config>
  
-  <fileset name="main source" enabled="true" check-config-name="Shibboleth" local="true">
+  <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
     <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
   </fileset>