Jelajahi Sumber

Added maven compiler level.

Winston Li 11 tahun lalu
induk
melakukan
0c12b3dbd6

+ 3 - 0
services/git-bridge/.idea/compiler.xml

@@ -25,6 +25,9 @@
         <module name="writelatex-git-bridge" />
         <module name="writelatex-git-bridge" />
       </profile>
       </profile>
     </annotationProcessing>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="writelatex-git-bridge" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
   </component>
 </project>
 </project>
 
 

+ 9 - 0
services/git-bridge/pom.xml

@@ -12,6 +12,15 @@
     </properties>
     </properties>
     <build>
     <build>
         <plugins>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <compilerArgument></compilerArgument>
+                </configuration>
+            </plugin>
             <plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.4</version>
                 <version>2.4</version>

+ 3 - 3
services/git-bridge/writelatex-git-bridge.iml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test/system" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test/system" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/it/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/it/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/it/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/it/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />