Revert pom changes

Manually copy jar folders
EBISPOT · Apr 30, 2024 · eb2d3b7 · eb2d3b7
1 parent f76f662
commit eb2d3b7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,6 +10,13 @@ ENV OJDBC6="https://www.oracle.com/webapps/redirect/signon?nexturl=https://downl
 RUN wget $OJDBC6 -O /lib/ojdbc6.jar \
     && mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc6 -Dpackaging=jar -Dversion=11.2.0.4 -Dfile=/lib/ojdbc6.jar \
     && test /root/.m2/repository/com/oracle/ojdbc6/11.2.0.4/ojdbc6-11.2.0.4.jar
+
+RUN mkdir /root/.m2/repository/org/springframework/spring-web
+RUN tar -xvzf /opt/zooma_github/ols-client/spring-web-4.2.1.tar.gz -C /root/.m2/repository/org/springframework/spring-web/
+
+RUN mkdir /root/.m2/repository/com/fasterxml/jackson/core/jackson-databind
+RUN tar -xvzf /opt/zooma_github/ols-client/jackson-databind-2.7.3.tar.gz -C /root/.m2/repository/com/fasterxml/jackson/core/jackson-databind/
+
 RUN mvn install:install-file -DcreateChecksum=true -Dpackaging=jar -Dfile=/opt/zooma_github/zooma-lodestar/lib/jena-core-2.12.0.jar -DgroupId=org.apache.jena -DartifactId=jena-core -Dversion=2.12.0
 RUN mvn install:install-file -DcreateChecksum=true -Dpackaging=jar -Dfile=/opt/zooma_github/zooma-lodestar/lib/jena-arq-2.12.0.jar -DgroupId=org.apache.jena -DartifactId=jena-arq -Dversion=2.12.0
 RUN mvn install:install-file -DcreateChecksum=true -Dpackaging=jar -Dfile=/opt/zooma_github/zooma-lodestar/lib/lode-core-api-1.3.jar -DgroupId=ebi-lode -DartifactId=lode-core-api -Dversion=1.3

diff --git a/ols-client/lib/jackson-databind-2.7.3.tar.gz b/ols-client/lib/jackson-databind-2.7.3.tar.gz
diff --git a/ols-client/lib/spring-web-4.2.1.tar.gz b/ols-client/lib/spring-web-4.2.1.tar.gz
diff --git a/ols-client/pom.xml b/ols-client/pom.xml
@@ -36,40 +36,29 @@
             <artifactId>spring-web</artifactId>
             <!--            <version>4.2.5.RELEASE</version>-->
             <version>${org.springframework.version}</version>
-            <scope>system</scope>
-            <systemPath>/opt/zooma_github/ols-client/lib/spring-web-4.1.2.RELEASE.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <!--            <version>4.2.5.RELEASE</version>-->
             <version>${org.springframework.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework</groupId>-->
-<!--            <artifactId>spring-context-support</artifactId>-->
-<!--            &lt;!&ndash;            <version>4.2.5.RELEASE</version>&ndash;&gt;-->
-<!--            <version>${org.springframework.version}</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework</groupId>-->
+        <!--            <artifactId>spring-context-support</artifactId>-->
+        <!--            &lt;!&ndash;            <version>4.2.5.RELEASE</version>&ndash;&gt;-->
+        <!--            <version>${org.springframework.version}</version>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>2.7.3</version>
-            <scope>system</scope>
-            <systemPath>/opt/zooma_github/ols-client/lib/jackson-databind-2.7.3.jar</systemPath>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.7.0</version>
-            <scope>system</scope>
-            <systemPath>/opt/zooma_github/ols-client/lib/jackson-annotations-2.7.0.jar</systemPath>
-        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.apache.commons</groupId>-->
-<!--            <artifactId>commons-lang3</artifactId>-->
-<!--            <version>3.4</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.commons</groupId>-->
+        <!--            <artifactId>commons-lang3</artifactId>-->
+        <!--            <version>3.4</version>-->
+        <!--        </dependency>-->
     </dependencies>
 
 </project>