Skip to content

Commit f51f590

Browse files
pulasthi7pulasthi7
committed
Fixing poms as needed for IDENTITY-3730
1 parent cec68be commit f51f590

File tree

11 files changed

+124
-182
lines changed

11 files changed

+124
-182
lines changed

‎modules/.gitignore renamed to ‎.gitignore

File renamed without changes.

‎modules/balana-core/pom.xml

+32-41
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
* under the License.
1818
*/
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2122

2223
<modelVersion>4.0.0</modelVersion>
2324
<parent>
@@ -30,20 +31,19 @@
3031
<packaging>bundle</packaging>
3132
<name>WSO2 Balana Core</name>
3233
<description>
33-
This is the pom file that defines the build process for the WSO2 Balana Core. Balana is XACML
34-
open source project which is based on the sunxacml http://sunxacml.sourceforge.net/ under the license
35-
http://sunxacml.sourceforge.net/license.txt. But future development is released under Apache2 license
36-
http://www.apache.org/licenses/LICENSE-2.0
34+
This is the pom file that defines the build process for the WSO2 Balana Core. Balana is XACML
35+
open source project which is based on the sunxacml http://sunxacml.sourceforge.net/ under the license
36+
http://sunxacml.sourceforge.net/license.txt. But future development is released under Apache2 license
37+
http://www.apache.org/licenses/LICENSE-2.0
3738
</description>
3839
<url>http://wso2.org</url>
3940

4041
<dependencies>
4142
<dependency>
4243
<groupId>junit</groupId>
4344
<artifactId>junit</artifactId>
44-
<version>${junit.version}</version>
4545
<scope>test</scope>
46-
</dependency>
46+
</dependency>
4747
<dependency>
4848
<groupId>commons-logging</groupId>
4949
<artifactId>commons-logging</artifactId>
@@ -70,25 +70,25 @@
7070

7171
<build>
7272
<plugins>
73-
<plugin>
74-
<groupId>org.jvnet.maven.incrementalbuild</groupId>
75-
<artifactId>incremental-build-plugin</artifactId>
76-
<version>1.3</version>
77-
<executions>
78-
<execution>
79-
<goals>
80-
<goal>incremental-build</goal>
81-
</goals>
82-
</execution>
83-
</executions>
84-
</plugin>
73+
<plugin>
74+
<groupId>org.jvnet.maven.incrementalbuild</groupId>
75+
<artifactId>incremental-build-plugin</artifactId>
76+
<version>1.3</version>
77+
<executions>
78+
<execution>
79+
<goals>
80+
<goal>incremental-build</goal>
81+
</goals>
82+
</execution>
83+
</executions>
84+
</plugin>
8585
<plugin>
8686
<groupId>org.apache.maven.plugins</groupId>
8787
<artifactId>maven-compiler-plugin</artifactId>
88-
<version>2.0</version>
88+
<version>2.3.1</version>
8989
<configuration>
90-
<source>1.5</source>
91-
<target>1.5</target>
90+
<source>1.7</source>
91+
<target>1.7</target>
9292
</configuration>
9393
</plugin>
9494
<plugin>
@@ -99,14 +99,22 @@
9999
<configuration>
100100
<instructions>
101101
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
102-
<Bundle-Name>${pom.artifactId}</Bundle-Name>
102+
<Bundle-Name>${pom.artifactId}</Bundle-Name>
103103
<Export-Package>
104104
org.wso2.balana.*;version=${exp.pkg.version.balana}
105105
</Export-Package>
106106
<Import-Package>
107107
!javax.xml.namespace,
108108
javax.xml.namespace; version=${imp.pkg.version.javax.xml},
109-
*;resolution:=optional,
109+
javax.security.auth.x500,
110+
javax.xml.parsers; version="${imp.pkg.version.javax.xml.parsers}",
111+
javax.xml.transform; version="${imp.pkg.version.javax.xml}",
112+
javax.xml.transform.dom; version="${imp.pkg.version.javax.xml}",
113+
javax.xml.transform.stream; version="${imp.pkg.version.javax.xml}",
114+
javax.xml.xpath; version="${imp.pkg.version.javax.xml}",
115+
org.apache.commons.logging.*; version="${commons-logging.osgi.version.range}",
116+
org.w3c.dom,
117+
org.xml.sax
110118
</Import-Package>
111119
<DynamicImport-Package>*</DynamicImport-Package>
112120
</instructions>
@@ -123,21 +131,4 @@
123131
</plugin>
124132
</plugins>
125133
</build>
126-
127-
<repositories>
128-
<repository>
129-
<id>central</id>
130-
<name>Maven Repository Switchboard</name>
131-
<url>http://repo1.maven.org/maven2</url>
132-
</repository>
133-
</repositories>
134-
135-
<pluginRepositories>
136-
<pluginRepository>
137-
<id>repository.dev.java.net-maven2</id>
138-
<name>Java.net Repository for Maven</name>
139-
<url>http://download.java.net/maven/2/</url>
140-
<layout>default</layout>
141-
</pluginRepository>
142-
</pluginRepositories>
143134
</project>

‎modules/balana-distribution/pom.xml

+8-16
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,25 @@
1717
* under the License.
1818
*/
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2122

2223
<modelVersion>4.0.0</modelVersion>
2324
<parent>
2425
<groupId>org.wso2.balana</groupId>
2526
<artifactId>balana</artifactId>
26-
<version>1.0.3-SNAPSHOT</version>
27+
<version>1.0.3-SNAPSHOT</version>
2728
<relativePath>../../pom.xml</relativePath>
2829
</parent>
2930
<artifactId>balana-distribution</artifactId>
3031
<name>WSO2 Balana Distribution</name>
3132
<description>
32-
This is the pom file that defines the build process for the WSO2 Balana Distribution Pack. Balana is XACML
33-
open source project which is based on the sunxacml http://sunxacml.sourceforge.net/ under the license
34-
http://sunxacml.sourceforge.net/license.txt. But future development is released under Apache2 license
35-
http://www.apache.org/licenses/LICENSE-2.0
33+
This is the pom file that defines the build process for the WSO2 Balana Distribution Pack. Balana is XACML
34+
open source project which is based on the sunxacml http://sunxacml.sourceforge.net/ under the license
35+
http://sunxacml.sourceforge.net/license.txt. But future development is released under Apache2 license
36+
http://www.apache.org/licenses/LICENSE-2.0
3637
</description>
37-
<url>http://wso2.org</url>
38+
<url>http://wso2.org</url>
3839
<build>
3940
<plugins>
4041
<plugin>
@@ -56,13 +57,4 @@
5657
</plugin>
5758
</plugins>
5859
</build>
59-
60-
<pluginRepositories>
61-
<pluginRepository>
62-
<id>repository.dev.java.net-maven2</id>
63-
<name>Java.net Repository for Maven</name>
64-
<url>http://download.java.net/maven/2/</url>
65-
<layout>default</layout>
66-
</pluginRepository>
67-
</pluginRepositories>
6860
</project>

‎modules/balana-documentation/pom.xml

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,24 @@
1717
* under the License.
1818
*/
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2122

2223
<modelVersion>4.0.0</modelVersion>
2324
<parent>
2425
<groupId>org.wso2.balana</groupId>
2526
<artifactId>balana</artifactId>
26-
<version>1.0.3-SNAPSHOT</version>
27+
<version>1.0.3-SNAPSHOT</version>
2728
<relativePath>../../pom.xml</relativePath>
2829
</parent>
2930
<artifactId>balana-documentation</artifactId>
3031
<packaging>pom</packaging>
3132
<name>WSO2 Balana Documentation</name>
3233
<description>
33-
This is the pom file that defines the build process for the WSO2 Balana Samples. Balana is XACML
34-
open source project which is based on the sunxacml http://sunxacml.sourceforge.net/ under the license
35-
http://sunxacml.sourceforge.net/license.txt. But future development is released under Apache2 license
36-
http://www.apache.org/licenses/LICENSE-2.0
34+
This is the pom file that defines the build process for the WSO2 Balana Samples. Balana is XACML
35+
open source project which is based on the sunxacml http://sunxacml.sourceforge.net/ under the license
36+
http://sunxacml.sourceforge.net/license.txt. But future development is released under Apache2 license
37+
http://www.apache.org/licenses/LICENSE-2.0
3738
</description>
3839
<url>http://wso2.org</url>
3940

‎modules/balana-samples/custom-combining-algo/pom.xml

+3-28
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>
@@ -25,33 +26,7 @@
2526
<plugin>
2627
<groupId>org.apache.maven.plugins</groupId>
2728
<artifactId>maven-compiler-plugin</artifactId>
28-
<configuration>
29-
<source>1.6</source>
30-
<target>1.6</target>
31-
</configuration>
3229
</plugin>
33-
</plugins>
30+
</plugins>
3431
</build>
35-
36-
<repositories>
37-
<repository>
38-
<id>wso2-maven2-repository</id>
39-
<url>http://dist.wso2.org/maven2</url>
40-
</repository>
41-
</repositories>
42-
43-
<pluginRepositories>
44-
<pluginRepository>
45-
<id>tlc</id>
46-
<name>TLC Repository</name>
47-
48-
<url>http://commons.ucalgary.ca/pub/m2</url>
49-
</pluginRepository>
50-
51-
<pluginRepository>
52-
<id>wso2-maven2-repository</id>
53-
<url>http://dist.wso2.org/maven2</url>
54-
</pluginRepository>
55-
</pluginRepositories>
56-
5732
</project>

‎modules/balana-samples/hierarchical-resource/pom.xml

-26
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,7 @@
2525
<plugin>
2626
<groupId>org.apache.maven.plugins</groupId>
2727
<artifactId>maven-compiler-plugin</artifactId>
28-
<configuration>
29-
<source>1.6</source>
30-
<target>1.6</target>
31-
</configuration>
3228
</plugin>
3329
</plugins>
3430
</build>
35-
36-
<repositories>
37-
<repository>
38-
<id>wso2-maven2-repository</id>
39-
<url>http://dist.wso2.org/maven2</url>
40-
</repository>
41-
</repositories>
42-
43-
<pluginRepositories>
44-
<pluginRepository>
45-
<id>tlc</id>
46-
<name>TLC Repository</name>
47-
48-
<url>http://commons.ucalgary.ca/pub/m2</url>
49-
</pluginRepository>
50-
51-
<pluginRepository>
52-
<id>wso2-maven2-repository</id>
53-
<url>http://dist.wso2.org/maven2</url>
54-
</pluginRepository>
55-
</pluginRepositories>
56-
5731
</project>

‎modules/balana-samples/kmarket-trading-sample/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
<plugin>
2727
<groupId>org.apache.maven.plugins</groupId>
2828
<artifactId>maven-compiler-plugin</artifactId>
29-
<configuration>
30-
<source>1.6</source>
31-
<target>1.6</target>
32-
</configuration>
3329
</plugin>
3430
</plugins>
3531
</build>

‎modules/balana-samples/pom.xml

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
* under the License.
1818
*/
1919
-->
20-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2122

2223
<parent>
2324
<groupId>org.wso2.balana</groupId>
@@ -31,17 +32,17 @@
3132
<packaging>pom</packaging>
3233
<name>WSO2 Balana Samples</name>
3334
<description>
34-
This is the pom file that defines the build process for the WSO2 Balana Samples. Balana is XACML
35-
open source project which is based on the sunxacml http://sunxacml.sourceforge.net/ under the license
36-
http://sunxacml.sourceforge.net/license.txt. But future development is released under Apache2 license
37-
http://www.apache.org/licenses/LICENSE-2.0
35+
This is the pom file that defines the build process for the WSO2 Balana Samples. Balana is XACML
36+
open source project which is based on the sunxacml http://sunxacml.sourceforge.net/ under the license
37+
http://sunxacml.sourceforge.net/license.txt. But future development is released under Apache2 license
38+
http://www.apache.org/licenses/LICENSE-2.0
3839
</description>
3940
<url>http://wso2.org</url>
4041

4142
<modules>
4243
<module>kmarket-trading-sample</module>
4344
<module>web-page-image-filtering</module>
4445
<module>custom-combining-algo</module>
45-
<module>hierarchical-resource</module>
46+
<module>hierarchical-resource</module>
4647
</modules>
4748
</project>

‎modules/balana-samples/web-page-image-filtering/pom.xml

+3-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>
@@ -25,33 +26,8 @@
2526
<plugin>
2627
<groupId>org.apache.maven.plugins</groupId>
2728
<artifactId>maven-compiler-plugin</artifactId>
28-
<configuration>
29-
<source>1.6</source>
30-
<target>1.6</target>
31-
</configuration>
3229
</plugin>
33-
</plugins>
30+
</plugins>
3431
</build>
3532

36-
<repositories>
37-
<repository>
38-
<id>wso2-maven2-repository</id>
39-
<url>http://dist.wso2.org/maven2</url>
40-
</repository>
41-
</repositories>
42-
43-
<pluginRepositories>
44-
<pluginRepository>
45-
<id>tlc</id>
46-
<name>TLC Repository</name>
47-
48-
<url>http://commons.ucalgary.ca/pub/m2</url>
49-
</pluginRepository>
50-
51-
<pluginRepository>
52-
<id>wso2-maven2-repository</id>
53-
<url>http://dist.wso2.org/maven2</url>
54-
</pluginRepository>
55-
</pluginRepositories>
56-
5733
</project>

0 commit comments

Comments
 (0)