Merge branch 'ISA-1.18-action' into moa-2.1-Snapshot

Conflicts:
	id/server/idserverlib/pom.xml

8 files changed, 234 insertions, 0 deletions

diff --git a/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar
new file mode 100644
index 000000000..c045d89a3
--- /dev/null
+++ b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar
diff --git a/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.pom b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.pom
new file mode 100644
index 000000000..959b311cd
--- /dev/null
+++ b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.pom
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.util</groupId>
+	<artifactId>egovutils</artifactId>
+	<version>2.0.0</version>
+	<name>zuseutil</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<cxf.version>3.0.1</cxf.version>
+	</properties>
+	
+	<build>
+	    <plugins>
+	        <plugin>
+              <groupId>org.owasp</groupId>
+              <artifactId>dependency-check-maven</artifactId>
+              <version>1.2.5</version>
+              <executions>
+                  <execution>
+                  	<phase>verify</phase>
+                    <goals>
+                    	<goal>check</goal>
+                    </goals>
+                  </execution>
+              </executions>
+            </plugin>            
+           	<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>            
+	    </plugins>
+	</build>	
+	
+	
+	<dependencies>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.1</version>
+		</dependency>
+<!-- 		<dependency>
+			<groupId>com.sun</groupId>
+			<artifactId>webservices-tools</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun</groupId>
+			<artifactId>webservices-rt</artifactId>
+			<version>2.0.1</version>
+		</dependency> -->
+<!-- 		<dependency>
+			<groupId>org.glassfish.metro</groupId>
+			<artifactId>webservices-rt</artifactId>
+			<version>2.3</version>
+		</dependency> -->
+		
+		<!-- Apache  CXF libs-->
+    	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-frontend-jaxws</artifactId>
+        	<version>${cxf.version}</version>
+    	</dependency>
+    	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-transports-http</artifactId>
+        	<version>${cxf.version}</version>
+    	</dependency>
+        	<!-- Jetty is needed if you're are not using the CXFServlet -->
+<!--     	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-transports-http-jetty</artifactId>
+        	<version>${cxf.version}</version>
+    	</dependency> -->		
+		
+				
+		<dependency>
+			<groupId>commons-validator</groupId>
+			<artifactId>commons-validator</artifactId>
+			<version>1.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.2</version>
+		</dependency>		
+		<dependency>
+			<groupId>bouncycastle</groupId>
+			<artifactId>bcprov-jdk16</artifactId>
+			<version>140</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.7</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.9</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+<!-- 		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency> -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.3.5</version>
+		</dependency>
+		
+	</dependencies>
+	
+</project>
diff --git a/repository/xalan-bin-dist/serializer/2.7.2/serializer-2.7.2.jar b/repository/xalan-bin-dist/serializer/2.7.2/serializer-2.7.2.jar
new file mode 100644
index 000000000..10c881c10
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/2.7.2/serializer-2.7.2.jar
diff --git a/repository/xalan-bin-dist/serializer/2.7.2/serializer-2.7.2.pom b/repository/xalan-bin-dist/serializer/2.7.2/serializer-2.7.2.pom
new file mode 100644
index 000000000..677fc1ae0
--- /dev/null
+++ b/repository/xalan-bin-dist/serializer/2.7.2/serializer-2.7.2.pom
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>4</version>
+  </parent>
+
+  <groupId>xalan</groupId>
+  <artifactId>serializer</artifactId>
+  <version>2.7.2</version>
+
+  <name>Xalan Java Serializer</name>
+  <description>
+    Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input
+    SAX events.
+  </description>
+  <url>http://xml.apache.org/xalan-j/</url>
+
+  <dependencies>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.3.04</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.9.1</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/repository/xalan-bin-dist/xalan/2.7.2/xalan-2.7.2.jar b/repository/xalan-bin-dist/xalan/2.7.2/xalan-2.7.2.jar
new file mode 100644
index 000000000..abdabe33e
--- /dev/null
+++ b/repository/xalan-bin-dist/xalan/2.7.2/xalan-2.7.2.jar
diff --git a/repository/xalan-bin-dist/xalan/2.7.2/xalan-2.7.2.pom b/repository/xalan-bin-dist/xalan/2.7.2/xalan-2.7.2.pom
new file mode 100644
index 000000000..758958d11
--- /dev/null
+++ b/repository/xalan-bin-dist/xalan/2.7.2/xalan-2.7.2.pom
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>4</version>
+  </parent>
+
+  <groupId>xalan</groupId>
+  <artifactId>xalan</artifactId>
+  <version>2.7.2</version>
+
+  <name>Xalan Java</name>
+  <description>
+    Xalan-Java is an XSLT processor for transforming XML documents into HTML,
+    text, or other XML document types. It implements XSL Transformations (XSLT)
+    Version 1.0 and XML Path Language (XPath) Version 1.0 and can be used from
+    the command line, in an applet or a servlet, or as a module in other program.
+  </description>
+  <url>http://xml.apache.org/xalan-j/</url>  
+
+  <dependencies>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>serializer</artifactId>
+      <version>2.7.2</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.9.1</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.jar b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.jar
new file mode 100644
index 000000000..530ea6fc5
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.jar
diff --git a/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.pom b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.pom
new file mode 100644
index 000000000..35b51d5fa
--- /dev/null
+++ b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>xerces-J</groupId>
+  <artifactId>xml-apis</artifactId>
+  <version>2.11.0</version>
+  <description>Artifactory auto generated POM</description>
+</project>
\ No newline at end of file