Skip to content

Commit f5cff73

Browse files
alegaussalegauss
authored
Merge pull request #8 from openvecchio/0.3.3
0.3.3
2 parents 2d9408b + 1c64608 commit f5cff73

File tree

17 files changed

+185
-164
lines changed

17 files changed

+185
-164
lines changed

‎.bowerrc‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.classpath‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "gradle" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "daily"

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.war
88
*.ear
99

10+
/.classpath
1011
/.vscode
1112
/.settings
1213
/.project
@@ -25,3 +26,4 @@ src/main/resources/js/client-side/build
2526
/nashorn_code_cache
2627
.sts4-cache
2728
/store.*
29+
.metals

‎.project‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
</buildCommand>
3838
</buildSpec>
3939
<natures>
40+
<nature>org.eclipse.jdt.core.javanature</nature>
41+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
4042
<nature>org.eclipse.m2e.core.maven2Nature</nature>
4143
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
4244
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
43-
<nature>org.eclipse.jdt.core.javanature</nature>
4445
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
4546
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
46-
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
4747
</natures>
4848
</projectDescription>

‎Dockerfile‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
1-
#
2-
# Ubuntu Dockerfile
3-
#
4-
# https://github.com/dockerfile/ubuntu
5-
#
6-
7-
# Pull base image.
8-
FROM ubuntu:14.04
9-
10-
# Install.
11-
RUN \
12-
sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
13-
apt-get update && \
14-
apt-get -y upgrade && \
15-
apt-get install -y build-essential && \
16-
apt-get install -y software-properties-common && \
17-
apt-get install -y byobu curl git htop man unzip vim wget && \
18-
rm -rf /var/lib/apt/lists/*
19-
20-
# Add files.
21-
ADD root/.bashrc /root/.bashrc
22-
ADD root/.gitconfig /root/.gitconfig
23-
ADD root/.scripts /root/.scripts
24-
25-
# Set environment variables.
26-
ENV HOME /root
27-
28-
# Define working directory.
29-
WORKDIR /root
30-
31-
# Define default command.
32-
CMD ["bash"]
1+
FROM openjdk:8-jre-alpine
2+
3+
ENV JAVA_OPTS=${JAVA_OPTS:-'-Xmx512m'}
4+
ENV DEBUG_OPTS=${DEBUG_OPTS}
5+
ENV PORT=${PORT:-2702}
6+
ENV spring.datasource.url=${DATA_SOURCE:-'jdbc:h2:file:./store/db/vecchioDB'}
7+
ENV spring.datasource.username=${DB_USER:-'sa'}
8+
ENV spring.datasource.password=${DB_PASSWORD:-''}
9+
ENV spring.datasource.driver-class-name=${DB_DRIVER:-'org.h2.Driver'}
10+
ENV spring.jpa.properties.hibernate.dialect=${DB_DIALECT:-'org.hibernate.dialect.H2Dialect'}
11+
12+
RUN adduser -D -g '' java
13+
14+
COPY /build/libs/viglet-vecchio.jar /app.jar
15+
16+
17+
RUN sh -c 'touch /app.jar'
18+
RUN sh -c 'mkdir -p /store'
19+
RUN sh -c 'chown -R java /store'
20+
21+
VOLUME /tmp
22+
VOLUME /store
23+
24+
USER java
25+
26+
EXPOSE ${PORT}
27+
28+
CMD java ${JAVA_OPTS} ${DEBUG_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /app.jar

‎bower.json‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎build.gradle‎

Lines changed: 87 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
21
buildscript {
3-
ext { springBootVersion = '2.2.2.RELEASE'
2+
ext { springBootVersion = '2.3.1.RELEASE'
43
hibernateVersion = '5.11.0.Final'
5-
httpClientVersion = '4.5.6'
4+
httpClientVersion = '4.5.11'
65
swaggerVersion = '2.9.2'
76
jasyptVersion = '2.1.1'
87
}
98
repositories {
10-
mavenCentral()
11-
maven { url "https://repo.spring.io/snapshot" }
12-
maven { url "https://repo.spring.io/milestone" }
13-
maven { url 'https://jitpack.io' }
14-
maven { url "https://code.lds.org/nexus/content/groups/main-repo" }
15-
jcenter()
9+
mavenCentral()
1610
}
1711
dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
1812
classpath files("lib/gradle-js-plugin-2.14.2-SNAPSHOT.jar") }
1913
}
2014

2115
plugins {
2216
id "com.eriwen.gradle.js" version "2.14.1"
17+
id "com.gorylenko.gradle-git-properties" version "2.2.1"
2318
}
2419

2520
apply plugin: 'java'
@@ -29,29 +24,45 @@ apply plugin: 'io.spring.dependency-management'
2924
apply plugin: 'jacoco'
3025
apply plugin: 'project-report'
3126

32-
sourceSets {
33-
main {
34-
java {
35-
srcDirs = ['src/main/java', 'libs/search/src/main/java','libs/core/src/main/java','libs/nlp/src/main/java']
36-
}
37-
}
38-
}
3927
jar {
40-
baseName = 'viglet-vecchio'
41-
version = '0.3.2'
28+
archiveBaseName = 'viglet-vecchio'
29+
archiveVersion = '0.3.3'
30+
}
31+
32+
eclipse {
33+
classpath {
34+
file {
35+
whenMerged {
36+
def src = entries.find { it.path == 'src/main/resources' }
37+
src.excludes = ['**']
38+
}
39+
}
40+
}
41+
}
42+
43+
gitProperties {
44+
extProperty = 'gitProps' // git properties will be put in a map at project.ext.gitProps
4245
}
4346

4447
bootJar {
45-
launchScript()
48+
launchScript() // executable jar
49+
manifest {
50+
attributes(
51+
'Implementation-Version': "${-> project.jar.version + '-' + project.ext.gitProps['git.commit.id.abbrev']}"
52+
)
53+
}
54+
}
55+
56+
generateGitProperties.outputs.upToDateWhen { false } // make sure the generateGitProperties task always executes (even when git.properties is not changed)
57+
58+
task printGitProperties(dependsOn: 'generateGitProperties') { // make sure generateGitProperties task to execute before accessing generated properties
59+
doLast {
60+
println "git.commit.id.abbrev=" + project.ext.gitProps['git.commit.id.abbrev']
61+
}
4662
}
4763

4864
repositories {
4965
mavenCentral()
50-
maven { url "https://repo.spring.io/snapshot" }
51-
maven { url "https://repo.spring.io/milestone" }
52-
maven { url 'https://jitpack.io' }
53-
maven { url "https://code.lds.org/nexus/content/groups/main-repo" }
54-
jcenter()
5566
}
5667

5768
sourceCompatibility = 1.8
@@ -100,82 +111,82 @@ javadoc {
100111
dependencies {
101112

102113
// Spring Boot
103-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}"
104-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version:"${springBootVersion}"
105-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-parent', version:"${springBootVersion}"
106-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version:"${springBootVersion}"
107-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security', version:"${springBootVersion}"
108-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version:"${springBootVersion}"
109-
// compile group: 'org.springframework.security.oauth.boot', name: 'spring-security-oauth2-autoconfigure', version:"${springBootVersion}"
114+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}"
115+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version:"${springBootVersion}"
116+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-parent', version:"${springBootVersion}"
117+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version:"${springBootVersion}"
118+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version:"${springBootVersion}"
119+
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version:"${springBootVersion}"
120+
// implementation group: 'org.springframework.security.oauth.boot', name: 'spring-security-oauth2-autoconfigure', version:"${springBootVersion}"
110121

111122
// OLTU
112-
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.authzserver', version:"1.0.0"
113-
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.resourceserver', version:"1.0.0"
114-
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.common', version:"1.0.0"
115-
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.dynamicreg.server', version:"1.0.0"
116-
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version:"1.0.0"
117-
compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.dynamicreg.client', version:"1.0.0"
123+
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.authzserver', version:"1.0.0"
124+
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.resourceserver', version:"1.0.0"
125+
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.common', version:"1.0.0"
126+
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.dynamicreg.server', version:"1.0.0"
127+
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version:"1.0.0"
128+
implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.dynamicreg.client', version:"1.0.0"
118129

119130
// Oracle
120-
compile group: 'com.oracle', name: 'ojdbc6', version: '11.2.0.3'
131+
implementation group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0'
121132

122133
// Jasypt
123-
compile group: 'com.github.ulisesbocchio', name: 'jasypt-spring-boot-starter', version: "${jasyptVersion}"
134+
implementation group: 'com.github.ulisesbocchio', name: 'jasypt-spring-boot-starter', version: "${jasyptVersion}"
124135

125136
// Spring
126-
compile group: 'org.springframework', name: 'spring-test', version: '5.2.2.RELEASE'
137+
implementation group: 'org.springframework', name: 'spring-test', version: '5.2.7.RELEASE'
127138

128139
// Jackson
129-
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5', version: '2.9.7'
140+
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5', version: '2.9.7'
130141

131142
// H2
132-
compile group: 'com.h2database', name: 'h2', version:'1.4.197'
143+
implementation group: 'com.h2database', name: 'h2', version:'1.4.197'
133144

134145
// MariaDB
135-
compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.3.0'
146+
implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.3.0'
136147

137148
// JSON
138-
compile group: 'org.json', name: 'json', version:'20140107'
149+
implementation group: 'org.json', name: 'json', version:'20140107'
139150

140151
// Apache Commons
141-
compile group: 'commons-io', name: 'commons-io', version:'2.5'
142-
compile group: 'commons-lang', name: 'commons-lang', version:'2.6'
152+
implementation group: 'commons-io', name: 'commons-io', version:'2.5'
153+
implementation group: 'commons-lang', name: 'commons-lang', version:'2.6'
143154

144155
// Swagger 2
145-
compile group: 'io.springfox', name: 'springfox-swagger2', version: "${swaggerVersion}"
146-
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: "${swaggerVersion}"
156+
implementation group: 'io.springfox', name: 'springfox-swagger2', version: "${swaggerVersion}"
157+
implementation group: 'io.springfox', name: 'springfox-swagger-ui', version: "${swaggerVersion}"
147158

148159

149160
// WebJars
150-
compile 'org.webjars.bower:jquery:1.12.4'
151-
compile 'org.webjars.bower:jquery.ui:1.11.3'
152-
compile 'org.webjars:bootstrap:3.3.7-1' // Content
153-
compile 'org.webjars.bower:bootstrap:4.1.1' // Preview
154-
compile 'org.webjars.bower:moment:2.20.1'
155-
compile 'org.webjars.bower:angular:1.6.9'
156-
compile 'org.webjars.bower:ace-builds:1.3.1'
157-
compile 'org.webjars.bower:tinymce:4.5.8'
158-
compile 'org.webjars.bower:angular-ui-router:1.0.14'
159-
compile 'org.webjars.bower:angular-translate:2.17.0'
160-
compile 'org.webjars.bower:angular-resource:1.6.9'
161-
compile 'org.webjars.bower:angular-animate:1.6.9'
162-
compile 'org.webjars.bower:angular-sanitize:1.6.9'
163-
compile 'org.webjars.bower:angular-bootstrap:2.5.0'
164-
compile 'org.webjars.bower:angular-cookies:1.6.9'
165-
compile 'org.webjars.bower:angular-moment:1.2.0'
166-
compile 'org.webjars.bower:angular-ui-ace:0.2.3'
167-
compile 'org.webjars.bower:font-awesome:4.7.0'
168-
compile 'org.webjars.bower:ng-file-upload:12.2.13'
169-
compile 'org.webjars.bower:angular-ui-notification:0.3.6'
170-
compile 'org.webjars.bower:angular-ui-tinymce:0.0.19'
171-
compile 'org.webjars.bower:angular-ui-sortable:0.14.3'
172-
compile 'org.webjars.bower:angular-ui-select:0.19.8'
173-
compile 'org.webjars.bower:ngInfiniteScroll:1.3.4'
174-
compile 'org.webjars.bower:nvd3:1.8.6'
175-
compile 'org.webjars:d3js:3.5.17'
176-
compile 'org.webjars:angular-nvd3:1.0.5'
161+
implementation 'org.webjars.bower:jquery:1.12.4'
162+
implementation 'org.webjars.bower:jquery.ui:1.11.3'
163+
implementation 'org.webjars:bootstrap:3.3.7-1'
164+
implementation 'org.webjars.bower:bootstrap:4.1.1'
165+
implementation 'org.webjars.bower:moment:2.20.1'
166+
implementation 'org.webjars.bower:angular:1.6.9'
167+
implementation 'org.webjars.bower:ace-builds:1.3.1'
168+
implementation 'org.webjars.bower:tinymce:4.5.8'
169+
implementation 'org.webjars.bower:angular-ui-router:1.0.14'
170+
implementation 'org.webjars.bower:angular-translate:2.17.0'
171+
implementation 'org.webjars.bower:angular-resource:1.6.9'
172+
implementation 'org.webjars.bower:angular-animate:1.6.9'
173+
implementation 'org.webjars.bower:angular-sanitize:1.6.9'
174+
implementation 'org.webjars.bower:angular-bootstrap:2.5.0'
175+
implementation 'org.webjars.bower:angular-cookies:1.6.9'
176+
implementation 'org.webjars.bower:angular-moment:1.2.0'
177+
implementation 'org.webjars.bower:angular-ui-ace:0.2.3'
178+
implementation 'org.webjars.bower:font-awesome:4.7.0'
179+
implementation 'org.webjars.bower:ng-file-upload:12.2.13'
180+
implementation 'org.webjars.bower:angular-ui-notification:0.3.6'
181+
implementation 'org.webjars.bower:angular-ui-tinymce:0.0.19'
182+
implementation 'org.webjars.bower:angular-ui-sortable:0.14.3'
183+
implementation 'org.webjars.bower:angular-ui-select:0.19.8'
184+
implementation 'org.webjars.bower:ngInfiniteScroll:1.3.4'
185+
implementation 'org.webjars.bower:nvd3:1.8.6'
186+
implementation 'org.webjars:d3js:3.5.17'
187+
implementation 'org.webjars:angular-nvd3:1.0.5'
177188

178-
testCompile('org.springframework.boot:spring-boot-starter-test')
189+
testImplementation('org.springframework.boot:spring-boot-starter-test')
179190
}
180191

181192
test {

‎docs/assets/vecchio-logo.png‎

29.5 KB
Loading

‎docs/assets/viglet-cover.png‎

9.5 MB
Loading

0 commit comments

Comments
 (0)