You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by rb...@apache.org on 2013/02/26 20:40:37 UTC
svn commit: r1450370 - in /shindig/trunk: ./ java/gadgets/
java/gadgets/src/main/java/org/apache/shindig/gadgets/js/
java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/
java/gadgets/src/main/java16/org/apache/shindig/gadgets/js/ java/gadg...
Author: rbaxter85
Date: Tue Feb 26 19:40:37 2013
New Revision: 1450370
URL: http://svn.apache.org/r1450370
Log:
SHINDIG-1908
Remove Java 1.5 support from Shindig
Added:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java (contents, props changed)
- copied, changed from r1448872, shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/js/JsCompilerModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java (contents, props changed)
- copied, changed from r1448872, shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java (contents, props changed)
- copied, changed from r1448872, shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/CompileResult.java
Removed:
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/js/JsCompilerModule.java
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/CompileResult.java
Modified:
shindig/trunk/java/gadgets/pom.xml
shindig/trunk/pom.xml
Modified: shindig/trunk/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/pom.xml?rev=1450370&r1=1450369&r2=1450370&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/pom.xml (original)
+++ shindig/trunk/java/gadgets/pom.xml Tue Feb 26 19:40:37 2013
@@ -109,75 +109,6 @@
<profiles>
<profile>
- <id>java6</id>
- <activation>
- <jdk>[1.6,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.google.javascript</groupId>
- <artifactId>closure-compiler</artifactId>
- <version>r1918</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</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>
@@ -303,6 +234,11 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>r1918</version>
+ </dependency>
<!-- test -->
<dependency>
Copied: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java (from r1448872, shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/js/JsCompilerModule.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java?p2=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java&p1=shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/js/JsCompilerModule.java&r1=1448872&r2=1450370&rev=1450370&view=diff
==============================================================================
(empty)
Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsCompilerModule.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java (from r1448872, shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java?p2=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java&p1=shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java&r1=1448872&r2=1450370&rev=1450370&view=diff
==============================================================================
(empty)
Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java (from r1448872, shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/CompileResult.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java?p2=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java&p1=shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/CompileResult.java&r1=1448872&r2=1450370&rev=1450370&view=diff
==============================================================================
(empty)
Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/CompileResult.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1450370&r1=1450369&r2=1450370&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Tue Feb 26 19:40:37 2013
@@ -519,33 +519,6 @@
<!-- P R O F I L E S -->
<!-- ====================================================================== -->
<profiles>
- <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>
- <shindig.jdk.classifier>java5</shindig.jdk.classifier>
- </properties>
- </profile>
-
- <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>
<!-- stub for all -->
<profile>