[jsword-svn] r2079 - in trunk: bibledesktop common-swing jsword

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2011-02-12 09:00:59 -0700 (Sat, 12 Feb 2011)
New Revision: 2079

Modified:
   trunk/bibledesktop/pom.xml
   trunk/common-swing/pom.xml
   trunk/jsword/pom.xml
Log:
new fixes to build to remove redundant maven code

Modified: trunk/bibledesktop/pom.xml
===================================================================
--- trunk/bibledesktop/pom.xml	2011-02-12 15:48:03 UTC (rev 2078)
+++ trunk/bibledesktop/pom.xml	2011-02-12 16:00:59 UTC (rev 2079)
@@ -11,31 +11,28 @@
   <groupId>org.crosswire</groupId>
   <artifactId>bibledesktop</artifactId>
   <packaging>jar</packaging>
-  <version>${parent.version}</version>
+  <version>1.6.1-SNAPSHOT</version>
   <name>bibledesktop</name>
   <url>http://maven.apache.org</url>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.crosswire</groupId>
       <artifactId>jsword-common-swing</artifactId>
-      <version>${parent.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.crosswire</groupId>
       <artifactId>jsword</artifactId>
-      <version>${parent.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.sun</groupId>
@@ -80,38 +77,10 @@
         <dependency>
           <groupId>org.crosswire</groupId>
           <artifactId>common-aqua</artifactId>
-          <version>${parent.version}</version>
+          <version>${project.version}</version>
         </dependency>
       </dependencies>
     </profile>
   </profiles>
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/java</directory>
-        <includes>
-          <include>**/*.properties</include>
-          <include>**/*.plugin</include>
-          <include>**/*.png</include>
-          <include>**/*.gif</include>
-          <include>**/*.txt</include>
-          <include>**/*.xml</include>
-          <include>**/*.xsl</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <includes>
-          <include>**/*.properties</include>
-          <include>**/*.plugin</include>
-          <include>**/*.png</include>
-          <include>**/*.gif</include>
-          <include>**/*.txt</include>
-          <include>**/*.xml</include>
-          <include>**/*.xsl</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
 </project>
 

Modified: trunk/common-swing/pom.xml
===================================================================
--- trunk/common-swing/pom.xml	2011-02-12 15:48:03 UTC (rev 2078)
+++ trunk/common-swing/pom.xml	2011-02-12 16:00:59 UTC (rev 2079)
@@ -30,24 +30,5 @@
 			<version>${project.version}</version>
 		</dependency>	
 	</dependencies>
-	
-	
-	<build>
-		<resources>
-			<resource>
-				<directory>${basedir}/src/main/java</directory>
-				<includes>
-					<include>**/*.properties</include>
-					<include>**/*.plugin</include>
-					<include>**/*.png</include>
-					<include>**/*.gif</include>
-					<include>**/*.txt</include>
-					<include>**/*.xml</include>
-					<include>**/*.xsl</include>
-				</includes>
-			</resource>
-		</resources>
-
-	</build>
 </project>
 

Modified: trunk/jsword/pom.xml
===================================================================
--- trunk/jsword/pom.xml	2011-02-12 15:48:03 UTC (rev 2078)
+++ trunk/jsword/pom.xml	2011-02-12 16:00:59 UTC (rev 2079)
@@ -56,23 +56,6 @@
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 		</dependency>
-
 	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>${basedir}/src/main/java</directory>
-				<includes>
-					<include>**/*.properties</include>
-					<include>**/*.plugin</include>
-					<include>**/*.png</include>
-					<include>**/*.gif</include>
-					<include>**/*.txt</include>
-					<include>**/*.xml</include>
-					<include>**/*.xsl</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
 </project>