X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=753e369e299045cf5eea89107006bb15f47d6b2a;hb=302da9bff5f595ea0c2d495d891ae87abd52edef;hp=4d5f11d4f516e147959b9ae71878408ce0c697ff;hpb=6a0f4cf1c0a1b49004b8c3dbc075f7202f7536f1;p=gpl%2Fargeo-slc.git

diff --git a/dep/pom.xml b/dep/pom.xml
index 4d5f11d4f..753e369e2 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -12,7 +12,6 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.slc.dep.agent</module>
-		<module>org.argeo.slc.dep.agent.extras</module>
 		<module>org.argeo.slc.dep.server</module>
 		<module>org.argeo.slc.dep.detached</module>
 		<module>org.argeo.slc.dep.gis</module>
@@ -37,34 +36,9 @@
 					<useLastCommittedRevision>false</useLastCommittedRevision>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
-				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
-					<instructions>
-						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-					</instructions>
-				</configuration>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 		</plugins>
 		<pluginManagement>
@@ -79,6 +53,9 @@
 								<goal>pde-sources</goal>
 							</goals>
 							<phase>generate-resources</phase>
+							<configuration>
+								<copyArtifacts>false</copyArtifacts>
+							</configuration>
 						</execution>
 						<execution>
 							<id>generate-descriptors</id>
@@ -104,18 +81,5 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-		<!-- TO BE DELETED <plugin> <groupId>org.argeo.maven.plugins</groupId> 
-			<artifactId>maven-argeo-osgi-plugin</artifactId> <executions> <execution> 
-			<id>resolve-pde-sources</id> <goals> <goal>pde-sources</goal> </goals> <phase>generate-resources</phase> 
-			<configuration> <copyArtifacts>true</copyArtifacts> </configuration> </execution> 
-			<execution> <goals> <goal>descriptors</goal> </goals> <phase>generate-resources</phase> 
-			</execution> </executions> </plugin> -->
-		<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
-			<executions> <execution> <id>attach-artifacts</id> <phase>package</phase> 
-			<goals> <goal>attach-artifact</goal> </goals> <configuration> <artifacts> 
-			<artifact> <file>target/classes/modularDistribution.csv</file> <type>csv</type> 
-			<classifier>modularDistribution</classifier> </artifact> </artifacts> </configuration> 
-			</execution> </executions> </plugin> -->
-		<!-- </plugins> -->
 	</build>
 </project>
\ No newline at end of file