Author: dims
Date: Thu Apr 3 20:10:31 2008
New Revision: 644592
URL: http://svn.apache.org/viewvc?rev=644592&view=rev
Log:
move notice/license txt files to resources directory. get rid of the ant-run
step, add explicit manifest
Added:
webservices/commons/trunk/modules/neethi/src/main/resources/
webservices/commons/trunk/modules/neethi/src/main/resources/LICENSE.txt
- copied unchanged from r644444,
webservices/commons/trunk/modules/neethi/LICENSE.txt
webservices/commons/trunk/modules/neethi/src/main/resources/META-INF/
webservices/commons/trunk/modules/neethi/src/main/resources/NOTICE.txt
- copied unchanged from r644444,
webservices/commons/trunk/modules/neethi/NOTICE.txt
Removed:
webservices/commons/trunk/modules/neethi/LICENSE.txt
webservices/commons/trunk/modules/neethi/NOTICE.txt
Modified:
webservices/commons/trunk/modules/neethi/pom.xml
Modified: webservices/commons/trunk/modules/neethi/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/pom.xml?rev=644592&r1=644591&r2=644592&view=diff
==============================================================================
--- webservices/commons/trunk/modules/neethi/pom.xml (original)
+++ webservices/commons/trunk/modules/neethi/pom.xml Thu Apr 3 20:10:31 2008
@@ -100,68 +100,27 @@
<url>http://www.apache.org/</url>
</organization>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${bundle.plugin.version}</version>
- <configuration>
- <instructions>
- <Bundle-Version>${neethi.osgi.version}</Bundle-Version>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
</configuration>
- </plugin>
- <plugin>
- <!-- This should possibly better be done by using a resource
- definition. However, if we declare a resource with
- ${basedir} as the base directory, then the
- maven-source-plugin will add the whole directory to
- its contents.
- -->
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
-
<phase>generate-resources</phase>
- <configuration>
- <tasks>
- <copy
todir="${project.build.outputDirectory}/META-INF">
-
<fileset dir="${basedir}">
-
<include name="LICENSE.txt"/>
-
<include name="NOTICE.txt"/>
-
</fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
