diff options
| -rw-r--r-- | common/moa-common.iml | 5 | ||||
| -rw-r--r-- | common/pom.xml | 234 | ||||
| -rw-r--r-- | id/ConfigWebTool/ConfigurationInterface.iml | 10 | ||||
| -rw-r--r-- | id/pom.xml | 32 | ||||
| -rw-r--r-- | id/server/auth/moa-id-auth.iml | 10 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 28 | ||||
| -rw-r--r-- | id/server/moa-id-commons/moa-id-commons.iml | 5 | ||||
| -rw-r--r-- | id/server/moa-id.iml | 4 | ||||
| -rw-r--r-- | id/server/proxy/moa-id-proxy.iml | 10 | ||||
| -rw-r--r-- | id/templates/moa-id-templates.iml | 4 | ||||
| -rw-r--r-- | spss/handbook/clients/api/moa-spss-handbook-apiClient.iml | 5 | ||||
| -rw-r--r-- | spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml | 5 | ||||
| -rw-r--r-- | spss/server/serverlib/moa-spss-lib.iml | 5 | ||||
| -rw-r--r-- | spss/server/serverws/moa-spss-ws.iml | 5 | 
14 files changed, 252 insertions, 110 deletions
| diff --git a/common/moa-common.iml b/common/moa-common.iml index 9d4261fc6..46304fcc3 100644 --- a/common/moa-common.iml +++ b/common/moa-common.iml @@ -24,6 +24,11 @@      <orderEntry type="library" name="Maven: xalan-bin-dist:xml-apis:2.7.1" level="project" />      <orderEntry type="library" scope="RUNTIME" name="Maven: xalan-bin-dist:serializer:2.7.1" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />    </component>  </module> diff --git a/common/pom.xml b/common/pom.xml index 468ecaf2d..46f26501f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,94 +1,148 @@ -<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"> -  <parent> -    <groupId>MOA</groupId> -    <artifactId>MOA</artifactId> -    <version>2.0.0</version> -  </parent> -  <modelVersion>4.0.0</modelVersion> -  <artifactId>moa-common</artifactId> -  <!-- <version>2.0.0</version> --> -  <packaging>jar</packaging> -  <name>MOA common library</name> +<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"> +    <parent> +        <groupId>MOA</groupId> +        <artifactId>MOA</artifactId> +        <version>2.0.0</version> +    </parent> +    <modelVersion>4.0.0</modelVersion> +    <artifactId>moa-common</artifactId> +    <!-- <version>2.0.0</version> --> +    <packaging>jar</packaging> +    <name>MOA common library</name> -  <properties> -    <repositoryPath>${basedir}/../repository</repositoryPath> -  </properties> +    <properties> +        <repositoryPath>${basedir}/../repository</repositoryPath> +    </properties> + +    <dependencies> +        <dependency> +            <groupId>commons-logging</groupId> +            <artifactId>commons-logging</artifactId> +        </dependency> +        <dependency> +            <groupId>iaik.prod</groupId> +            <artifactId>iaik_jce_full</artifactId> +        </dependency> +        <dependency> +            <groupId>iaik.prod</groupId> +            <artifactId>iaik_moa</artifactId> +        </dependency> +        <dependency> +            <groupId>junit</groupId> +            <artifactId>junit</artifactId> +            <scope>test</scope> +        </dependency> +        <dependency> +            <groupId>jaxen</groupId> +            <artifactId>jaxen</artifactId> +        </dependency> +        <dependency> +            <groupId>saxpath</groupId> +            <artifactId>saxpath</artifactId> +        </dependency> +        <dependency> +            <groupId>xalan-bin-dist</groupId> +            <artifactId>xalan</artifactId> +            <scope>compile</scope> +            <optional>true</optional> +        </dependency> +        <dependency> +            <groupId>xerces</groupId> +            <artifactId>xercesImpl</artifactId> +            <optional>true</optional> +        </dependency> +        <dependency> +            <groupId>xalan-bin-dist</groupId> +            <artifactId>xml-apis</artifactId> +            <scope>compile</scope> +            <optional>true</optional> +        </dependency> +        <dependency> +            <groupId>xalan-bin-dist</groupId> +            <artifactId>serializer</artifactId> +            <scope>runtime</scope> +            <optional>true</optional> +        </dependency> +        <dependency> +            <groupId>joda-time</groupId> +            <artifactId>joda-time</artifactId> +            <version>1.6.2</version> +        </dependency> +        <dependency> +            <groupId>org.slf4j</groupId> +            <artifactId>slf4j-api</artifactId> +            <version>1.7.5</version> +        </dependency> +        <dependency> +            <groupId>org.slf4j</groupId> +            <artifactId>slf4j-simple</artifactId> +            <version>1.7.5</version> +        </dependency> +        <dependency> +            <groupId>org.slf4j</groupId> +            <artifactId>jcl-over-slf4j</artifactId> +            <version>1.7.5</version> +        </dependency> +        <dependency> +            <groupId>org.slf4j</groupId> +            <artifactId>log4j-over-slf4j</artifactId> +            <version>1.7.5</version> +        </dependency> +        <dependency> +            <groupId>org.slf4j</groupId> +            <artifactId>jul-to-slf4j</artifactId> +            <version>1.7.5</version> +        </dependency> +    </dependencies> + +    <build> +        <plugins> +            <plugin> +                <groupId>org.apache.maven.plugins</groupId> +                <artifactId>maven-jar-plugin</artifactId> +                <configuration> +                    <archive> +                        <addMavenDescriptor>false</addMavenDescriptor> +                    </archive> +                </configuration> +                <executions> +                    <execution> +                        <goals> +                            <goal>test-jar</goal> +                        </goals> +                    </execution> +                </executions> +            </plugin> +            <plugin> +                <artifactId>maven-enforcer-plugin</artifactId> +                <version>1.1.1</version> +                <executions> +                    <execution> +                        <id>enforce-banned-dependencies</id> +                        <goals> +                            <goal>enforce</goal> +                        </goals> +                        <configuration> +                            <rules> +                                <bannedDependencies> +                                    <searchTransitive>true</searchTransitive> +                                    <excludes> +                                        <!-- <exclude>commons-logging</exclude> --> +                                        <exclude>org.slf4j:1.5*</exclude> +                                        <exclude>org.slf4j:1.6*</exclude> +                                        <!--   <exclude>org.springframework:2.*</exclude> +                                           <exclude>org.springframework:3.0.*</exclude>     --> +                                    </excludes> +                                </bannedDependencies> +                            </rules> +                            <fail>true</fail> +                        </configuration> +                    </execution> +                </executions> +            </plugin> +        </plugins> +    </build> -  <dependencies> -    <dependency> -      <groupId>commons-logging</groupId> -      <artifactId>commons-logging</artifactId> -    </dependency> -    <dependency> -      <groupId>iaik.prod</groupId> -      <artifactId>iaik_jce_full</artifactId> -    </dependency> -    <dependency> -      <groupId>iaik.prod</groupId> -      <artifactId>iaik_moa</artifactId> -    </dependency> -    <dependency> -      <groupId>junit</groupId> -      <artifactId>junit</artifactId> -      <scope>test</scope> -    </dependency> -    <dependency> -      <groupId>jaxen</groupId> -      <artifactId>jaxen</artifactId> -    </dependency> -    <dependency> -      <groupId>saxpath</groupId> -      <artifactId>saxpath</artifactId> -    </dependency> -    <dependency> -      <groupId>xalan-bin-dist</groupId> -      <artifactId>xalan</artifactId> -      <scope>compile</scope> -      <optional>true</optional> -    </dependency> -    <dependency> -      <groupId>xerces</groupId> -      <artifactId>xercesImpl</artifactId> -      <optional>true</optional> -    </dependency> -    <dependency> -      <groupId>xalan-bin-dist</groupId> -      <artifactId>xml-apis</artifactId> -      <scope>compile</scope> -      <optional>true</optional> -    </dependency> -    <dependency> -      <groupId>xalan-bin-dist</groupId> -      <artifactId>serializer</artifactId> -      <scope>runtime</scope> -      <optional>true</optional> -    </dependency> -    <dependency> -    	  <groupId>joda-time</groupId> -	      <artifactId>joda-time</artifactId> -	      <version>1.6.2</version> -    	</dependency>    -    	 -  </dependencies> -  <build> -    <plugins> -      <plugin> -        <groupId>org.apache.maven.plugins</groupId> -        <artifactId>maven-jar-plugin</artifactId> -        <configuration> -          <archive> -            <addMavenDescriptor>false</addMavenDescriptor> -          </archive> -        </configuration> -        <executions> -          <execution> -            <goals> -              <goal>test-jar</goal> -            </goals> -          </execution> -        </executions> -      </plugin> -    </plugins> -  </build>      </project> diff --git a/id/ConfigWebTool/ConfigurationInterface.iml b/id/ConfigWebTool/ConfigurationInterface.iml index 43790145b..742f8df89 100644 --- a/id/ConfigWebTool/ConfigurationInterface.iml +++ b/id/ConfigWebTool/ConfigurationInterface.iml @@ -58,6 +58,11 @@      <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:2.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="library" name="Maven: org.jvnet.hyperjaxb3:hyperjaxb3-ejb-runtime:0.5.6" level="project" />      <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />      <orderEntry type="library" name="Maven: org.jvnet.jaxb2_commons:jaxb2-basics-runtime:0.6.2" level="project" /> @@ -119,11 +124,6 @@      <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />      <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.0.1" level="project" />      <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="library" name="Maven: eu.stork:oasis-dss-api:1.0.0-SNAPSHOT" level="project" />      <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />      <orderEntry type="module" module-name="moa-spss-lib" /> diff --git a/id/pom.xml b/id/pom.xml index db4ee137e..bd3344638 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -24,4 +24,36 @@          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>      </properties> +    <build> +        <plugins> +            <plugin> +                <artifactId>maven-enforcer-plugin</artifactId> +                <version>1.1.1</version> +                <executions> +                    <execution> +                        <id>enforce-banned-dependencies</id> +                        <goals> +                            <goal>enforce</goal> +                        </goals> +                        <configuration> +                            <rules> +                                <bannedDependencies> +                                    <searchTransitive>true</searchTransitive> +                                    <excludes> +                                        <!-- <exclude>commons-logging</exclude> --> +                                        <exclude>org.slf4j:1.5*</exclude> +                                        <exclude>org.slf4j:1.6*</exclude> +                                        <!--   <exclude>org.springframework:2.*</exclude> +                                           <exclude>org.springframework:3.0.*</exclude>     --> +                                    </excludes> +                                </bannedDependencies> +                            </rules> +                            <fail>true</fail> +                        </configuration> +                    </execution> +                </executions> +            </plugin> +        </plugins> +    </build> +  </project> diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index b8b4208b8..043374bc0 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -53,6 +53,11 @@      <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />      <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />      <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" /> @@ -91,11 +96,6 @@      <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />      <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.0.1" level="project" />      <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />      <orderEntry type="library" name="Maven: eu.stork:oasis-dss-api:1.0.0-SNAPSHOT" level="project" />      <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" /> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index cca543a26..82a42cb8c 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -151,7 +151,33 @@              <!-- should be in the ext directory of the jre -->
              <scope>provided</scope>
          </dependency>
 -		
 +
 +
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>slf4j-api</artifactId>
 +            <version>1.7.5</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>slf4j-simple</artifactId>
 +            <version>1.7.5</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>jcl-over-slf4j</artifactId>
 +            <version>1.7.5</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>log4j-over-slf4j</artifactId>
 +            <version>1.7.5</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>jul-to-slf4j</artifactId>
 +            <version>1.7.5</version>
 +        </dependency>
  		<dependency>
  			<groupId>junit</groupId>
 diff --git a/id/server/moa-id-commons/moa-id-commons.iml b/id/server/moa-id-commons/moa-id-commons.iml index 8ded8b94a..ef994abd3 100644 --- a/id/server/moa-id-commons/moa-id-commons.iml +++ b/id/server/moa-id-commons/moa-id-commons.iml @@ -56,6 +56,11 @@      <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="library" name="Maven: org.jvnet.hyperjaxb3:hyperjaxb3-ejb-runtime:0.5.6" level="project" />      <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.2" level="project" />      <orderEntry type="library" name="Maven: org.jvnet.jaxb2_commons:jaxb2-basics-runtime:0.6.2" level="project" /> diff --git a/id/server/moa-id.iml b/id/server/moa-id.iml index 567359474..c418d6693 100644 --- a/id/server/moa-id.iml +++ b/id/server/moa-id.iml @@ -1,8 +1,8 @@  <?xml version="1.0" encoding="UTF-8"?>  <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">    <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> -    <output url="file://$MODULE_DIR$/../target/classes" /> -    <output-test url="file://$MODULE_DIR$/../target/test-classes" /> +    <output url="file://$MODULE_DIR$/target/classes" /> +    <output-test url="file://$MODULE_DIR$/target/test-classes" />      <content url="file://$MODULE_DIR$">        <excludeFolder url="file://$MODULE_DIR$/target" />      </content> diff --git a/id/server/proxy/moa-id-proxy.iml b/id/server/proxy/moa-id-proxy.iml index 936460e23..e61d841ce 100644 --- a/id/server/proxy/moa-id-proxy.iml +++ b/id/server/proxy/moa-id-proxy.iml @@ -50,6 +50,11 @@      <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />      <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />      <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" /> @@ -88,11 +93,6 @@      <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />      <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.0.1" level="project" />      <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> -    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />      <orderEntry type="library" name="Maven: eu.stork:oasis-dss-api:1.0.0-SNAPSHOT" level="project" />      <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" /> diff --git a/id/templates/moa-id-templates.iml b/id/templates/moa-id-templates.iml index 0ecf962d0..3b8b05541 100644 --- a/id/templates/moa-id-templates.iml +++ b/id/templates/moa-id-templates.iml @@ -13,8 +13,8 @@      </facet>    </component>    <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> -    <output url="file://$MODULE_DIR$/../target/classes" /> -    <output-test url="file://$MODULE_DIR$/../target/test-classes" /> +    <output url="file://$MODULE_DIR$/target/classes" /> +    <output-test url="file://$MODULE_DIR$/target/test-classes" />      <content url="file://$MODULE_DIR$">        <excludeFolder url="file://$MODULE_DIR$/target" />      </content> diff --git a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml index 26b212283..6ed837a51 100644 --- a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml +++ b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml @@ -38,6 +38,11 @@      <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="module" module-name="moa-spss-lib" />      <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />      <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" /> diff --git a/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml b/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml index 26b212283..6ed837a51 100644 --- a/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml +++ b/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml @@ -38,6 +38,11 @@      <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="module" module-name="moa-spss-lib" />      <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />      <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" /> diff --git a/spss/server/serverlib/moa-spss-lib.iml b/spss/server/serverlib/moa-spss-lib.iml index 11dc743a9..4c0128bf3 100644 --- a/spss/server/serverlib/moa-spss-lib.iml +++ b/spss/server/serverlib/moa-spss-lib.iml @@ -84,6 +84,11 @@      <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="module" module-name="moa-common" scope="TEST" production-on-test="" />      <orderEntry type="module" module-name="moa-spss-tools" scope="TEST" />      <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" /> diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml index 45ebf8969..ae8f03a70 100644 --- a/spss/server/serverws/moa-spss-ws.iml +++ b/spss/server/serverws/moa-spss-ws.iml @@ -51,6 +51,11 @@      <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />      <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> +    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />      <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />      <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />      <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" /> | 
