diff options
-rw-r--r-- | BKUApplet/pom.xml | 2 | ||||
-rw-r--r-- | BKUAppletExt/pom.xml | 2 | ||||
-rw-r--r-- | BKUCertificates/pom.xml | 2 | ||||
-rw-r--r-- | BKUCommonGUI/pom.xml | 2 | ||||
-rw-r--r-- | BKUFonts/pom.xml | 2 | ||||
-rw-r--r-- | BKUGuiExt/pom.xml | 2 | ||||
-rw-r--r-- | BKUHelp/pom.xml | 2 | ||||
-rw-r--r-- | BKUHelpWebStart/pom.xml | 2 | ||||
-rw-r--r-- | BKULocal/pom.xml | 2 | ||||
-rw-r--r-- | BKUOnline/pom.xml | 11 | ||||
-rw-r--r-- | BKUViewer/pom.xml | 2 | ||||
-rw-r--r-- | BKUWebStart/pom.xml | 2 | ||||
-rw-r--r-- | STAL/pom.xml | 2 | ||||
-rw-r--r-- | STALExt/pom.xml | 2 | ||||
-rw-r--r-- | STALService/pom.xml | 2 | ||||
-rw-r--r-- | STALXService/pom.xml | 2 | ||||
-rw-r--r-- | bkucommon/pom.xml | 6 | ||||
-rw-r--r-- | pom.xml | 20 | ||||
-rw-r--r-- | smcc/pom.xml | 2 | ||||
-rw-r--r-- | smccSTAL/pom.xml | 2 | ||||
-rw-r--r-- | smccSTALExt/pom.xml | 2 | ||||
-rw-r--r-- | utils/pom.xml | 8 |
22 files changed, 41 insertions, 40 deletions
diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml index b5685700..4e5701c4 100644 --- a/BKUApplet/pom.xml +++ b/BKUApplet/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>BKUApplet</artifactId> diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml index 568ec1ae..18cc1508 100644 --- a/BKUAppletExt/pom.xml +++ b/BKUAppletExt/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>BKUAppletExt</artifactId> diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml index da523ffb..2d599953 100644 --- a/BKUCertificates/pom.xml +++ b/BKUCertificates/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <artifactId>BKUCertificates</artifactId> <!-- DON'T CHANGE VERSION UNLESS THE INCLUDED CERTIFICATES CHANGED diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml index ba34636e..9b45f908 100644 --- a/BKUCommonGUI/pom.xml +++ b/BKUCommonGUI/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>BKUCommonGUI</artifactId> diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml index a45f3c93..436dfde2 100644 --- a/BKUFonts/pom.xml +++ b/BKUFonts/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <artifactId>BKUFonts</artifactId> <version>1.2</version> diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml index 98035089..e2cba071 100644 --- a/BKUGuiExt/pom.xml +++ b/BKUGuiExt/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <artifactId>BKUGuiExt</artifactId> <name>BKU GUI Ext</name> diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml index cbefa6fc..27d992a8 100644 --- a/BKUHelp/pom.xml +++ b/BKUHelp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <artifactId>BKUHelp</artifactId> <name>BKU Help</name> diff --git a/BKUHelpWebStart/pom.xml b/BKUHelpWebStart/pom.xml index 607b4571..5285f942 100644 --- a/BKUHelpWebStart/pom.xml +++ b/BKUHelpWebStart/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <artifactId>BKUHelpWebStart</artifactId> <name>BKU Help WebStart</name> diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index 709e1bae..095d4e10 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>BKULocal</artifactId> diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index 3f8e3315..7c10a2fa 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>BKUOnline</artifactId> @@ -96,8 +96,8 @@ | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970 --> <dependency> - <groupId>org.glassfish.metro</groupId> - <artifactId>webservices-rt</artifactId> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> <!-- use JAX-WS RI with SJSXP instead of Woodstox --> <exclusions> <exclusion> @@ -112,7 +112,10 @@ <groupId>com.sun.xml.messaging.saaj</groupId> <artifactId>saaj-impl</artifactId> </exclusion> </exclusions --> </dependency> - + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> + </dependency> <dependency> <artifactId>sjsxp</artifactId> <groupId>com.sun.xml.stream</groupId> diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml index c4cc87ed..1cc5bc23 100644 --- a/BKUViewer/pom.xml +++ b/BKUViewer/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>BKUViewer</artifactId> diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index da4d1e6d..996c99a6 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>BKUWebStart</artifactId> diff --git a/STAL/pom.xml b/STAL/pom.xml index aa78d235..c8adb28e 100644 --- a/STAL/pom.xml +++ b/STAL/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>STAL</artifactId> diff --git a/STALExt/pom.xml b/STALExt/pom.xml index d9337861..83ddfa60 100644 --- a/STALExt/pom.xml +++ b/STALExt/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>STALExt</artifactId> diff --git a/STALService/pom.xml b/STALService/pom.xml index 99487973..6a83b754 100644 --- a/STALService/pom.xml +++ b/STALService/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>STALService</artifactId> diff --git a/STALXService/pom.xml b/STALXService/pom.xml index 28e4a6a6..4e1085aa 100644 --- a/STALXService/pom.xml +++ b/STALXService/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>STALXService</artifactId> diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml index 3557d522..cbe355f9 100644 --- a/bkucommon/pom.xml +++ b/bkucommon/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>bkucommon</artifactId> @@ -114,8 +114,8 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.glassfish.metro</groupId> - <artifactId>webservices-rt</artifactId> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> <scope>test</scope> </dependency> <!-- dependency to ensure NamespacePrefixmapper --> @@ -4,7 +4,7 @@ <groupId>at.gv.egiz</groupId> <artifactId>mocca</artifactId> <packaging>pom</packaging> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> <name>MOCCA</name> <description>MOCCA (Modular Open Citizen Card Architecture) project</description> <url>http://joinup.ec.europa.eu/site/mocca/</url> @@ -56,7 +56,7 @@ <connection>scm:git:http://git.egiz.gv.at/git/mocca</connection> <developerConnection>scm:git:ssh://gitlab@gitlab.iaik.tugraz.at/egiz/mocca.git</developerConnection> <url>http://git.egiz.gv.at/mocca</url> - <tag>mocca-1.3.25</tag> + <tag>HEAD</tag> </scm> <organization> <name>E-Government Innovation Center (EGIZ)</name> @@ -400,12 +400,16 @@ <artifactId>jaxb-impl</artifactId> <version>2.2.11</version> </dependency> - <dependency> - <groupId>org.glassfish.metro</groupId> - <artifactId>webservices-rt</artifactId> - <version>2.3.1</version> -</dependency> - + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + <version>2.2.10</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>policy</artifactId> + <version>2.7.1</version> + </dependency> <!-- version not defined in BKUOnline pom "include-webstart" profile, | it wouldn't be adjusted by release:prepare --> <dependency> diff --git a/smcc/pom.xml b/smcc/pom.xml index 8a10c98b..3506b37a 100644 --- a/smcc/pom.xml +++ b/smcc/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>smcc</artifactId> diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml index d6373439..069522d7 100644 --- a/smccSTAL/pom.xml +++ b/smccSTAL/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>smccSTAL</artifactId> diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml index 27927322..47281f7c 100644 --- a/smccSTALExt/pom.xml +++ b/smccSTALExt/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <artifactId>smccSTALExt</artifactId> <name>smcc STAL Ext</name> diff --git a/utils/pom.xml b/utils/pom.xml index 314e73c1..fb7d6f81 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>mocca</artifactId> <groupId>at.gv.egiz</groupId> - <version>1.3.25</version> + <version>1.3.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>utils</artifactId> @@ -31,11 +31,5 @@ <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0-b170127.1453</version> - </dependency> - </dependencies> </project> |