Commit cd2ceb28 authored by Noel's avatar Noel
Browse files

Cambia versión de scala por compatibilidad 

Esto es debido a que kafka usa otra versión y falla en tiempo
de ejecución.

Elimina toda la parte de testing ya que no se usaba y así se evita
conflictos
parent 00407c73

build.sbt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ lazy val commonSettings = Seq( 
  organization := "es.redmic.kjetland",

  organizationName := "mbknor",

  version := "1.0.11-SNAPSHOT",

  scalaVersion := "2.12.0",

  scalaVersion := "2.11.8",

  crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.0"),

  publishMavenStyle := true,

  publishArtifact in Test := false,

pom.xml

+2 −82
Original line number Diff line number Diff line
@@ -14,82 +14,19 @@ 
		<dependency>

			<groupId>org.scala-lang</groupId>

			<artifactId>scala-library</artifactId>

			<version>${scala.version}</version>

			<version>2.11.8</version>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.core</groupId>

			<artifactId>jackson-databind</artifactId>

			<version>2.8.4</version>

		</dependency>

		<dependency>

			<groupId>javax.validation</groupId>

			<artifactId>validation-api</artifactId>

			<version>1.1.0.Final</version>

		</dependency>

		<dependency>

			<groupId>org.slf4j</groupId>

			<artifactId>slf4j-api</artifactId>

			<version>1.7.7</version>

		</dependency>

		<dependency>

			<groupId>ch.qos.logback</groupId>

			<artifactId>logback-classic</artifactId>

			<version>1.1.3</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>com.github.fge</groupId>

			<artifactId>json-schema-validator</artifactId>

			<version>2.2.6</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.module</groupId>

			<artifactId>jackson-module-scala_2.12</artifactId>

			<version>2.8.4</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.datatype</groupId>

			<artifactId>jackson-datatype-jdk8</artifactId>

			<version>2.8.4</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.datatype</groupId>

			<artifactId>jackson-datatype-jsr310</artifactId>

			<version>2.8.4</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>joda-time</groupId>

			<artifactId>joda-time</artifactId>

			<version>2.9.4</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.datatype</groupId>

			<artifactId>jackson-datatype-joda</artifactId>

			<version>2.8.4</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>com.vividsolutions</groupId>

			<artifactId>jts</artifactId>

			<version>1.13</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>com.bedatadriven</groupId>

			<artifactId>jackson-datatype-jts</artifactId>

			<version>2.2</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.scalatest</groupId>

			<artifactId>scalatest_2.12</artifactId>

			<version>3.0.0</version>

			<scope>test</scope>

		</dependency>

	</dependencies>

	<build>
@@ -107,24 +44,7 @@ 
					</execution>

				</executions>

			</plugin>

			<plugin>

				<groupId>org.scalatest</groupId>

				<artifactId>scalatest-maven-plugin</artifactId>

				<version>1.0</version>

				<configuration>

					<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>

					<junitxml>.</junitxml>

					<filereports>WDF TestSuite.txt</filereports>

				</configuration>

				<executions>

					<execution>

						<id>test</id>

						<goals>

							<goal>test</goal>

						</goals>

					</execution>

				</executions>

			</plugin>



			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-surefire-plugin</artifactId>

src/test/java/com/kjetland/jackson/jsonSchema/UseItFromJavaTest.java

deleted100755 → 0
+0 −34
Original line number Diff line number Diff line 
package com.kjetland.jackson.jsonSchema;



import com.fasterxml.jackson.databind.ObjectMapper;

import scala.None;

import scala.Option;



import java.time.OffsetDateTime;

import java.util.HashMap;

import java.util.Map;

import java.util.Optional;



public class UseItFromJavaTest {



    static class MyJavaPojo {

        public String name;

    }



    public UseItFromJavaTest() {

        // Just make sure it compiles

        ObjectMapper objectMapper = new ObjectMapper();

        JsonSchemaGenerator g1 = new JsonSchemaGenerator(objectMapper);

        // TODO - This is not very beautiful from Java - Need to improve Java API

        g1.generateJsonSchema(MyJavaPojo.class);

        g1.generateJsonSchema(MyJavaPojo.class, "My title", "My description");



        // Create custom JsonSchemaConfig from java

        Map<String,String> customMapping = new HashMap<>();

        customMapping.put(OffsetDateTime.class.getName(), "date-time");

        JsonSchemaConfig config = JsonSchemaConfig.create(

                true, Optional.of("A"), true, true, true, true, true, true, customMapping);

        JsonSchemaGenerator g2 = new JsonSchemaGenerator(objectMapper, config);

    }



}

src/test/scala/com/kjetland/jackson/jsonSchema/CreateJsonSchemaGeneratorFromJava.java

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
package com.kjetland.jackson.jsonSchema;



import com.fasterxml.jackson.databind.ObjectMapper;



public class CreateJsonSchemaGeneratorFromJava {



    public CreateJsonSchemaGeneratorFromJava(ObjectMapper objectMapper) {

        JsonSchemaGenerator vanilla = new JsonSchemaGenerator(objectMapper);

        JsonSchemaGenerator html5 = new JsonSchemaGenerator(objectMapper, JsonSchemaConfig.html5EnabledSchema() );



    }

}

src/test/scala/com/kjetland/jackson/jsonSchema/JsonSchemaGeneratorTest.scala

deleted100755 → 0
+0 −916

File deleted.

Preview size limit exceeded, changes collapsed.