conflict fix after rebase issues

xael-fry · Mar 15, 2022 · 31cc030 · 31cc030
1 parent b57b63c
commit 31cc030
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 74 deletions.
diff --git a/framework/dependencies.yml b/framework/dependencies.yml
@@ -9,20 +9,6 @@ transitiveDependencies: false
 require:    &allDependencies
     - antlr 2.7.7
     - com.mchange -> c3p0 0.9.5.2
-<<<<<<< HEAD
-<<<<<<< HEAD
-    - com.zaxxer -> HikariCP 3.2.0
-    - org.ow2.asm -> asm 8.0.1
-    - org.ow2.asm -> asm-commons 8.0.1
-    - org.ow2.asm -> asm-util 8.0.1
-    - org.ow2.asm -> asm-tree 8.0.1
-    - org.ow2.asm -> asm-analysis 8.0.1
-    - cglib -> cglib 3.2.7
-    - com.google.code.gson -> gson 2.8.5
-=======
-=======
-
->>>>>>> ffb91dcd (resolve conflit with current master branch for rebase)
     - com.zaxxer -> HikariCP 3.4.5
     - org.ow2.asm -> asm 9.0
     - org.ow2.asm -> asm-commons 9.0
@@ -31,10 +17,6 @@ require:    &allDependencies
     - org.ow2.asm -> asm-analysis 9.0
     - cglib -> cglib 3.3.0
     - com.google.code.gson -> gson 2.8.6
-<<<<<<< HEAD
->>>>>>> 6d8b253a (#5: Update to latest Eclipse JDT Core v3.23 to enable JDK 14 source (#1338))
-=======
->>>>>>> ffb91dcd (resolve conflit with current master branch for rebase)
     - com.jamonapi -> jamon 2.81
     - com.ning -> async-http-client 1.9.40
     - commons-beanutils 1.9.2 
@@ -67,21 +49,9 @@ require:    &allDependencies
     - org.apache.ivy -> ivy 2.4.0
     - org.bouncycastle -> bcprov-jdk15on 1.61
     - org.bouncycastle -> bcpkix-jdk15on 1.61
-<<<<<<< HEAD
-<<<<<<< HEAD
-    - org.codehaus.groovy -> groovy 3.0.4
-    - org.codehaus.groovy -> groovy-xml 3.0.4
-    - org.eclipse.jdt -> org.eclipse.jdt.core 3.18.0
-=======
-    - org.codehaus.groovy -> groovy 3.0.6
-    - org.codehaus.groovy -> groovy-xml 3.0.6
-    - org.eclipse.jdt -> org.eclipse.jdt.core 3.23.0
->>>>>>> 6d8b253a (#5: Update to latest Eclipse JDT Core v3.23 to enable JDK 14 source (#1338))
-=======
     - org.codehaus.groovy -> groovy 3.0.6
     - org.codehaus.groovy -> groovy-xml 3.0.6
     - org.eclipse.jdt -> org.eclipse.jdt.core 3.23.0
->>>>>>> ffb91dcd (resolve conflit with current master branch for rebase)
     - org.hibernate -> hibernate-core 5.4.1.Final.patched
     - net.bytebuddy -> byte-buddy 1.9.5
     - javax.persistence -> javax.persistence-api 2.2

diff --git a/framework/src/play/classloading/ApplicationCompiler.java b/framework/src/play/classloading/ApplicationCompiler.java
@@ -37,35 +37,8 @@ public class ApplicationCompiler {
     ApplicationClasses applicationClasses;
     Map<String, String> settings;
     private static final String JAVA_SOURCE_DEFAULT_VERSION = "1.8";
-<<<<<<< HEAD
-    static final Map<String, String> compatibleJavaVersions =  org.apache.groovy.util.Maps.of( //
-    		"1.8", CompilerOptions.VERSION_1_8, //
-    		"9", CompilerOptions.VERSION_9, //
-    		"10", CompilerOptions.VERSION_10, //
-    		"11", CompilerOptions.VERSION_11, //
-    		"12", CompilerOptions.VERSION_12 //
-    		);
-=======
     static final Map<String, String> compatibleJavaVersions = new HashMap<>();
-<<<<<<< HEAD
-
-    static {
-<<<<<<< HEAD
-=======
-
     static {
->>>>>>> ffb91dcd (resolve conflit with current master branch for rebase)
-    	compatibleJavaVersions.put("1.8", CompilerOptions.VERSION_1_8);
-    	compatibleJavaVersions.put("9", CompilerOptions.VERSION_9);
-    	compatibleJavaVersions.put("10", CompilerOptions.VERSION_10);
-    	compatibleJavaVersions.put("11", CompilerOptions.VERSION_11);
-    	compatibleJavaVersions.put("12", CompilerOptions.VERSION_12);
-    	compatibleJavaVersions.put("13", CompilerOptions.VERSION_13);
-    	compatibleJavaVersions.put("14", CompilerOptions.VERSION_14);
-	}
->>>>>>> 6d8b253a (#5: Update to latest Eclipse JDT Core v3.23 to enable JDK 14 source (#1338))
-<<<<<<< HEAD
-=======
         compatibleJavaVersions.put("1.8", CompilerOptions.VERSION_1_8);
         compatibleJavaVersions.put("9", CompilerOptions.VERSION_9);
         compatibleJavaVersions.put("10", CompilerOptions.VERSION_10);
@@ -74,9 +47,6 @@ >>>>>>> ffb91dcd (resolve conflit with current master branch for rebase)
         compatibleJavaVersions.put("13", CompilerOptions.VERSION_13);
         compatibleJavaVersions.put("14", CompilerOptions.VERSION_14);
     }
->>>>>>> f818294c ([#1340] update jnit form 4.11 to 4.13.1 (#1341))
-=======
->>>>>>> ffb91dcd (resolve conflit with current master branch for rebase)
 
     /**
      * Try to guess the magic configuration options

diff --git a/framework/src/play/templates/GroovyTemplate.java b/framework/src/play/templates/GroovyTemplate.java
@@ -139,15 +139,7 @@ public void compile() {
                 CompilationUnit compilationUnit = new CompilationUnit(compilerConfiguration);
                 compilationUnit.addSource(
                         new SourceUnit(name, compiledSource, compilerConfiguration, tClassLoader, compilationUnit.getErrorCollector()));
-<<<<<<< HEAD
-
-                Field phasesF = compilationUnit.getClass().getDeclaredField("phaseOperations");
-                phasesF.setAccessible(true);
-                Collection[] phases = (Collection[]) phasesF.get(compilationUnit);
-                LinkedList<GroovyClassOperation> output = new LinkedList<>();
-                phases[Phases.OUTPUT] = output;
-                output.add(new GroovyClassOperation() {
-=======
+
 
 				// The following approach to adding the phase operation replaces the original
 				// reflection based approach commented out lower down. This appears to be the
@@ -158,7 +150,6 @@ public void compile() {
 				// 2. The new phase operation is added to the start and not the end.
                 // See https://github.com/apache/groovy/blob/GROOVY_3_0_6/src/main/java/org/codehaus/groovy/control/CompilationUnit.java#L349
                 compilationUnit.addPhaseOperation(new IGroovyClassOperation() {
->>>>>>> 6d8b253a (#5: Update to latest Eclipse JDT Core v3.23 to enable JDK 14 source (#1338))
                     @Override
                     public void call(GroovyClass gclass) {
                         groovyClassesForThisTemplate.add(gclass);

diff --git a/framework/test-src/play/mvc/SessionTest.java b/framework/test-src/play/mvc/SessionTest.java
@@ -22,11 +22,7 @@ private static void mockRequestAndResponse() {
     }
 
     public static void setSendOnlyIfChangedConstant(boolean value) {
-<<<<<<< HEAD
-    	Scope.SESSION_SEND_ONLY_IF_CHANGED = value;
-=======
         Scope.SESSION_SEND_ONLY_IF_CHANGED = value;
->>>>>>> 6d8b253a (#5: Update to latest Eclipse JDT Core v3.23 to enable JDK 14 source (#1338))
     }
 
     @Test