You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2011/03/25 03:25:46 UTC
svn commit: r1085239 - in /shindig/trunk: ./ extras/ java/gadgets/
java/gadgets/src/main/java15/ java/gadgets/src/main/java15/org/
java/gadgets/src/main/java15/org/apache/
java/gadgets/src/main/java15/org/apache/shindig/
java/gadgets/src/main/java15/or...
Author: lindner
Date: Fri Mar 25 02:25:45 2011
New Revision: 1085239
URL: http://svn.apache.org/viewvc?rev=1085239&view=rev
Log:
Add the ability to support Java 1.5 and 1.6 builds in maven.
Added:
shindig/trunk/java/gadgets/src/main/java15/
shindig/trunk/java/gadgets/src/main/java15/org/
shindig/trunk/java/gadgets/src/main/java15/org/apache/
shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/
shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/gadgets/
shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/gadgets/Test.java
shindig/trunk/java/gadgets/src/main/java16/
shindig/trunk/java/gadgets/src/main/java16/org/
shindig/trunk/java/gadgets/src/main/java16/org/apache/
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/Test.java
Modified:
shindig/trunk/extras/pom.xml
shindig/trunk/java/gadgets/pom.xml
shindig/trunk/java/samples/pom.xml
shindig/trunk/java/server/pom.xml
shindig/trunk/java/social-api/pom.xml
shindig/trunk/pom.xml
Modified: shindig/trunk/extras/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/extras/pom.xml?rev=1085239&r1=1085238&r2=1085239&view=diff
==============================================================================
--- shindig/trunk/extras/pom.xml (original)
+++ shindig/trunk/extras/pom.xml Fri Mar 25 02:25:45 2011
@@ -98,14 +98,17 @@
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<!-- external depenencies -->
<dependency>
Modified: shindig/trunk/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/pom.xml?rev=1085239&r1=1085238&r2=1085239&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/pom.xml (original)
+++ shindig/trunk/java/gadgets/pom.xml Fri Mar 25 02:25:45 2011
@@ -76,6 +76,75 @@
<profiles>
<profile>
+ <id>java6</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>r916</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/java16</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>java5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/java15</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>reporting</id>
<reporting>
<plugins>
@@ -97,6 +166,7 @@
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
Added: shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/gadgets/Test.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/gadgets/Test.java?rev=1085239&view=auto
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/gadgets/Test.java (added)
+++ shindig/trunk/java/gadgets/src/main/java15/org/apache/shindig/gadgets/Test.java Fri Mar 25 02:25:45 2011
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.gadgets;
+
+class Test {
+}
\ No newline at end of file
Added: shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/Test.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/Test.java?rev=1085239&view=auto
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/Test.java (added)
+++ shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/Test.java Fri Mar 25 02:25:45 2011
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.gadgets;
+
+class Test {
+}
\ No newline at end of file
Modified: shindig/trunk/java/samples/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/pom.xml?rev=1085239&r1=1085238&r2=1085239&view=diff
==============================================================================
--- shindig/trunk/java/samples/pom.xml (original)
+++ shindig/trunk/java/samples/pom.xml Fri Mar 25 02:25:45 2011
@@ -84,14 +84,17 @@
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<!-- external depenencies -->
<dependency>
Modified: shindig/trunk/java/server/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/pom.xml?rev=1085239&r1=1085238&r2=1085239&view=diff
==============================================================================
--- shindig/trunk/java/server/pom.xml (original)
+++ shindig/trunk/java/server/pom.xml Fri Mar 25 02:25:45 2011
@@ -60,6 +60,7 @@
</includes>
</resource>
</webResources>
+ <classifier>${shindig.jdk.classifier}</classifier>
</configuration>
</plugin>
<plugin>
@@ -102,6 +103,8 @@
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
@@ -112,18 +115,26 @@
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-extras</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
</dependency>
<!-- external dependencies -->
Modified: shindig/trunk/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/pom.xml?rev=1085239&r1=1085238&r2=1085239&view=diff
==============================================================================
--- shindig/trunk/java/social-api/pom.xml (original)
+++ shindig/trunk/java/social-api/pom.xml Fri Mar 25 02:25:45 2011
@@ -75,6 +75,7 @@
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1085239&r1=1085238&r2=1085239&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Fri Mar 25 02:25:45 2011
@@ -446,6 +446,16 @@
</developer>
</developers>
+ <modules>
+ <module>features</module>
+ <module>java/common</module>
+ <module>java/gadgets</module>
+ <module>java/social-api</module>
+ <module>java/server</module>
+ <module>extras</module>
+ </modules>
+
+
<!-- ====================================================================== -->
<!-- P R O F I L E S -->
<!-- ====================================================================== -->
@@ -453,6 +463,10 @@
<profile>
<!-- force java5 usage -->
<id>java5</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <jdk>1.5</jdk>
+ </activation>
<properties>
<shindig.jdk.version>1.5</shindig.jdk.version>
<shindig.jdk.javadoc>1.5.0</shindig.jdk.javadoc>
@@ -463,56 +477,20 @@
<profile>
<!-- force java6 usage -->
<id>java6</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <jdk>1.6</jdk>
+ </activation>
+
<properties>
<shindig.jdk.version>1.6</shindig.jdk.version>
<shindig.jdk.javadoc>1.6.0</shindig.jdk.javadoc>
</properties>
</profile>
- <!-- default profile that builds everything -->
+ <!-- stub for all -->
<profile>
<id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>features</module>
- <module>java/common</module>
- <module>java/gadgets</module>
- <module>java/social-api</module>
- <module>java/server</module>
- <module>extras</module>
- </modules>
- </profile>
-
- <!-- profile to build features jar -->
- <profile>
- <id>features</id>
- <modules>
- <module>features</module>
- </modules>
- </profile>
-
- <!-- profile to build java/gadgets -->
- <profile>
- <id>gadgets</id>
- <modules>
- <module>java/gadgets</module>
- </modules>
- </profile>
-
- <!-- profile to build java/rest-api -->
- <profile>
- <id>social-api</id>
- <modules>
- <module>java/social-api</module>
- </modules>
- </profile>
- <profile>
- <id>common</id>
- <modules>
- <module>java/common</module>
- </modules>
</profile>
<!-- profile to build java/samples -->
@@ -1162,6 +1140,7 @@
<configuration>
<excludeResources>false</excludeResources>
<attach>true</attach>
+ <classifier>${shindig.jdk.classifier}</classifier>
</configuration>
</plugin>
<plugin>
@@ -1457,32 +1436,38 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
<version>${project.version}</version>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
<version>${project.version}</version>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
<version>${project.version}</version>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
<version>${project.version}</version>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-extras</artifactId>
<version>${project.version}</version>
+ <classifier>${shindig.jdk.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>