Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/dzhw/metadatamanagement
Browse files Browse the repository at this point in the history
 into development
  • Loading branch information
René Reitmann committed Dec 16, 2021
2 parents 1405729 + 15d29c4 commit 64ce7ca
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 80 deletions.
180 changes: 108 additions & 72 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Data Search for Higher Education Research and Science Studies",
"private": true,
"dependencies": {
"@citation-js/plugin-doi": "0.5.2",
"@citation-js/plugin-doi": "0.5.3",
"angular": "1.8.2",
"angular-animate": "1.8.2",
"angular-aria": "1.8.2",
Expand Down Expand Up @@ -35,7 +35,7 @@
"bootstrap-sass": "3.4.1",
"bowser": "https://github.com/lancedikson/bowser/archive/1.9.4.tar.gz",
"cheet.js": "0.3.3",
"citation-js": "0.5.1",
"citation-js": "0.5.3",
"clientjs": "0.2.1",
"elasticsearch-browser": "https://github.com/elastic/bower-elasticsearch-js/archive/v16.7.1.tar.gz",
"es5-shim": "4.6.2",
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.7</version>
<relativePath />
<relativePath/>
</parent>

<groupId>eu.dzhw.fdz</groupId>
Expand Down Expand Up @@ -176,7 +176,7 @@
<dependency>
<groupId>org.javers</groupId>
<artifactId>javers-spring-boot-starter-mongo</artifactId>
<version>6.5.1</version>
<version>6.5.2</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
Expand Down Expand Up @@ -406,7 +406,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -419,7 +419,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -432,7 +432,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
<pluginExecution>
Expand All @@ -445,7 +445,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down

0 comments on commit 64ce7ca

Please sign in to comment.