Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
Legal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSDU
OSDU Data Platform
Security and Compliance
Legal
Commits
0c206bd9
Commit
0c206bd9
authored
4 years ago
by
Riabokon Stanislav(EPAM)[GCP]
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/master' into integration-master
# Conflicts: # pom.xml
parents
10db3712
5b266d43
No related branches found
No related tags found
3 merge requests
!98
(GONRG-1768) GCP: logging impl
,
!92
Cloud-agnostic module `legal-reference` for Anthos (GONRG-1423)
,
!87
Fix gcp unit test
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
NOTICE
+6
-13
6 additions, 13 deletions
NOTICE
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
provider/legal-azure/pom.xml
+1
-1
1 addition, 1 deletion
provider/legal-azure/pom.xml
with
8 additions
and
15 deletions
NOTICE
+
6
−
13
View file @
0c206bd9
...
...
@@ -232,7 +232,6 @@ The following software have components provided under the terms of this license:
- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
- Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/)
- Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version})
- Apache Groovy (from http://groovy-lang.org)
...
...
@@ -602,7 +601,6 @@ The following software have components provided under the terms of this license:
- Stax2 API (from http://github.com/FasterXML/stax2-api)
- jersey-ext-bean-validation (from )
- jersey-spring4 (from )
- oro (from )
========================================================================
BSD-3-Clause
...
...
@@ -666,12 +664,6 @@ CC-BY-2.5
The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
========================================================================
CC-BY-3.0
========================================================================
The following software have components provided under the terms of this license:
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
========================================================================
...
...
@@ -705,9 +697,7 @@ The following software have components provided under the terms of this license:
- HK2 configuration module (from )
- HK2 core module (from )
- HK2 module of HK2 itself (from )
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework API jar (from )
- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
- Run Level Service (from )
- ServiceLocator Default Implementation (from git://java.net/hk2~git/hk2-locator)
- Servlet Specification 2.5 API (from )
...
...
@@ -730,7 +720,9 @@ CDDL-1.1
The following software have components provided under the terms of this license:
- Java Architecture For XML Binding (from )
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
- JavaMail API (from )
- OSGi resource locator (from )
- jersey-ext-bean-validation (from )
...
...
@@ -743,6 +735,7 @@ CPL-1.0
========================================================================
The following software have components provided under the terms of this license:
- JUnit (from http://junit.org)
- System Rules (from http://stefanbirkner.github.io/system-rules/)
========================================================================
...
...
@@ -750,7 +743,6 @@ EPL-1.0
========================================================================
The following software have components provided under the terms of this license:
- JUnit (from http://junit.org)
- Logback Classic Module (from )
- Logback Core Module (from )
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
...
...
@@ -876,7 +868,6 @@ LGPL-2.1-or-later
========================================================================
The following software have components provided under the terms of this license:
- Java Native Access (from https://github.com/java-native-access/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/)
- SnakeYAML (from http://www.snakeyaml.org)
...
...
@@ -981,7 +972,6 @@ The following software have components provided under the terms of this license:
- jersey-core-common (from )
- jersey-core-server (from git://java.net/jersey~code/jersey-server)
- reactive-streams (from http://www.reactive-streams.org/)
- xml-apis (from )
========================================================================
SISSL-1.2
...
...
@@ -1034,7 +1024,9 @@ The following software have components provided under the terms of this license:
- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
- Project Lombok (from https://projectlombok.org)
- Spring Web (from https://github.com/spring-projects/spring-framework)
- StAX API (from http://stax.codehaus.org/)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- xml-apis (from )
========================================================================
unknown
...
...
@@ -1042,6 +1034,7 @@ unknown
The following software have components provided under the terms of this license:
- Byte Buddy (without dependencies) (from )
- JUnit (from http://junit.org)
- JavaBeans Activation Framework API jar (from )
- Servlet Specification 2.5 API (from )
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
...
...
This diff is collapsed.
Click to expand it.
pom.xml
+
1
−
1
View file @
0c206bd9
...
...
@@ -9,7 +9,7 @@
<maven.compiler.source>
1.8
</maven.compiler.source>
<docker.image.prefix>
opendes
</docker.image.prefix>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<os-core-common.version>
0.3.2
1
</os-core-common.version>
<os-core-common.version>
0.3.2
3
</os-core-common.version>
</properties>
<licenses>
...
...
This diff is collapsed.
Click to expand it.
provider/legal-azure/pom.xml
+
1
−
1
View file @
0c206bd9
...
...
@@ -34,7 +34,7 @@
<azure.appservice.appname></azure.appservice.appname>
<azure.appservice.subscription></azure.appservice.subscription>
<osdu.corelibazure.version>
0.0.42
</osdu.corelibazure.version>
<osdu.oscorecommon.version>
0.3.
1
2
</osdu.oscorecommon.version>
<osdu.oscorecommon.version>
0.3.2
3
</osdu.oscorecommon.version>
<osdu.legal-core.version>
0.0.5-SNAPSHOT
</osdu.legal-core.version>
<javax.inject.version>
1
</javax.inject.version>
<javax.servlet-api.version>
4.0.1
</javax.servlet-api.version>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment