You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by aj...@apache.org on 2008/03/24 18:06:11 UTC
svn commit: r640465 - /webservices/commons/trunk/modules/XmlSchema/pom.xml
Author: ajith
Date: Mon Mar 24 10:06:10 2008
New Revision: 640465
URL: http://svn.apache.org/viewvc?rev=640465&view=rev
Log:
1. Fixed some issues in the build script
Modified:
webservices/commons/trunk/modules/XmlSchema/pom.xml
Modified: webservices/commons/trunk/modules/XmlSchema/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/pom.xml?rev=640465&r1=640464&r2=640465&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/pom.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/pom.xml Mon Mar 24 10:06:10 2008
@@ -211,29 +211,22 @@
<filter>src/main/assembly/filter.properties</filter>
</filters>
- <!-- adding relevant resources to the zip files -->
+ <!-- adding relevant resources to the jar files -->
<resources>
<resource>
- <directory>src/main/resources/META-INF</directory>
+ <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>${xmlschema.osgi.version}</Bundle-Version>
+ <Bundle-Version>${xmlschema.osgi.version}</Bundle-Version>
+ <!-- The default maven resources will be automatically included ! -->
</instructions>
</configuration>
<executions>
@@ -266,24 +259,7 @@
</tasks>
</configuration>
</execution>
- <execution>
- <id>prepareLicenseFiles</id>
- <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>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
@@ -322,7 +298,7 @@
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
- <descriptor>src/main/assembly/doc.xml</descriptor>
+ <descriptor>src/main/assembly/doc.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -520,10 +496,7 @@
</dependencies>
<reporting>
<plugins>
- <!--plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin-->
- <plugin>
+ <plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
@@ -536,7 +509,6 @@
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -559,8 +531,9 @@
<url>scpexe://people.apache.org/www/ws.apache.org/commons/XmlSchema</url>
</site>
</distributionManagement>
- <properties>
- <xmlschema.osgi.version>1.3.3</xmlschema.osgi.version>
+ <properties>
+ <!-- should the osgi version be the same as the artifact id ?? -->
+ <xmlschema.osgi.version>1.4</xmlschema.osgi.version>
<bundle.plugin.version>1.4.0</bundle.plugin.version>
</properties>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org