diff options
| -rw-r--r-- | BKULocal/pom.xml | 3 | ||||
| -rw-r--r-- | BKUWebStart/pom.xml | 34 | ||||
| -rw-r--r-- | STALService/pom.xml | 17 | ||||
| -rw-r--r-- | bkucommon/pom.xml | 17 | ||||
| -rw-r--r-- | pom.xml | 63 | ||||
| -rw-r--r-- | utils/pom.xml | 29 |
6 files changed, 134 insertions, 29 deletions
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index 12dceaf8..223bc357 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -185,8 +185,7 @@ <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
+ </dependency>
</dependencies>
<profiles>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index c4d04390..fb8f0c2f 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -76,8 +76,8 @@ </plugin>
<plugin>
- <artifactId>webstart-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
@@ -86,8 +86,21 @@ </goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-pack200-impl</artifactId>
+ <version>1.0-beta-6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>keytool-api-1.7</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
<configuration>
<excludeTransitive>false</excludeTransitive>
+ <pack200><enabled>false</enabled></pack200>
<jnlp>
<inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
<inputTemplate>template-unstable.xml</inputTemplate>
@@ -105,7 +118,6 @@ <gen>false</gen>
</keystoreConfig>
</sign>
- <pack200>false</pack200>
<gzip>false</gzip>
<outputJarVersions>false</outputJarVersions>
<unsignAlreadySignedJars>true</unsignAlreadySignedJars>
@@ -123,9 +135,10 @@ <build>
<plugins>
<plugin>
- <artifactId>webstart-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
<configuration>
+ <pack200><enabled>false</enabled></pack200>
<jnlp>
<inputTemplate>template-local.xml</inputTemplate>
<outputFile>mocca-local.jnlp</outputFile>
@@ -173,7 +186,7 @@ <gen>false</gen>
</keystoreConfig>
</sign>
- <pack200>false</pack200>
+ <pack200><enabled>false</enabled></pack200>
<gzip>false</gzip>
<outputJarVersions>false</outputJarVersions>
<unsignAlreadySignedJars>true</unsignAlreadySignedJars>
@@ -189,10 +202,10 @@ <build>
<plugins>
<plugin>
- <artifactId>webstart-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo.webstart</groupId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
<!-- use pkcs11-patched webstart-maven-plugin-->
- <version>1.0-beta-1-mocca</version>
+ <!-- <version>1.0-beta-1-mocca</version> -->
<executions>
<execution>
<phase>package</phase>
@@ -202,6 +215,7 @@ </execution>
</executions>
<configuration>
+ <pack200><enabled>false</enabled></pack200>
<excludeTransitive>false</excludeTransitive>
<jnlp>
<inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
@@ -220,7 +234,7 @@ <gen>false</gen>
</keystoreConfig>
</sign>
- <pack200>false</pack200>
+ <pack200><enabled>false</enabled></pack200>
<gzip>false</gzip>
<outputJarVersions>false</outputJarVersions>
<unsignAlreadySignedJars>true</unsignAlreadySignedJars>
diff --git a/STALService/pom.xml b/STALService/pom.xml index 334a2ab0..f404b789 100644 --- a/STALService/pom.xml +++ b/STALService/pom.xml @@ -19,5 +19,22 @@ <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml index be5679a7..b0bda903 100644 --- a/bkucommon/pom.xml +++ b/bkucommon/pom.xml @@ -114,16 +114,21 @@ <optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.metro</groupId>
- <artifactId>webservices-rt</artifactId>
-
- <scope>test</scope>
- </dependency>
+ <groupId>org.glassfish.metro</groupId>
+ <artifactId>webservices-rt</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
<!-- dependency to ensure NamespacePrefixmapper -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.2.11</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -10,6 +10,9 @@ <url>http://joinup.ec.europa.eu/site/mocca/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <jaxb.version>2.3.0</jaxb.version>
+ <activation.version>1.1.1</activation.version>
</properties>
<modules>
<module>utils</module>
@@ -127,11 +130,14 @@ <version>1.0</version>
</plugin>
<plugin>
- <artifactId>webstart-maven-plugin</artifactId>
+ <!-- <artifactId>webstart-maven-plugin</artifactId>
<groupId>org.codehaus.mojo.webstart</groupId>
- <!-- for pkcs11-sign, use patched webstart-maven-plugin
- <version>1.0-beta-1-SNAPSHOT</version-->
- <version>1.0-alpha-2</version>
+ for pkcs11-sign, use patched webstart-maven-plugin
+ <version>1.0-beta-1-SNAPSHOT</version
+ <version>1.0-alpha-2</version> -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <version>1.0-beta-7</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
@@ -399,12 +405,17 @@ <dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.3.0</version>
+ <version>${jaxb.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.metro</groupId>
- <artifactId>webservices-rt</artifactId>
- <version>2.3.1</version>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
</dependency>
<!-- version not defined in BKUOnline pom "include-webstart" profile,
| it wouldn't be adjusted by release:prepare -->
@@ -463,6 +474,40 @@ <type>jar</type>
<scope>compile</scope>
</dependency>
+
+ <!-- For testing -->
+ <dependency>
+ <groupId>org.glassfish.metro</groupId>
+ <artifactId>webservices-rt</artifactId>
+ <version>2.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
<distributionManagement>
diff --git a/utils/pom.xml b/utils/pom.xml index e40d8a63..5afbe058 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -30,9 +30,12 @@ <dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.3.0-b170127.1453</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<artifactId>sjsxp</artifactId>
<groupId>com.sun.xml.stream</groupId>
<version>1.0.2</version>
@@ -44,5 +47,27 @@ <version>2.5</version>
</dependency>
+ <!-- for testing -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
|