Skip to content

Commit b0da0c7

Browse files
annahiletaannahileta
authored
fixing confilcts in mvn dependencies (#106)
1 parent 52f5f45 commit b0da0c7

34 files changed

Lines changed: 312 additions & 176 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ app.config
5050
Quick_ACG/target/*
5151
JWT Console App/target/*
5252
Quick_ACG/src/main/resources/application.json
53+

‎.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"com.sun.*",
3434
"java.*",
3535
"javafx.*",
36-
"javax.*",
36+
"jakarta.*",
3737
"org.apache.*",
3838
"org.eclipse.*",
3939
"org.fordiac.*",

‎JWT Console App/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747

4848
</dependencies>
4949

50+
51+
5052
<build>
5153
<plugins>
5254
<plugin>

‎Quick_ACG/src/main/java/com/docusign/DSConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import org.springframework.beans.factory.annotation.Value;
99
import org.springframework.http.MediaType;
1010
import org.springframework.stereotype.Component;
11-
import javax.ws.rs.HttpMethod;
12-
import javax.ws.rs.core.HttpHeaders;
11+
import jakarta.ws.rs.HttpMethod;
12+
import jakarta.ws.rs.core.HttpHeaders;
1313
import java.io.BufferedReader;
1414
import java.io.IOException;
1515
import java.io.InputStreamReader;

‎code-examples-java.iml‎

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<webroots>
1010
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
1111
</webroots>
12+
<sourceRoots>
13+
<root url="file://$MODULE_DIR$/src/main/java" />
14+
<root url="file://$MODULE_DIR$/src/main/resources" />
15+
</sourceRoots>
1216
</configuration>
1317
</facet>
1418
<facet type="Spring" name="Spring">
@@ -21,6 +25,7 @@
2125
<content url="file://$MODULE_DIR$">
2226
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
2327
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
28+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
2429
<excludeFolder url="file://$MODULE_DIR$/target" />
2530
</content>
2631
<orderEntry type="inheritedJdk" />
@@ -30,6 +35,7 @@
3035
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.12" level="project" />
3136
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
3237
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
38+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
3339
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
3440
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
3541
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
@@ -40,8 +46,6 @@
4046
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
4147
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
4248
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.5" level="project" />
43-
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.5" level="project" />
44-
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.5" level="project" />
4549
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
4650
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.5.5" level="project" />
4751
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
@@ -53,69 +57,69 @@
5357
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
5458
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
5559
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
56-
<orderEntry type="library" name="Maven: org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.5.6" level="project" />
57-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" />
58-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6.1" level="project" />
59-
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
60-
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
61-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.12" level="project" />
62-
<orderEntry type="library" name="Maven: org.springframework.security.oauth:spring-security-oauth2:2.5.0.RELEASE" level="project" />
63-
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
64-
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-jwt:1.1.1.RELEASE" level="project" />
65-
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
66-
<orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
67-
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
68-
<orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
69-
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
70-
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
71-
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
60+
<orderEntry type="library" name="Maven: org.apache.taglibs:taglibs-standard-spec:1.2.5" level="project" />
61+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-oauth2-client:2.5.12" level="project" />
62+
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.5" level="project" />
63+
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.5" level="project" />
64+
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-client:5.5.5" level="project" />
65+
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-core:5.5.5" level="project" />
66+
<orderEntry type="library" name="Maven: com.nimbusds:oauth2-oidc-sdk:9.9.1" level="project" />
67+
<orderEntry type="library" name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
68+
<orderEntry type="library" name="Maven: com.nimbusds:content-type:2.1" level="project" />
69+
<orderEntry type="library" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
70+
<orderEntry type="library" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
71+
<orderEntry type="library" name="Maven: org.ow2.asm:asm:9.1" level="project" />
72+
<orderEntry type="library" name="Maven: com.nimbusds:lang-tag:1.5" level="project" />
73+
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-jose:5.5.5" level="project" />
74+
<orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:9.10.1" level="project" />
75+
<orderEntry type="library" name="Maven: io.github.cdimascio:dotenv-java:2.2.0" level="project" />
76+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
7277
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
7378
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
7479
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
7580
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.6" level="project" />
81+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" />
7682
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" />
83+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6.1" level="project" />
7784
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
7885
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.6" level="project" />
86+
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.8" level="project" />
87+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.14.2" level="project" />
88+
<orderEntry type="library" name="Maven: jakarta.ws.rs:jakarta.ws.rs-api:3.1.0" level="project" />
89+
<orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
90+
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
91+
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
7992
<orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
80-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-jasper:9.0.60" level="project" />
93+
<orderEntry type="library" name="Maven: org.json:json:20210307" level="project" />
94+
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-jasper:9.0.60" level="project" />
8195
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
8296
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.60" level="project" />
8397
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
84-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jdt:ecj:3.18.0" level="project" />
98+
<orderEntry type="library" name="Maven: org.eclipse.jdt:ecj:3.18.0" level="project" />
8599
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
86-
<orderEntry type="library" name="Maven: com.docusign:docusign-esign-java:3.18.0" level="project" />
87-
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.18" level="project" />
88-
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.33" level="project" />
89-
<orderEntry type="library" name="Maven: jakarta.ws.rs:jakarta.ws.rs-api:2.1.6" level="project" />
100+
<orderEntry type="library" name="Maven: com.docusign:docusign-esign-java:shaded:4.3.0" level="project" />
101+
<orderEntry type="library" name="Maven: com.docusign:docusign-rooms-java:shaded:1.4.2" level="project" />
102+
<orderEntry type="library" name="Maven: com.docusign:docusign-click-java:shaded:1.4.0" level="project" />
103+
<orderEntry type="library" name="Maven: com.docusign:docusign-monitor-java:shaded:1.3.0" level="project" />
104+
<orderEntry type="library" name="Maven: com.docusign:docusign-admin-java:shaded:1.2.0" level="project" />
105+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.12" level="project" />
106+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.12" level="project" />
107+
<orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:3.0.9" level="project" />
90108
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.33" level="project" />
91-
<orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.3" level="project" />
92109
<orderEntry type="library" name="Maven: org.glassfish.hk2.external:jakarta.inject:2.6.1" level="project" />
93-
<orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-multipart:2.33" level="project" />
94-
<orderEntry type="library" name="Maven: org.jvnet.mimepull:mimepull:1.9.15" level="project" />
95-
<orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.33" level="project" />
110+
<orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.3" level="project" />
96111
<orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.33" level="project" />
97-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.6" level="project" />
112+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.3" level="project" />
113+
<orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
114+
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
98115
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
99-
<orderEntry type="library" name="Maven: org.glassfish.jersey.inject:jersey-hk2:2.33" level="project" />
100-
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-locator:2.6.1" level="project" />
101-
<orderEntry type="library" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.6.1" level="project" />
102-
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-api:2.6.1" level="project" />
103-
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-utils:2.6.1" level="project" />
104-
<orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
105-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.6" level="project" />
106-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.6" level="project" />
107-
<orderEntry type="library" name="Maven: org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2" level="project" />
108-
<orderEntry type="library" name="Maven: org.apache.oltu.oauth2:org.apache.oltu.oauth2.common:1.0.2" level="project" />
109-
<orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
110-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
111-
<orderEntry type="library" name="Maven: com.auth0:java-jwt:3.4.1" level="project" />
112-
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
113-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.12.6" level="project" />
114-
<orderEntry type="library" name="Maven: com.brsanthu:migbase64:2.2" level="project" />
115-
<orderEntry type="library" name="Maven: com.docusign:docusign-rooms-java:1.1.0" level="project" />
116-
<orderEntry type="library" name="Maven: com.docusign:docusign-click-java:1.0.0" level="project" />
117-
<orderEntry type="library" name="Maven: com.docusign:docusign-monitor-java:1.1.0" level="project" />
118-
<orderEntry type="library" name="Maven: com.docusign:docusign-admin-java:1.1.0" level="project" />
119-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.4" level="project" />
116+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
117+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
118+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
119+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.2" level="project" />
120+
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
121+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.2" level="project" />
122+
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
123+
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.2" level="project" />
120124
</component>
121125
</module>

0 commit comments

Comments
 (0)