See <https://builds.apache.org/job/oodt-trunk/org.apache.oodt$oodt-commons/2204/display/redirect?page=changes>
Changes: [manole.v.radu] wip 1.0 [chris.a.mattmann] Resolve conflicts again. [chris.a.mattmann] finish cleaning up merge errors. ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Common Utilities 1.9-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: https://repo.maven.apache.org/maven2/org/apache/avro/avro-ipc/1.7.7/avro-ipc-1.7.7.pom [INFO] Downloaded: https://repo.maven.apache.org/maven2/org/apache/avro/avro-ipc/1.7.7/avro-ipc-1.7.7.pom (5.2 kB at 17 kB/s) [INFO] Downloading: https://repo.maven.apache.org/maven2/io/netty/netty/3.4.0.Final/netty-3.4.0.Final.pom [INFO] Downloaded: https://repo.maven.apache.org/maven2/io/netty/netty/3.4.0.Final/netty-3.4.0.Final.pom (25 kB at 990 kB/s) [INFO] Downloading: https://repo.maven.apache.org/maven2/org/apache/avro/avro-ipc/1.7.7/avro-ipc-1.7.7.jar [INFO] Downloading: https://repo.maven.apache.org/maven2/io/netty/netty/3.4.0.Final/netty-3.4.0.Final.jar [INFO] Downloaded: https://repo.maven.apache.org/maven2/org/apache/avro/avro-ipc/1.7.7/avro-ipc-1.7.7.jar (193 kB at 2.6 MB/s) [INFO] Downloaded: https://repo.maven.apache.org/maven2/io/netty/netty/3.4.0.Final/netty-3.4.0.Final.jar (957 kB at 4.5 MB/s) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ oodt-commons --- [INFO] Deleting <https://builds.apache.org/job/oodt-trunk/org.apache.oodt$oodt-commons/ws/target> [INFO] [INFO] --- maven-remote-resources-plugin:1.5:process (default) @ oodt-commons --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ oodt-commons --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource to org/apache/oodt/commons [INFO] Copying 1 resource to org/apache/oodt/commons/util [INFO] Copying 3 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ oodt-commons --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 88 source files to <https://builds.apache.org/job/oodt-trunk/org.apache.oodt$oodt-commons/ws/target/classes> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <https://builds.apache.org/job/oodt-trunk/org.apache.oodt$oodt-commons/ws/src/main/java/org/apache/oodt/commons/AvroExecServer.java>:[131,10] ';' expected [INFO] 1 error [INFO] -------------------------------------------------------------