Skip to content

Commit d4a5819

Browse files
maurercwmaurercw
authored
SAK-46783 Global commons libs are in shared and should be marked as provided (sakaiproject#10700)
1 parent 977d556 commit d4a5819

File tree

17 files changed

+49
-22
lines changed

17 files changed

+49
-22
lines changed

‎admin-su/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<dependency>
4040
<groupId>commons-digester</groupId>
4141
<artifactId>commons-digester</artifactId>
42-
<version>1.6</version>
4342
</dependency>
4443
<dependency>
4544
<groupId>commons-collections</groupId>

‎basiclti/basiclti-oidc/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
<groupId>org.apache.commons</groupId>
4747
<artifactId>commons-lang3</artifactId>
4848
</dependency>
49+
<dependency>
50+
<groupId>commons-codec</groupId>
51+
<artifactId>commons-codec</artifactId>
52+
</dependency>
4953
</dependencies>
5054

5155
<build>

‎common/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,6 @@
121121
<artifactId>sakai-archive-import</artifactId>
122122
<version>${project.version}</version>
123123
</dependency>
124-
<!-- external dependencies -->
125-
<dependency>
126-
<groupId>org.apache.commons</groupId>
127-
<artifactId>commons-compress</artifactId>
128-
<version>1.21</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>commons-codec</groupId>
132-
<artifactId>commons-codec</artifactId>
133-
<version>1.13</version>
134-
</dependency>
135124
</dependencies>
136125
</dependencyManagement>
137126
</project>

‎deploy/pom.xml

+20
Original file line numberDiff line numberDiff line change
@@ -655,11 +655,31 @@
655655
<artifactId>commons-collections4</artifactId>
656656
<scope>compile</scope>
657657
</dependency>
658+
<dependency>
659+
<groupId>commons-beanutils</groupId>
660+
<artifactId>commons-beanutils</artifactId>
661+
<scope>compile</scope>
662+
</dependency>
663+
<dependency>
664+
<groupId>org.apache.commons</groupId>
665+
<artifactId>commons-compress</artifactId>
666+
<scope>compile</scope>
667+
</dependency>
668+
<dependency>
669+
<groupId>commons-digester</groupId>
670+
<artifactId>commons-digester</artifactId>
671+
<scope>compile</scope>
672+
</dependency>
658673
<dependency>
659674
<groupId>commons-fileupload</groupId>
660675
<artifactId>commons-fileupload</artifactId>
661676
<scope>compile</scope>
662677
</dependency>
678+
<dependency>
679+
<groupId>commons-httpclient</groupId>
680+
<artifactId>commons-httpclient</artifactId>
681+
<scope>compile</scope>
682+
</dependency>
663683
<dependency>
664684
<groupId>commons-io</groupId>
665685
<artifactId>commons-io</artifactId>

‎entitybroker/rest/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@
6969
<artifactId>jetty-servlet-tester</artifactId>
7070
<scope>test</scope>
7171
</dependency>
72+
<dependency>
73+
<groupId>commons-httpclient</groupId>
74+
<artifactId>commons-httpclient</artifactId>
75+
<scope>test</scope>
76+
</dependency>
7277
</dependencies>
7378
<build>
7479
<resources>

‎entitybroker/utils/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<dependency>
6060
<groupId>commons-httpclient</groupId>
6161
<artifactId>commons-httpclient</artifactId>
62-
<version>3.1</version>
6362
</dependency>
6463
<dependency>
6564
<!--TODO Move to javax.servlet-api version of master-->

‎master/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<properties>
2323
<sakai.version>23-SNAPSHOT</sakai.version>
2424
<!-- Standard dependency versions -->
25+
<sakai.commons-httpclient.version>3.1</sakai.commons-httpclient.version>
2526
<sakai.commons-io.version>2.11.0</sakai.commons-io.version>
2627
<sakai.commons.lang.version>2.6</sakai.commons.lang.version>
2728
<sakai.commons.lang3.version>3.12.0</sakai.commons.lang3.version>
@@ -818,6 +819,12 @@
818819
<version>${sakai.commons.fileupload.version}</version>
819820
<scope>provided</scope>
820821
</dependency>
822+
<dependency>
823+
<groupId>commons-httpclient</groupId>
824+
<artifactId>commons-httpclient</artifactId>
825+
<version>${sakai.commons-httpclient.version}</version>
826+
<scope>provided</scope>
827+
</dependency>
821828
<dependency>
822829
<groupId>commons-io</groupId>
823830
<artifactId>commons-io</artifactId>
@@ -842,20 +849,29 @@
842849
<version>1.15</version>
843850
<scope>provided</scope>
844851
</dependency>
852+
<dependency>
853+
<groupId>org.apache.commons</groupId>
854+
<artifactId>commons-compress</artifactId>
855+
<version>1.21</version>
856+
<scope>provided</scope>
857+
</dependency>
845858
<dependency>
846859
<groupId>commons-beanutils</groupId>
847860
<artifactId>commons-beanutils</artifactId>
848861
<version>1.9.4</version>
862+
<scope>provided</scope>
849863
</dependency>
850864
<dependency>
851865
<groupId>commons-digester</groupId>
852866
<artifactId>commons-digester</artifactId>
853867
<version>2.1</version>
868+
<scope>provided</scope>
854869
</dependency>
855870
<dependency>
856871
<groupId>commons-validator</groupId>
857872
<artifactId>commons-validator</artifactId>
858873
<version>${sakai.commons-validator.version}</version>
874+
<scope>provided</scope>
859875
</dependency>
860876
<dependency>
861877
<groupId>commons-net</groupId>

‎pasystem/pasystem-impl/impl/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<dependency>
4545
<groupId>org.apache.commons</groupId>
4646
<artifactId>commons-lang3</artifactId>
47-
<scope>compile</scope>
4847
</dependency>
4948
<dependency>
5049
<groupId>org.sakaiproject.entitybroker</groupId>

‎pasystem/pasystem-tool/tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<dependency>
2727
<groupId>org.apache.commons</groupId>
2828
<artifactId>commons-lang3</artifactId>
29-
<scope>compile</scope>
3029
</dependency>
3130
<dependency>
3231
<groupId>commons-fileupload</groupId>

‎profile2/tool/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
<groupId>javax.servlet</groupId>
4949
<artifactId>javax.servlet-api</artifactId>
5050
</dependency>
51+
<dependency>
52+
<groupId>commons-codec</groupId>
53+
<artifactId>commons-codec</artifactId>
54+
</dependency>
5155
<dependency>
5256
<groupId>commons-io</groupId>
5357
<artifactId>commons-io</artifactId>

‎search/search-impl/impl/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
<dependency>
149149
<groupId>commons-httpclient</groupId>
150150
<artifactId>commons-httpclient</artifactId>
151-
<version>3.1</version>
152151
</dependency>
153152
<!--
154153
HSQL DB does not have clean transaction isolation

‎tags/tags-impl/impl/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<dependency>
4646
<groupId>org.apache.commons</groupId>
4747
<artifactId>commons-lang3</artifactId>
48-
<scope>compile</scope>
4948
</dependency>
5049
<dependency>
5150
<groupId>org.sakaiproject.entitybroker</groupId>

‎tags/tags-tool/tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<dependency>
2727
<groupId>org.apache.commons</groupId>
2828
<artifactId>commons-lang3</artifactId>
29-
<scope>compile</scope>
3029
</dependency>
3130
<dependency>
3231
<groupId>commons-fileupload</groupId>

‎user/user-tool-admin-prefs/admin-prefs/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<dependency>
4242
<groupId>commons-digester</groupId>
4343
<artifactId>commons-digester</artifactId>
44-
<version>1.6</version>
4544
</dependency>
4645
<dependency>
4746
<groupId>commons-collections</groupId>

‎user/user-tool-prefs/tool/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<dependency>
6565
<groupId>commons-digester</groupId>
6666
<artifactId>commons-digester</artifactId>
67-
<version>1.6</version>
6867
</dependency>
6968
<dependency>
7069
<groupId>commons-collections</groupId>

‎web/web-portlet/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<dependency>
3636
<groupId>commons-httpclient</groupId>
3737
<artifactId>commons-httpclient</artifactId>
38-
<version>3.1</version>
3938
</dependency>
4039
<!-- remove when KNL-1105 is handled -->
4140
<dependency>

‎webservices/cxf/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@
188188
<dependency>
189189
<groupId>org.apache.commons</groupId>
190190
<artifactId>commons-lang3</artifactId>
191-
<scope>compile</scope>
192191
</dependency>
193192
</dependencies>
194193

0 commit comments

Comments
 (0)