fixing of weblogic build

Evolveum · Nov 14, 2018 · b6ca732 · b6ca732
1 parent 9c8e132
commit b6ca732
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -185,7 +185,7 @@ private static SpringApplicationBuilder configureApplication(SpringApplicationBu
             System.setProperty(MIDPOINT_HOME_PROPERTY, mpHome);
         }
 
-        System.setProperty("spring.config.location", MidPointSpringApplication.class.getResource("/") + ",${midpoint.home}/");
+        System.setProperty("spring.config.additional-location", "${midpoint.home}/");
 
         application.bannerMode(Banner.Mode.LOG);
 

diff --git a/weblogic-build/pom.xml b/weblogic-build/pom.xml
@@ -40,8 +40,9 @@
 	<dependency>
 	    <groupId>com.evolveum.midpoint.gui</groupId>
 	    <artifactId>admin-gui</artifactId>
-	    <version>3.9</version>
+	    <version>4.0-SNAPSHOT</version>
 	    <type>war</type>
+		<classifier>executable</classifier>
 	</dependency>
 	<dependency>
 		<groupId>org.apache.abdera</groupId>
@@ -54,6 +55,17 @@
 			</exclusion>
 		</exclusions>
 	</dependency>
+	<dependency>
+		<groupId>org.glassfish.jersey.media</groupId>
+		<artifactId>jersey-media-sse</artifactId>
+		<version>2.27</version>
+		<exclusions>
+			<exclusion>
+				<groupId>*</groupId>
+				<artifactId>*</artifactId>
+			</exclusion>
+		</exclusions>
+	</dependency>
 	<dependency>
     <groupId>org.apache.abdera</groupId>
 		<artifactId>abdera-i18n</artifactId>
@@ -178,6 +190,11 @@
 									<artifactId>cache-ri-impl</artifactId>
 									<bundleDir>/APP-INF/lib/</bundleDir>
 								</jarModule>
+								<jarModule>
+									<groupId>org.glassfish.jersey.media</groupId>
+									<artifactId>jersey-media-sse</artifactId>
+									<bundleDir>/APP-INF/lib/</bundleDir>
+								</jarModule>
 							</modules>
 						</configuration>
                     </plugin>