Skip to content

Commit f8d6f9a

Browse files
yodamadyodamad
authored
Merge pull request #91 from yodamad/dev
v1.18
2 parents 5029214 + 21b9542 commit f8d6f9a

File tree

164 files changed

+7139
-1234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+7139
-1234
lines changed

‎.jhipster/MigrationHistory.json

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
{
2828
"fieldName": "data",
2929
"fieldType": "String"
30+
},
31+
{
32+
"fieldName": "execution_time",
33+
"fieldType": "Long"
3034
}
3135
],
3236
"changelogDate": "20181024090448",

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"file-loader": "3.0.1",
5858
"fork-ts-checker-webpack-plugin": "0.5.2",
5959
"friendly-errors-webpack-plugin": "1.7.0",
60-
"generator-jhipster": "5.8.1",
60+
"generator-jhipster": "5.4.2",
6161
"html-loader": "0.5.5",
6262
"html-webpack-plugin": "3.2.0",
6363
"husky": "1.3.1",
@@ -118,7 +118,7 @@
118118
"start-tls": "npm run webpack:dev -- --env.tls",
119119
"serve": "npm run start",
120120
"build": "npm run webpack:prod",
121-
"test": "npm run lint && jest --coverage --logHeapUsage -w=2 --config src/test/javascript/jest.conf.js",
121+
"test": "npm run lint && jest --passWithNoTests --coverage --logHeapUsage -w=2 --config src/test/javascript/jest.conf.js",
122122
"test:watch": "npm test -- --watch --clearCache",
123123
"webpack:dev": "npm run webpack-dev-server -- --config webpack/webpack.dev.js --inline --hot --port=9060 --watch-content-base --env.stats=minimal",
124124
"webpack:dev-verbose": "npm run webpack-dev-server -- --config webpack/webpack.dev.js --inline --hot --port=9060 --watch-content-base --profile --progress --env.stats=normal",

‎pom.xml

+100-20
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44

55
<groupId>fr.yodamad.svn2git</groupId>
66
<artifactId>svn-2-git</artifactId>
7-
<version>1.17.1</version>
8-
<packaging>war</packaging>
7+
<version>1.18</version>
8+
<packaging>jar</packaging>
99
<name>Svn 2 GitLab</name>
1010

1111
<repositories>
12+
<repository>
13+
<id>jcenter</id>
14+
<url>https://jcenter.bintray.com/</url>
15+
</repository>
1216
<!-- jhipster-needle-maven-repository -->
1317
</repositories>
1418

@@ -19,7 +23,7 @@
1923
<maven.version>3.0.0</maven.version>
2024
<java.version>1.8</java.version>
2125
<scala.version>2.12.6</scala.version>
22-
<node.version>v8.12.0</node.version>
26+
<node.version>v8.16.2</node.version>
2327
<yarn.version>v1.10.1</yarn.version>
2428
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2529
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -61,8 +65,8 @@
6165
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
6266
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
6367
<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
64-
<jib-maven-plugin.version>0.9.11</jib-maven-plugin.version>
65-
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
68+
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
69+
<frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
6670
<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
6771
<scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
6872
<sonar-maven-plugin.version>3.5.0.1254</sonar-maven-plugin.version>
@@ -205,12 +209,12 @@
205209
<artifactId>assertj-core</artifactId>
206210
<scope>test</scope>
207211
</dependency>
208-
<dependency>
212+
<!-- <dependency>
209213
<groupId>org.hibernate</groupId>
210214
<artifactId>hibernate-jpamodelgen</artifactId>
211215
<version>${hibernate.version}</version>
212216
<scope>provided</scope>
213-
</dependency>
217+
</dependency> -->
214218
<dependency>
215219
<groupId>org.hibernate</groupId>
216220
<artifactId>hibernate-envers</artifactId>
@@ -331,11 +335,13 @@
331335
</dependency>
332336
<dependency>
333337
<groupId>com.madgag</groupId>
334-
<artifactId>bfg</artifactId>
335-
<version>custom</version>
336-
<systemPath>${project.basedir}/external/bfg-custom.jar</systemPath>
337-
<scope>system</scope>
338+
<artifactId>bfg</artifactId>
339+
<version>1.13.0</version>
338340
<exclusions>
341+
<exclusion>
342+
<groupId>org.slf4j</groupId>
343+
<artifactId>slf4j-simple</artifactId>
344+
</exclusion>
339345
<exclusion>
340346
<groupId>org.scala-lang</groupId>
341347
<artifactId>scala-library</artifactId>
@@ -359,6 +365,45 @@
359365
<artifactId>markdowngenerator</artifactId>
360366
<version>1.3.1.1</version>
361367
</dependency>
368+
<!-- Artifactory -->
369+
<dependency>
370+
<groupId>org.jfrog.artifactory.client</groupId>
371+
<artifactId>artifactory-java-client-services</artifactId>
372+
<version>2.8.4</version>
373+
<exclusions>
374+
<exclusion>
375+
<groupId>org.apache.httpcomponents</groupId>
376+
<artifactId>httpclient</artifactId>
377+
</exclusion>
378+
<exclusion>
379+
<groupId>org.apache.httpcomponents</groupId>
380+
<artifactId>httpcore</artifactId>
381+
</exclusion>
382+
</exclusions>
383+
</dependency>
384+
<!-- API, java.xml.bind module -->
385+
<dependency>
386+
<groupId>javax.xml.bind</groupId>
387+
<artifactId>jaxb-api</artifactId>
388+
<version>2.3.1</version>
389+
</dependency>
390+
<dependency>
391+
<groupId>com.sun.xml.bind</groupId>
392+
<artifactId>jaxb-impl</artifactId>
393+
<version>2.3.1</version>
394+
</dependency>
395+
<dependency>
396+
<groupId>org.javassist</groupId>
397+
<artifactId>javassist</artifactId>
398+
<version>3.23.1-GA</version>
399+
</dependency>
400+
401+
<!-- Jolokia for Glowroot -->
402+
<dependency>
403+
<groupId>org.jolokia</groupId>
404+
<artifactId>jolokia-core</artifactId>
405+
</dependency>
406+
362407
<!-- jhipster-needle-maven-add-dependency -->
363408
</dependencies>
364409

@@ -380,9 +425,8 @@
380425
<path>
381426
<groupId>org.hibernate</groupId>
382427
<artifactId>hibernate-jpamodelgen</artifactId>
383-
<version>${hibernate.version}</version>
428+
<version>5.4.12.Final</version>
384429
</path>
385-
386430
</annotationProcessorPaths>
387431
</configuration>
388432
</plugin>
@@ -413,11 +457,6 @@
413457
<message>You are running an older version of Maven. JHipster requires at least Maven ${maven.version}</message>
414458
<version>[${maven.version},)</version>
415459
</requireMavenVersion>
416-
<requireJavaVersion>
417-
<!-- Until JHipster supports JDK 9 -->
418-
<message>You are running an incompatible version of Java. JHipster requires JDK ${java.version}</message>
419-
<version>[1.8,1.9)</version>
420-
</requireJavaVersion>
421460
</rules>
422461
</configuration>
423462
</plugin>
@@ -568,10 +607,10 @@
568607
</execution>
569608
</executions>
570609
<configuration>
610+
<!--suppress UnresolvedMavenProperty -->
571611
<mainClass>${start-class}</mainClass>
572612
<executable>true</executable>
573613
<fork>true</fork>
574-
<includeSystemScope>true</includeSystemScope>
575614
<!--
576615
Enable the line below to have remote debugging of your application on port 5005
577616
<jvmArguments>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</jvmArguments>
@@ -602,11 +641,30 @@
602641
<SPRING_OUTPUT_ANSI_ENABLED>ALWAYS</SPRING_OUTPUT_ANSI_ENABLED>
603642
<JHIPSTER_SLEEP>0</JHIPSTER_SLEEP>
604643
</environment>
605-
<useCurrentTimestamp>true</useCurrentTimestamp>
644+
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
606645
</container>
607646
</configuration>
608647
</plugin>
609648
<!-- jhipster-needle-maven-add-plugin -->
649+
<plugin>
650+
<groupId>org.apache.maven.plugins</groupId>
651+
<artifactId>maven-antrun-plugin</artifactId>
652+
<version>1.8</version>
653+
<executions>
654+
<execution>
655+
<phase>validate</phase>
656+
<goals>
657+
<goal>run</goal>
658+
</goals>
659+
<configuration>
660+
<target>
661+
<echo>Displaying value of 'basedir' property</echo>
662+
<echo>[basedir]: ${basedir}</echo>
663+
</target>
664+
</configuration>
665+
</execution>
666+
</executions>
667+
</plugin>
610668
</plugins>
611669
<pluginManagement>
612670
<plugins>
@@ -718,6 +776,15 @@
718776
<yarnVersion>${yarn.version}</yarnVersion>
719777
</configuration>
720778
</execution>
779+
<execution>
780+
<id>yarn version</id>
781+
<goals>
782+
<goal>yarn</goal>
783+
</goals>
784+
<configuration>
785+
<arguments>-v</arguments>
786+
</configuration>
787+
</execution>
721788
<execution>
722789
<id>yarn install</id>
723790
<goals>
@@ -750,6 +817,9 @@
750817
<includes>
751818
<include>WEB-INF/**</include>
752819
</includes>
820+
<excludes>
821+
<exclude>WEB-INF/lib/logback-classic-1.2.3.jar</exclude>
822+
</excludes>
753823
</resource>
754824
</webResources>
755825
</configuration>
@@ -796,6 +866,10 @@
796866
<includes>
797867
<include>WEB-INF/**</include>
798868
</includes>
869+
<excludes>
870+
<exclude>WEB-INF/lib/logback-classic-1.2.3.jar</exclude>
871+
<exclude>WEB-INF/lib/httpclient-4.5.6.jar</exclude>
872+
</excludes>
799873
</resource>
800874
</webResources>
801875
</configuration>
@@ -845,6 +919,10 @@
845919
<includes>
846920
<include>WEB-INF/**</include>
847921
</includes>
922+
<excludes>
923+
<exclude>WEB-INF/lib/logback-classic-1.2.3.jar</exclude>
924+
<exclude>WEB-INF/lib/httpclient-4.5.6.jar</exclude>
925+
</excludes>
848926
</resource>
849927
</webResources>
850928
</configuration>
@@ -854,6 +932,7 @@
854932
<artifactId>spring-boot-maven-plugin</artifactId>
855933
<version>${spring-boot.version}</version>
856934
<configuration>
935+
<!--suppress UnresolvedMavenProperty -->
857936
<mainClass>${start-class}</mainClass>
858937
<executable>true</executable>
859938
</configuration>
@@ -979,6 +1058,7 @@
9791058
<artifactId>spring-boot-maven-plugin</artifactId>
9801059
<version>${spring-boot.version}</version>
9811060
<configuration>
1061+
<!--suppress UnresolvedMavenProperty -->
9821062
<mainClass>${start-class}</mainClass>
9831063
<executable>true</executable>
9841064
<fork>true</fork>

‎src/main/docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ ENTRYPOINT ["./entrypoint.sh"]
1616

1717
EXPOSE 8080
1818

19-
ADD *.war app.war
19+
ADD *.jar app.jar
2020

‎src/main/docker/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22

33
echo "The application will start in ${JHIPSTER_SLEEP}s..." && sleep ${JHIPSTER_SLEEP}
4-
exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar "${HOME}/app.war" "$@"
4+
exec java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar "${HOME}/app.jar" "$@"

0 commit comments

Comments
 (0)