Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AysherPull #2

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
da6c348
Bump the maven group across 1 directory with 1 update
dependabot[bot] Mar 12, 2024
ba26131
Bump the npm_and_yarn group across 1 directory with 25 updates
dependabot[bot] Apr 10, 2024
eb0796d
Bump ini from 1.3.5 to 1.3.8 in /web/src/main/resources
dependabot[bot] Apr 10, 2024
f6630c3
Bump lodash.mergewith from 4.6.1 to 4.6.2 in /web/src/main/resources
dependabot[bot] Apr 10, 2024
9cc24f3
fix: upgrade ch.qos.logback:logback-access from 1.1.11 to 1.4.14
snyk-bot Apr 17, 2024
409c002
fix: upgrade com.google.guava:guava from 23.0 to 23.6.1-jre
snyk-bot Apr 17, 2024
a5c78ea
fix: upgrade org.apache.solr:solr-solrj from 6.6.0 to 6.6.6
snyk-bot Apr 17, 2024
7f35f86
fix: upgrade org.tukaani:xz from 1.6 to 1.9
snyk-bot Apr 17, 2024
dd75250
fix: upgrade pl.allegro.tech.boot:handlebars-spring-boot-starter from…
snyk-bot Apr 17, 2024
a94723f
fix: ingress/Dockerfile to reduce vulnerabilities
snyk-bot Apr 18, 2024
47d3ff3
fix: ingress/Dockerfile to reduce vulnerabilities
snyk-bot Apr 18, 2024
83634e1
fix: ingress/Dockerfile to reduce vulnerabilities
snyk-bot Apr 20, 2024
33e0054
fix: ingress/Dockerfile to reduce vulnerabilities
snyk-bot Apr 24, 2024
4258f52
Merge pull request #12 from SherfeyInv/snyk-upgrade-f402fc77d04ee25e5…
SherfeyInv May 16, 2024
47c016b
Merge pull request #11 from SherfeyInv/snyk-upgrade-cf462b61164006b05…
SherfeyInv May 16, 2024
109c5c3
Merge pull request #16 from SherfeyInv/snyk-fix-3935c5bd844b18fc938ca…
SherfeyInv May 27, 2024
15382e3
Merge branch 'master' into snyk-fix-ba1ca91ab39e9b5f3e70d7823d2c3cfc
SherfeyInv May 27, 2024
29db552
Merge pull request #15 from SherfeyInv/snyk-fix-ba1ca91ab39e9b5f3e70d…
SherfeyInv May 27, 2024
cbe5791
Merge branch 'master' into snyk-fix-0027389cf86aa252f96206831fdc82ff
SherfeyInv May 27, 2024
7ee4303
Merge pull request #14 from SherfeyInv/snyk-fix-0027389cf86aa252f9620…
SherfeyInv May 27, 2024
9a7d9fe
Merge branch 'master' into snyk-fix-74718b876a0e5a840c7b249e67ed8149
SherfeyInv May 27, 2024
23a9fc9
Merge pull request #13 from SherfeyInv/snyk-fix-74718b876a0e5a840c7b2…
SherfeyInv May 27, 2024
d69fdd9
Merge pull request #10 from SherfeyInv/snyk-upgrade-eb50f3a6c41333dfe…
SherfeyInv May 27, 2024
a0c5c20
Merge pull request #9 from SherfeyInv/snyk-upgrade-8a583a82137cbf43f2…
SherfeyInv May 27, 2024
fd2550f
Merge pull request #8 from SherfeyInv/snyk-upgrade-3ad70568c455e9ca45…
SherfeyInv May 27, 2024
39503e0
Merge pull request #7 from SherfeyInv/dependabot/npm_and_yarn/web/src…
SherfeyInv May 27, 2024
7a50a1f
Merge pull request #6 from SherfeyInv/dependabot/npm_and_yarn/web/src…
SherfeyInv May 27, 2024
f0b8854
Merge branch 'master' into dependabot/npm_and_yarn/web/src/main/resou…
SherfeyInv May 27, 2024
2ac1374
Merge pull request #5 from SherfeyInv/dependabot/npm_and_yarn/web/src…
SherfeyInv May 27, 2024
488125f
Merge branch 'master' into dependabot/maven/maven-security-group-4934…
SherfeyInv May 27, 2024
c589ff3
Merge pull request #2 from SherfeyInv/dependabot/maven/maven-security…
SherfeyInv May 27, 2024
5dd4afe
fix: upgrade org.apache.commons:commons-csv from 1.5 to 1.11.0
snyk-bot May 28, 2024
6a6c4d1
fix: upgrade net.rakugakibox.spring.boot:logback-access-spring-boot-s…
snyk-bot May 28, 2024
2c3a2d1
fix: upgrade jquery from 3.5.0 to 3.7.1
snyk-bot May 28, 2024
f5467fa
fix: upgrade pubsub-js from 1.6.0 to 1.9.4
snyk-bot May 28, 2024
60deb4f
fix: upgrade handlebars from 4.7.7 to 4.7.8
snyk-bot May 28, 2024
a5e8693
Merge pull request #19 from SherfeyInv/snyk-upgrade-4c12bf3f8bba8addf…
SherfeyInv May 29, 2024
5205c74
Merge pull request #22 from SherfeyInv/snyk-upgrade-d6d6cbb7624822dcb…
SherfeyInv May 29, 2024
4572d1e
Merge pull request #21 from SherfeyInv/snyk-upgrade-c412539b51668ed16…
SherfeyInv May 29, 2024
41cfdb8
Merge pull request #20 from SherfeyInv/snyk-upgrade-67dff977bcec8f1af…
SherfeyInv May 29, 2024
3a446ba
Merge pull request #18 from SherfeyInv/snyk-upgrade-e3ebe5ae3f9ee6a0c…
SherfeyInv May 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion indexer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Loads solr index from flat files</description>
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
<version>1.6</version>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
2 changes: 0 additions & 2 deletions ingress/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
from nginx:1.14-alpine

EXPOSE 443
ADD default.conf /etc/nginx/conf.d/default.conf
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,16 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>6.6.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<version>23.6.1-jre</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
<version>1.1.11</version>
<version>1.4.14</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
6 changes: 3 additions & 3 deletions web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>net.rakugakibox.spring.boot</groupId>
<artifactId>logback-access-spring-boot-starter</artifactId>
<version>2.7.1</version>
<version>2.12.0</version>
</dependency>

<dependency>
Expand All @@ -71,13 +71,13 @@
<dependency>
<groupId>pl.allegro.tech.boot</groupId>
<artifactId>handlebars-spring-boot-starter</artifactId>
<version>0.3.0</version>
<version>0.4.1</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.5</version>
<version>1.11.0</version>
</dependency>
</dependencies>

Expand Down
12 changes: 6 additions & 6 deletions web/src/main/resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "",
"license": "ISC",
"devDependencies": {
"bootstrap-sass": "^3.3.7",
"bootstrap-sass": "^3.4.1",
"c3": "^0.4.18",
"clean-webpack-plugin": "^0.1.16",
"copy-webpack-plugin": "^4.0.1",
Expand All @@ -22,7 +22,7 @@
"handlebars-loader": "^1.5.0",
"html-webpack-plugin": "^2.28.0",
"jquery-serializejson": "^2.8.1",
"node-sass": "^4.5.3",
"node-sass": "^7.0.0",
"resolve-url-loader": "^2.0.2",
"sass-loader": "^6.0.5",
"style-loader": "^0.18.2",
Expand All @@ -34,11 +34,11 @@
"dependencies": {
"bootstrap-float-label": "^3.0.1",
"deparam": "^1.0.5",
"handlebars": "^4.0.10",
"handlebars": "^4.7.8",
"immutable": "^3.8.1",
"jquery": "^3.3.1",
"lodash": "^4.17.4",
"pubsub-js": "^1.5.7",
"jquery": "^3.7.1",
"lodash": "^4.17.21",
"pubsub-js": "^1.9.4",
"rbgkew-typeahead": "^1.1.1",
"simple-pagination.js": "^1.6.0"
}
Expand Down
Loading