Merge pull request #186 in TSI/dxa-model-service from hotfix/2.0/CRQ-…

…18706 to release/2.0 * commit 'a19f24258b8d38857c70bea83903bf6afb5a40d3': CRQ-18706 hardcoded service-container version as dynamic versions don't work
RWS · Sep 25, 2020 · a9097f2 · a9097f2
2 parents b3be9df + a19f242
commit a9097f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/java/dxa-model-service/dxa-model-service-assembly-in-process/pom.xml b/java/dxa-model-service/dxa-model-service-assembly-in-process/pom.xml
@@ -19,7 +19,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <dxa.model-service.version>2.0.3</dxa.model-service.version>
-        <service-container.version>[8.5.0,8.5.0-9000)</service-container.version>
+        <service-container.version>8.5.0-1128</service-container.version>
         <udp.version.range>[8.5.0,8.5.0-9000)</udp.version.range>
         <standalone.path>standalone-in-process</standalone.path>
         <resources.dir>${project.basedir}../dxa-model-service-container/src/main/resources/in-process</resources.dir>

diff --git a/java/dxa-model-service/dxa-model-service-assembly/pom.xml b/java/dxa-model-service/dxa-model-service-assembly/pom.xml
@@ -22,7 +22,7 @@
         <dd4t.version>2.1.5</dd4t.version>
         <fast-classpath-scanner.version>2.4.7</fast-classpath-scanner.version>
 
-        <service-container.version>[8.5.0,8.5.0-9000)</service-container.version>
+        <service-container.version>8.5.0-1128</service-container.version>
         <springframework.version>4.3.3.RELEASE</springframework.version>
         <udp.version.range>[8.5.0,8.5.0-9000)</udp.version.range>
 
@@ -143,7 +143,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>make-assembly</id>
@@ -164,7 +164,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>clean-leftovers</id>