Skip to content

microservice-controller-rest
microservice-controller-rest
Commit c6816f0a authored by damianofalcioni's avatar damianofalcioni
Browse files
Options

fixed conflicting javax.json pom version

parent 2884152d
Pipeline #793 failed with stages
        in 1 minute and 15 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 44 additions and 55 deletions
        .classpath
        View file @ c6816f0a
        <?xml version="1.0" encoding="UTF-8"?>
        <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java">
        <attributes>
        <attribute name="optional" value="true"/>
        <attribute name="maven.pomderived" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
        <attributes>
        <attribute name="maven.pomderived" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java">
        <attributes>
        <attribute name="optional" value="true"/>
        <attribute name="maven.pomderived" value="true"/>
        <attribute name="test" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
        <attributes>
        <attribute name="maven.pomderived" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
        <attributes>
        <attribute name="maven.pomderived" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="src" path="target/generated-sources/annotations">
        <attributes>
        <attribute name="optional" value="true"/>
        <attribute name="maven.pomderived" value="true"/>
        <attribute name="ignore_optional_problems" value="true"/>
        <attribute name="m2e-apt" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
        <attributes>
        <attribute name="optional" value="true"/>
        <attribute name="maven.pomderived" value="true"/>
        <attribute name="ignore_optional_problems" value="true"/>
        <attribute name="m2e-apt" value="true"/>
        <attribute name="test" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="output" path="target/classes"/>
        </classpath>
        <?xml version="1.0" encoding="UTF-8"?>
        <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java">
        <attributes>
        <attribute name="optional" value="true"/>
        <attribute name="maven.pomderived" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
        <attributes>
        <attribute name="maven.pomderived" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java">
        <attributes>
        <attribute name="optional" value="true"/>
        <attribute name="maven.pomderived" value="true"/>
        <attribute name="test" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
        <attributes>
        <attribute name="maven.pomderived" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
        <attributes>
        <attribute name="maven.pomderived" value="true"/>
        <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
        </attributes>
        </classpathentry>
        <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
        <attributes>
        <attribute name="maven.pomderived" value="true"/>
        <attribute name="test" value="true"/>
        </attributes>
        </classpathentry>
        <classpathentry kind="output" path="target/classes"/>
        </classpath>
        .settings/org.eclipse.wst.common.component
        View file @ c6816f0a
        ......@@ -4,7 +4,6 @@
        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/annotations"/>
        <dependent-module archiveName="micro-service-controller-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/micro-service-controller/micro-service-controller">
        <dependency-type>uses</dependency-type>
        </dependent-module>
        ......
        pom.xml
        View file @ c6816f0a
        ......@@ -101,11 +101,11 @@
        <artifactId>jersey-container-servlet</artifactId>
        <version>2.22.1</version>
        </dependency>
        <dependency>
        <groupId>org.glassfish</groupId>
        <artifactId>javax.json</artifactId>
        <version>1.0.4</version>
        </dependency>
        <dependency>
        <groupId>org.glassfish</groupId>
        <artifactId>javax.json</artifactId>
        <version>1.1</version>
        </dependency>
        <dependency>
        <groupId>org.adoxx</groupId>
        <artifactId>micro-service-controller</artifactId>
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment