Author: fmui
Date: Mon Jan 31 10:35:45 2011
New Revision: 1065547
URL: http://svn.apache.org/viewvc?rev=1065547&view=rev
Log:
attempt to fix build errors and warnings on hudson
Removed:
incubator/chemistry/opencmis/trunk/src/main/assembly/dev-client-assembly.xml
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
incubator/chemistry/opencmis/trunk/pom.xml
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml?rev=1065547&r1=1065546&r2=1065547&view=diff
==============================================================================
---
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
(original)
+++
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
Mon Jan 31 10:35:45 2011
@@ -63,6 +63,26 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack-client-with-deps</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>
+
src/main/assembly/client-with-dependencies-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml?rev=1065547&r1=1065546&r2=1065547&view=diff
==============================================================================
---
incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
(original)
+++
incubator/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
Mon Jan 31 10:35:45 2011
@@ -102,7 +102,7 @@
<property name="workbench.jar"
value="${project.artifactId}-${project.version}.${project.packaging}" />
<!-- build timestamp -->
- <echo
file="${targetdir}/generated-resources/META-INF/build-timestamp.txt">Version:
${version} / Build: ${timestamp}</echo>
+ <echo
file="${targetdir}/generated-resources/META-INF/build-timestamp.txt">Version:
${project.version} / Build: ${timestamp}</echo>
<!-- start scripts -->
<mkdir dir="${targetdir}/start" />
@@ -111,7 +111,7 @@
</copy>
<replace dir="${targetdir}/start">
<replacefilter token="@workbench.jar@"
value="${workbench.jar}" />
- <replacefilter token="@version@"
value="Version: ${version} / Build: ${timestamp}" />
+ <replacefilter token="@version@"
value="Version: ${project.version} / Build: ${timestamp}" />
</replace>
<chmod dir="${targetdir}/start" perm="+x"
includes="**/*.sh" />
</target>
@@ -124,6 +124,7 @@
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
@@ -149,7 +150,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
<executions>
<execution>
<id>pack-workbench</id>
Modified: incubator/chemistry/opencmis/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/pom.xml?rev=1065547&r1=1065546&r2=1065547&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/pom.xml (original)
+++ incubator/chemistry/opencmis/trunk/pom.xml Mon Jan 31 10:35:45 2011
@@ -277,6 +277,7 @@
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
@@ -291,6 +292,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -336,14 +338,6 @@
<excludePackageNames>org.apache.chemistry.opencmis.commons.impl:org.apache.chemistry.opencmis.commons.impl.dataobjects:org.apache.chemistry.opencmis.client.runtime:org.apache.chemistry.opencmis.client.runtime.*:org.apache.chemistry.opencmis.commons.impl.jaxb:org.apache.chemistry.opencmis.client.bindings.impl:org.apache.chemistry.opencmis.client.bindings.cache:org.apache.chemistry.opencmis.client.bindings.spi:org.apache.chemistry.opencmis.server.impl:org.apache.chemistry.opencmis.fit:org.apache.chemistry.opencmis.util.repository:org.apache.chemistry.opencmis.fileshare:org.apache.chemistry.opencmis.inmemory:org.apache.chemistry.opencmis.browser:org.apache.chemistry.opencmis.commander</excludePackageNames>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/dev-client-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
</plugins>
</build>
