Commit 28a8abaa authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Dependencies issue fixed

parent 8c120f06

TASMAN-bom/pom.xml

+10 −5
Original line number Original line Diff line number Diff line
@@ -16,12 +16,17 @@ 
        <maven.test.skip>true</maven.test.skip>

        <maven.test.skip>true</maven.test.skip>

    </properties>

    </properties>

    

    

    <dependencyManagement>

        <dependencies>

        <dependencies>

            <dependency>

            <dependency>

                <groupId>org.slf4j</groupId>

                <groupId>org.slf4j</groupId>

                <artifactId>slf4j-log4j12</artifactId>

                <artifactId>slf4j-log4j12</artifactId>

                <version>1.7.21</version>

                <version>1.7.21</version>

            </dependency>

            </dependency>

        </dependencies>

    </dependencyManagement>

    

    <dependencies>

        <dependency>

        <dependency>

            <groupId>junit</groupId>

            <groupId>junit</groupId>

            <artifactId>junit</artifactId>

            <artifactId>junit</artifactId>

TASMAN-core/pom.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,10 @@ 
            <version>5.1.37</version>

            <version>5.1.37</version>

            <scope>runtime</scope>

            <scope>runtime</scope>

        </dependency>

        </dependency>

        <dependency>

            <groupId>org.slf4j</groupId>

            <artifactId>slf4j-log4j12</artifactId>

        </dependency>

        <dependency>

        <dependency>

            <groupId>org.postgresql</groupId>

            <groupId>org.postgresql</groupId>

            <artifactId>postgresql</artifactId>

            <artifactId>postgresql</artifactId>

TASMAN-webapp/pom.xml

+6 −2
Original line number Original line Diff line number Diff line
@@ -88,6 +88,10 @@ 
                    <!-- http://stackoverflow.com/a/33420995/771431 -->

                    <!-- http://stackoverflow.com/a/33420995/771431 -->

                    <version>3.0.1-b08</version>

                    <version>3.0.1-b08</version>

                </dependency>

                </dependency>

                <dependency>

                    <groupId>org.slf4j</groupId>

                    <artifactId>slf4j-log4j12</artifactId>

                </dependency>

                <dependency>

                <dependency>

                    <groupId>javax.servlet</groupId>

                    <groupId>javax.servlet</groupId>

                    <artifactId>jstl</artifactId>

                    <artifactId>jstl</artifactId>
@@ -111,9 +115,9 @@ 
            </properties>

            </properties>

            <dependencies>

            <dependencies>

                <dependency>

                <dependency>

                    <groupId>it.inaf.ia2.tap</groupId>

                    <groupId>${project.groupId}</groupId>

                    <artifactId>tasman-core</artifactId>

                    <artifactId>tasman-core</artifactId>

                    <version>1.3.2</version>

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

                    <exclusions>

                    <exclusions>

                        <!-- exclusion due to tomcat-jdbc dependency conflicting with Jetty -->

                        <!-- exclusion due to tomcat-jdbc dependency conflicting with Jetty -->

                        <exclusion>

                        <exclusion>