Author: ieb
Date: Tue Jun 23 00:18:11 2009
New Revision: 787501
URL: http://svn.apache.org/viewvc?rev=787501&view=rev
Log:
SHINDIG-1098
Merges the changes in poms and the assembly from the 1.0.x branch into trunk.
This is not a complete set of the changes since there were a number of other
commits where changes were made to various files.
This will be reviewd next.
The main build has been verified to work correctly, non default profiles have
not been tested yet.
Modified:
incubator/shindig/trunk/assembly/src/main/assembly/java.xml
incubator/shindig/trunk/assembly/src/main/assembly/php.xml
incubator/shindig/trunk/assembly/src/main/assembly/source.xml
incubator/shindig/trunk/features/pom.xml
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/samples/pom.xml
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/assembly/src/main/assembly/java.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/src/main/assembly/java.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/src/main/assembly/java.xml (original)
+++ incubator/shindig/trunk/assembly/src/main/assembly/java.xml Tue Jun 23
00:18:11 2009
@@ -43,19 +43,21 @@
<outputDirectory>shindig-${pom.version}-java</outputDirectory>
<directory>../</directory>
<includes>
- <include>COMMITTERS</include>
- <include>COPYING</include>
<include>DISCLAIMER</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
</includes>
- </fileSet>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ </excludes>
+ </fileSet>
<fileSet>
<outputDirectory>shindig-${pom.version}-java</outputDirectory>
- <directory>src/main/assembly/binary-src/</directory>
- <filtered>true</filtered>
+ <directory>../java</directory>
<includes>
- <include>**/*</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
</includes>
</fileSet>
</fileSets>
Modified: incubator/shindig/trunk/assembly/src/main/assembly/php.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/src/main/assembly/php.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/src/main/assembly/php.xml (original)
+++ incubator/shindig/trunk/assembly/src/main/assembly/php.xml Tue Jun 23
00:18:11 2009
@@ -32,11 +32,7 @@
<include>features/**</include>
<include>javascript/**</include>
<include>config/**</include>
- <include>COMMITTERS</include>
- <include>COPYING</include>
<include>DISCLAIMER</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
</includes>
<excludes>
<exclude>site/**</exclude>
@@ -64,6 +60,8 @@
<!-- misc -->
<exclude>*.patch</exclude>
<exclude>*.diff</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
<exclude>README</exclude>
</excludes>
</fileSet>
Modified: incubator/shindig/trunk/assembly/src/main/assembly/source.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/src/main/assembly/source.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/src/main/assembly/source.xml (original)
+++ incubator/shindig/trunk/assembly/src/main/assembly/source.xml Tue Jun 23
00:18:11 2009
@@ -26,17 +26,15 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <outputDirectory>shindig-${pom.version}-src</outputDirectory>
- <directory>../</directory>
+ <outputDirectory>shindig-${pom.version}-source</outputDirectory>
+ <directory>${project.basedir}/../</directory>
<includes>
- <include>*/**</include>
+ <include>**</include>
</includes>
<excludes>
<!-- scm -->
<exclude>**/.git/**</exclude>
<exclude>**/.svn/**</exclude>
- <!-- maven -->
- <exclude>**/target/**</exclude>
<!-- IDE -->
<exclude>**/*.iws</exclude>
<exclude>**/*.ipr</exclude>
@@ -48,6 +46,11 @@
<exclude>**/.wtpmodules/**</exclude>
<exclude>**/.externalToolBuilders/**</exclude>
<exclude>**/maven-eclipse.xml</exclude>
+ <!-- maven -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/pom.xml.releaseBackup</exclude>
+ <exclude>**/release.properties</exclude>
+
<!-- misc -->
<exclude>**/*.patch</exclude>
<exclude>**/*.diff</exclude>
Modified: incubator/shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (original)
+++ incubator/shindig/trunk/features/pom.xml Tue Jun 23 00:18:11 2009
@@ -47,6 +47,13 @@
<targetPath>features</targetPath>
<directory>${basedir}/src/main/javascript/features</directory>
</resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
</resources>
<testResources>
<testResource>
@@ -160,6 +167,17 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ </plugin>
+ <plugin>
<!-- TODO: Replace this with the more generic javascript plugin that
allows the use of arbitrary compressor / compilers.
The maven-javascript-plugin does not seem to work.
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Tue Jun 23 00:18:11 2009
@@ -63,6 +63,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Tue Jun 23 00:18:11 2009
@@ -43,6 +43,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
@@ -55,11 +62,26 @@
</includes>
</resource>
</webResources>
- </configuration>
+ </configuration>
+ <executions>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins </groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <fork>true</fork>
+ <compilerArguments>
+ <!-- A common distribution of hamcrest library includes .java
files that are newer than the corresponding .class files. Because sourcepath
defaults to classpath, if we do not set this, then we end up with some of
hamcrest's classes in our jar. This is silly and not what we want, so we
explicitly set sourcepath to something that is not a directory. If you have a
directory on your machine that is called /not_a_directory and contains .java
files that are newer than .class files with a similar name that are imported by
our code, then you will probably experience trouble. -->
+ <sourcepath>/not_a_directory</sourcepath>
+ </compilerArguments>
+ </configuration>
</plugin>
</plugins>
<resources>
Modified: incubator/shindig/trunk/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/pom.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/pom.xml (original)
+++ incubator/shindig/trunk/java/samples/pom.xml Tue Jun 23 00:18:11 2009
@@ -59,6 +59,25 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>create.sql</include>
+ <include>derby.log</include>
+ <include>drop.sql</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<!-- project dependencies -->
Modified: incubator/shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Tue Jun 23 00:18:11 2009
@@ -46,6 +46,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Tue Jun 23 00:18:11 2009
@@ -39,6 +39,15 @@
</scm>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
<resources>
<resource>
<directory>conf</directory>
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=787501&r1=787500&r2=787501&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Tue Jun 23 00:18:11 2009
@@ -484,6 +484,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+
<stagingSiteURL>scp://people.apache.org/www/incubator.apache.org/shindig/shindig-1.1.x/${pom.version}</stagingSiteURL>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -859,6 +866,10 @@
<groupId>org.apache.maven.plugins </groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.5.1</version>
+ <configuration>
+ <addVersionToProjectName>true</addVersionToProjectName>
+ </configuration>
+
<!-- <configuration>-->
<!--
<projectNameTemplate>${project.groupId}-${project.artifactId}</projectNameTemplate>-->
<!-- </configuration>-->
@@ -932,6 +943,16 @@
<!-- We want to package up license resources in the JARs produced -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <arguments>-Prelease</arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0</version>
<executions>
@@ -1099,6 +1120,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeResources>false</excludeResources>
+ <attach>true</attach>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
