fix: dependencies and prettier java

georchestra · Nov 15, 2023 · 0796e98 · 0796e98
1 parent a626eba
commit 0796e98
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 31 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -207,25 +207,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>jdk11+</id>
-      <activation>
-        <jdk>[11,)</jdk>
-      </activation>
-      <properties>
-        <java.version>11</java.version>
-      </properties>
-        <dependencies>
-          <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-          </dependency>
-        </dependencies>
-    </profile>
   </profiles>
   <properties>
     <rootProjectDir>${basedir}/..</rootProjectDir>

diff --git a/core/pom.xml b/core/pom.xml
@@ -128,13 +128,6 @@
       <artifactId>log4j-core</artifactId>
       <version>${log4j2.version}</version>
     </dependency>
-    <!-- log4j 2 logging configured via log4j2.xml -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>${log4j2.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-orm</artifactId>

diff --git a/domain/pom.xml b/domain/pom.xml
@@ -118,6 +118,12 @@
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt-hibernate5</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/web-ui/src/main/resources/catalog/js/LoginController.js b/web-ui/src/main/resources/catalog/js/LoginController.js
@@ -84,15 +84,16 @@
       $scope.isShowLoginAsLink = gnGlobalSettings.isShowLoginAsLink;
       $scope.isUserProfileUpdateEnabled = gnGlobalSettings.isUserProfileUpdateEnabled;
 
-      // take the bigger of the two values$scope.passwordMinLength = Math.max(
+      // take the bigger of the two values
+      $scope.passwordMinLength = Math.max(
         gnConfig["system.security.passwordEnforcement.minLength"],
         6
-
-      );$scope.passwordMaxLength = Math.max(
+      );
+      $scope.passwordMaxLength = Math.max(
         gnConfig["system.security.passwordEnforcement.maxLength"],
         6
-
-      );$scope.passwordPattern = gnConfig["system.security.passwordEnforcement.pattern"];
+      );
+      $scope.passwordPattern = gnConfig["system.security.passwordEnforcement.pattern"];
 
       function initForm() {
         if ($window.location.pathname.indexOf("new.password") !== -1) {