axel_test

Jenkinsfile

@@ -0,0 +1,16 @@
+pipeline {
+ agent any
+ stages {
+         stage('Build') {
+            steps {
+             sh 'mvn -B -DskipTests clean package'
+            }
+         }
+        stage('K8s') {
+            steps {
+                 sh    'docker login -u axelxxy -p 1qazxsw2_xxy'
+                sh 'kubectl set image deployment/hello-node teedy-local-mz6hb=axelxxy/teedy_local:v1.0'
+                }
+            }
+        }
+ }

docs-web/src/main/webapp/src/partial/docs/login.html

@@ -54,11 +54,11 @@
                    ng-attr-placeholder="{{ 'login.validation_code' | translate }}" ng-model="user.code" />
           </div>
 
-          <div class="checkbox text-muted">
+    <!--       <div class="checkbox text-muted">
             <label>
               <input type="checkbox" ng-model="user.remember" name="remember" /> {{ 'login.remember_me' | translate }}
             </label>
-          </div>
+          </div> -->
 
           <div class="row">
             <div class="col-md-6">
@@ -85,4 +85,4 @@
   </div>
 
   <div class="login-img-container col-sm-6 hidden-xs"></div>
-</div>
+</div>

pom.xml

@@ -90,6 +90,27 @@
         <version>${org.apache.maven.plugins.maven-antrun-plugin.version}</version>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.6.3</version>
+        <executions>
+          <execution>
+            <id>aggregate</id>
+            <goals>
+              <goal>aggregate</goal>
+            </goals>
+            <phase>site</phase>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>4.0.0-M13</version>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -105,10 +126,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${org.apache.maven.plugins.maven-surefire-plugin.version}</version>
+        <version>3.0.0</version>
         <configuration>
-          <forkCount>1</forkCount>
-          <reuseForks>false</reuseForks>
+        <includes>
+        <include>Sample.java</include>
+        </includes>
+        <excludes>
+        <exclude>**/TestCircle.java</exclude>
+        <exclude>**/TestSquare.java</exclude>
+        </excludes>
         </configuration>
       </plugin>
 
@@ -194,7 +220,11 @@
         <artifactId>commons-io</artifactId>
         <version>${commons-io.commons-io.version}</version>
       </dependency>
-
+       <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter</artifactId>
+        <version>5.7.1</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-email</artifactId>
@@ -505,4 +535,28 @@
     </dependencies>
   </dependencyManagement>
 
+  <reporting>
+    <plugins>
+    <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-javadoc-plugin</artifactId>
+    <version>3.6.3</version>
+    <reportSets>
+    <reportSet>
+    <id>aggregate</id>
+    <inherited>false</inherited>
+    <reports>
+    <report>aggregate</report>
+    </reports>
+    </reportSet>
+    <reportSet>
+    <id>default</id>
+    <reports>
+    <report>javadoc</report>
+    </reports>
+    </reportSet>
+    </reportSets>
+    </plugin>
+    </plugins>
+</reporting>
 </project>

tmp.txt

@@ -0,0 +1 @@
+1232