Remove additional logs.

wso2 · Aug 20, 2019 · e382854 · e382854
1 parent 27c824e
commit e382854
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,4 @@ cache:
   directories:
   - .autoconf
   - $HOME/.m2
-script: mvn clean install -q -B -V | grep -v DEBUG; test ${PIPESTATUS[0]} -eq 0;
+script:  mvn clean install
diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml
@@ -43,7 +43,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.wso2.carbon.identity.template.mgt.ui.*,
+                            org.wso2.carbon.identity.template.mgt.ui.*; version="${carbon.identity.package.export.version}",
                         </Export-Package>
                         <Import-Package>
                             javax.servlet.http,

diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml
@@ -42,7 +42,7 @@
                         <private-package>org.wso2.carbon.identity.template.mgt.internal</private-package>
                         <Export-Package>
                             !org.wso2.carbon.identity.template.mgt.internal,
-                            org.wso2.carbon.identity.template.mgt.*
+                            org.wso2.carbon.identity.template.mgt.*; version="${carbon.identity.package.export.version}",
                         </Export-Package>
                         <Import-Package>
                             org.osgi.framework; version="${osgi.framework.imp.pkg.version.range}",

diff --git a/pom.xml b/pom.xml
@@ -1976,6 +1976,7 @@
                         <configuration>
                             <!--This parameter disables doclint-->
                             <doclint>none</doclint>
+                            <quiet>true</quiet>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml
@@ -46,11 +46,14 @@
                         </goals>
                         <configuration>
                             <tasks>
+                                <path id="wsdl2java.classpath">
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.version}/axis2-client-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
+                                </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/DirectoryServerManager.wsdl -u -uw -p org.wso2.carbon.directory.server.manager.stub -o target/generated-code -ns2p http://common.manager.server.directory.carbon.wso2.org/xsd=org.wso2.carbon.directory.common.stub.types,http://manager.server.directory.carbon.wso2.org=org.wso2.carbon.directory.server.stub.types.carbon,http://org.apache.axis2/xsd=org.wso2.carbon.server.admin.stub.types.axis2" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

diff --git a/...stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml b/...stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml
@@ -53,9 +53,6 @@
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/ConditionalAuthenticationMgtService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.application.authentication.framework.stub -ns2p http://services.framework.authentication.application.identity.carbon.wso2.org=org.wso2.carbon.identity.application.authentication.framework.stub,http://dto.services.framework.authentication.application.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.application.authentication.framework.stub.dto,http://org.apache.axis2/xsd=org.wso2.carbon.identity.application.authentication.framework.stub.types.axis2" />
                                     <classpath refid="wsdl2java.classpath" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml
@@ -54,16 +54,10 @@
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/IdentityApplicationManagementService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.application.mgt.stub -ns2p http://application.mgt.identity.carbon.wso2.org=org.wso2.carbon.identity.application.mgt.stub,http://dto.application.mgt.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.application.mgt.stub.dto,http://entitlement.application.mgt.carbon.wso2.org/xsd=org.wso2.carbon.identity.application.mgt.stub.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.application.mgt.stub.types.axis2" />
                                     <classpath refid="wsdl2java.classpath" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/IdentityDefaultSeqManagementService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.application.mgt.defaultsequence.stub -ns2p http://application.mgt.defaultsequence.identity.carbon.wso2.org=org.wso2.carbon.identity.application.mgt.defaultsequence.stub,http://dto.application.mgt.defaultsequence.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.application.mgt.defaultsequence.stub.dto,http://entitlement.application.mgt.carbon.wso2.org/xsd=org.wso2.carbon.identity.application.mgt.defaultsequence.stub.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.application.mgt.defaultsequence.stub.types.axis2" />
                                     <classpath refid="wsdl2java.classpath" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

diff --git a/service-stubs/identity/org.wso2.carbon.identity.authenticator.token.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.authenticator.token.stub/pom.xml
@@ -46,11 +46,14 @@
                         </goals>
                         <configuration>
                             <tasks>
+                                <path id="wsdl2java.classpath">
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.version}/axis2-client-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
+                                </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/AuthenticationAdminService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.authenticator.token.stub.types -ns2p http://token.authenticator.identity.carbon.wso2.org=org.wso2.carbon.identity.authenticator.token.stub.types,http://common.core.carbon.wso2.org/xsd=org.wso2.carbon.identity.authenticator.token.stub.xsd" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

diff --git a/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml
@@ -46,23 +46,22 @@
                         </goals>
                         <configuration>
                             <tasks>
+                                <path id="wsdl2java.classpath">
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.version}/axis2-client-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
+                                </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/EntitlementPolicyAdminService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.entitlement.stub -ns2p http://entitlement.identity.carbon.wso2.org=org.wso2.carbon.identity.entitlement.stub,http://dto.entitlement.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.entitlement.stub.dto,http://entitlement.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.entitlement.stub.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.entitlement.stub.types.axis2" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/EntitlementService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.entitlement.stub -ns2p http://entitlement.identity.carbon.wso2.org=org.wso2.carbon.identity.entitlement.stub,http://dto.entitlement.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.entitlement.stub.dto,http://entitlement.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.entitlement.stub.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.entitlement.stub.types.axis2" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/EntitlementAdminService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.entitlement.stub -ns2p http://entitlement.identity.carbon.wso2.org=org.wso2.carbon.identity.entitlement.stub,http://dto.entitlement.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.entitlement.stub.dto,http://entitlement.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.entitlement.stub.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.entitlement.stub.types.axis2" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml
@@ -46,11 +46,15 @@
                         </goals>
                         <configuration>
                             <tasks>
+                                <path id="wsdl2java.classpath">
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.version}/axis2-client-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/UserProfileMgt.wsdl -u -uw -g -o target/generated-code -p org.wso2.carbon.identity.user.profile.stub -ns2p http://mgt.profile.user.identity.carbon.wso2.org=org.wso2.carbon.identity.user.profile.stub,http://dto.mgt.profile.user.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.user.profile.stub.dto,http://mgt.profile.user.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.user.profile.stub.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.user.profile.stub.types.axis2" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml
@@ -46,11 +46,14 @@
                         </goals>
                         <configuration>
                             <tasks>
+                                <path id="wsdl2java.classpath">
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.version}/axis2-client-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
+                                </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/UserRegistrationAdminService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.user.registration.stub -ns2p http://registration.user.identity.carbon.wso2.org=org.wso2.carbon.identity.user.registration.stub,http://dto.registration.user.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.user.registration.stub.dto,http://registration.user.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.user.registration.stub.types,http://org.apache.axis2/xsd=org.wso2.carbon.identity.user.registration.stub.types.axis2" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                             </tasks>
                         </configuration>

diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml
@@ -47,16 +47,14 @@
                         </goals>
                         <configuration>
                             <tasks>
-				<path id="wsdl2java.classpath">
-                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${orbit.version.axiom}/axiom-${orbit.version.axiom}.jar" />
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${orbit.version.axis2}/axis2-client-${orbit.version.axis2}.jar" />
-                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${orbit.version.axis2}/axis2-${orbit.version.axis2}.jar" />
+                                <path id="wsdl2java.classpath">
+                                    <pathelement location="${settings.localRepository}/org/apache/ws/commons/axiom/wso2/axiom/${axiom.wso2.version}/axiom-${axiom.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2-client/${axis2.wso2.version}/axis2-client-${axis2.wso2.version}.jar" />
+                                    <pathelement location="${settings.localRepository}/org/apache/axis2/wso2/axis2/${axis2.wso2.version}/axis2-${axis2.wso2.version}.jar" />
                                 </path>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/UserStoreConfigAdminService.wsdl -u -uw -o target/generated-code -p org.wso2.carbon.identity.user.store.configuration.stub -ns2p http://utils.configuration.store.user.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.user.store.configuration.stub.utils,http://api.user.carbon.wso2.org/xsd=org.wso2.carbon.identity.user.store.configuration.stub.api,http://dto.configuration.store.user.identity.carbon.wso2.org/xsd=org.wso2.carbon.identity.user.store.configuration.stub.dto,http://org.apache.axis2/xsd=org.wso2.carbon.identity.user.store.configuration.stub.exception" />
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath refid="wsdl2java.classpath" />
                                 </java>
                             </tasks>
                         </configuration>