diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2019-11-14 12:14:16 -0600 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2019-11-14 12:31:39 -0600 |
| commit | 4d0a045d78b8ad411534888464d977f65ff9efc7 (patch) | |
| tree | 4b57f3d16754e34341cf8bbdbc1c241accde83ae | |
| parent | aee01939319af85adfc471caef2db33087b8a033 (diff) | |
To version 2.1.17-SNAPSHOT
Issue-ID: AAF-1046
Change-Id: Id534c271c94c3805a5902eea521dc6c9d66f3919
Signed-off-by: Instrumental <jonathan.gathman@att.com>
41 files changed, 103 insertions, 47 deletions
diff --git a/auth-client/pom.xml b/auth-client/pom.xml index c404ab1f..c0178b7b 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> </parent> <artifactId>aaf-auth-client</artifactId> diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index 802538ab..6b5d21c6 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -123,12 +123,6 @@ <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-auth-deforg</artifactId> </dependency> - - <!--dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency --> - </dependencies> <build> diff --git a/auth/auth-batch/src/assemble/auth-batch.xml b/auth/auth-batch/src/assemble/auth-batch.xml index 1ba34da3..25b37b73 100644 --- a/auth/auth-batch/src/assemble/auth-batch.xml +++ b/auth/auth-batch/src/assemble/auth-batch.xml @@ -38,7 +38,20 @@ <include>org.onap.aaf.authz:aaf-cadi-core</include> <include>org.onap.aaf.authz:aaf-misc-env</include> <include>org.onap.aaf.authz:aaf-misc-rosetta</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> </includes --> + <includes> + <include>org.onap.aaf.authz:aaf-auth-batch</include> + <include>org.onap.aaf.authz:aaf-auth-core</include> + <include>org.onap.aaf.authz:aaf-cadi-core</include> + <include>org.onap.aaf.authz:aaf-misc-env</include> + <include>org.onap.aaf.authz:aaf-misc-rosetta</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>com.sun.istack:istack-commons-runtime</include> + <include>javax.activation:javax.activation-api</include> + </includes> </dependencySet> </dependencySets> </assembly>
\ No newline at end of file diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index d8e25cc3..11d759c2 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index 69465b7d..64ab8372 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 6de09de5..76035309 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-cmd/src/assemble/auth-cmd.xml b/auth/auth-cmd/src/assemble/auth-cmd.xml index 013010b5..ba312423 100644 --- a/auth/auth-cmd/src/assemble/auth-cmd.xml +++ b/auth/auth-cmd/src/assemble/auth-cmd.xml @@ -42,6 +42,10 @@ <include>org.onap.aaf.authz:aaf-misc-env</include> <include>org.onap.aaf.authz:aaf-misc-rosetta</include> <include>jline:jline</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.glassfish.jaxb:jaxb-runtime</include> + <include>com.sun.istack:istack-commons-runtime</include> + <include>javax.activation:javax.activation-api</include> </includes> </dependencySet> diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 91517836..01001c91 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 353d4b91..3d1eb9aa 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -26,7 +26,7 @@ <artifactId>authparent</artifactId> <relativePath>../pom.xml</relativePath> <groupId>org.onap.aaf.authz</groupId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> </parent> <artifactId>aaf-auth-deforg</artifactId> diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 7b871267..0d7b6dc1 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 6b003051..f93fb7e4 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 2cb8f571..47285766 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 3ea432b8..8df23909 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 5e0c56fb..cc0ed53e 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 63585f94..9f9ca869 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/docker/Dockerfile.base b/auth/docker/Dockerfile.base index e7ae6432..4874f1aa 100644 --- a/auth/docker/Dockerfile.base +++ b/auth/docker/Dockerfile.base @@ -19,6 +19,9 @@ # # Use dbuild.sh input parameter to set registry FROM ${REGISTRY}/openjdk:8-jre-alpine +#FROM openjdk:12-jdk-alpine +#FROM openjdk:13-jdk-alpine + MAINTAINER AAF Team, AT&T 2018 LABEL description="aaf_base" diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index 575e21f9..f59bd228 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -28,7 +28,8 @@ fi . ./aaf.props DOCKER=${DOCKER:=docker} -CADI_VERSION=${CADI_VERSION:=2.1.16} +VERSION=${VERSION} +CADI_VERSION=${CADI_VERSION:=${VERSION}} for V in VERSION DOCKER_REPOSITORY HOSTNAME CONTAINER_NS AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do if [ "$(grep $V ./aaf.props)" = "" ]; then diff --git a/auth/docker/d.props.csit b/auth/docker/d.props.csit index cdb6b5a0..27f539bb 100644 --- a/auth/docker/d.props.csit +++ b/auth/docker/d.props.csit @@ -28,7 +28,7 @@ ORG=onap PROJECT=aaf DOCKER_PULL_REGISTRY=nexus3.onap.org:10001 DOCKER_REPOSITORY=nexus3.onap.org:10003 -VERSION=2.1.16-SNAPSHOT +VERSION=2.1.17-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # For local builds, set PREFIX= PREFIX="$DOCKER_REPOSITORY/" diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index 41a30244..8ef2e31a 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -23,7 +23,7 @@ PROJECT=aaf # Note: Override can happen on dbuild.sh Commandline, -r <registry> DOCKER_PULL_REGISTRY=nexus3.onap.org:10001 DOCKER_REPOSITORY=nexus3.onap.org:10003 -VERSION=2.1.16-SNAPSHOT +VERSION=2.1.17-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # For local builds, set PREFIX= PREFIX="$DOCKER_REPOSITORY/" diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh index 4fb4e07a..0e974aa6 100644 --- a/auth/docker/dclean.sh +++ b/auth/docker/dclean.sh @@ -23,7 +23,7 @@ DOCKER=${DOCKER:=docker} if [ "$1" == "" ]; then - AAF_COMPONENTS="$(cat components) config core agent " + AAF_COMPONENTS="$(cat components) config core agent base " else AAF_COMPONENTS="$@" fi diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index b4d3545c..9bfb80c8 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/auth/helm/.gitignore b/auth/helm/.gitignore index 44cae669..e106bce2 100644 --- a/auth/helm/.gitignore +++ b/auth/helm/.gitignore @@ -2,3 +2,6 @@ aaf.orig/ pause/ aaf.new/ aaf.props +.DS_Store +current +*.tgz diff --git a/auth/helm/aaf-hello/values.yaml b/auth/helm/aaf-hello/values.yaml index 5a3931c2..130fa74e 100644 --- a/auth/helm/aaf-hello/values.yaml +++ b/auth/helm/aaf-hello/values.yaml @@ -37,8 +37,8 @@ image: # repository: localhost:5000/ service: - agentImage: onap/aaf/aaf_agent:2.1.16-SNAPSHOT - image: onap/aaf/aaf_hello:2.1.16-SNAPSHOT + agentImage: onap/aaf/aaf_agent:2.1.17-SNAPSHOT + image: onap/aaf/aaf_hello:2.1.17-SNAPSHOT app_ns: "org.osaaf.aaf" fqi: "aaf@aaf.osaaf.org" fqdn: "aaf-hello" diff --git a/auth/helm/aaf/Chart.yaml b/auth/helm/aaf/Chart.yaml index f83041e9..976e2efe 100644 --- a/auth/helm/aaf/Chart.yaml +++ b/auth/helm/aaf/Chart.yaml @@ -22,4 +22,4 @@ apiVersion: v1 appVersion: "1.0" description: AAF Helm Chart name: aaf -version: 2.1.16-SNAPSHOT +version: 2.1.17-SNAPSHOT diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml index b320d9c8..9cfee331 100644 --- a/auth/helm/aaf/values.yaml +++ b/auth/helm/aaf/values.yaml @@ -104,7 +104,7 @@ image: # When using Docker Repo, add, and include trailing "/" # repository: nexus3.onap.org:10003/ # repository: localhost:5000/ - version: 2.1.16-SNAPSHOT + version: 2.1.17-SNAPSHOT resources: {} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/auth/pom.xml b/auth/pom.xml index 27abccdb..f65e5564 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> </parent> <artifactId>authparent</artifactId> <name>AAF Auth Parent</name> diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh index 4768d81c..4132e6ca 100755 --- a/auth/sample/bin/client.sh +++ b/auth/sample/bin/client.sh @@ -21,7 +21,7 @@ # This script is run when starting client Container. # It needs to cover the cases where the initial data doesn't exist, and when it has already been configured (don't overwrite) # -JAVA=/usr/bin/java +JAVA=${JAVA_HOME}/bin/java AAF_INTERFACE_VERSION=2.1 # Extract Name, Domain and NS from FQI diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh index bddd42c9..10a3e15e 100644 --- a/auth/sample/bin/service.sh +++ b/auth/sample/bin/service.sh @@ -39,7 +39,7 @@ cadi_longitude=${cadi_longitude:-"${LONGITUDE}"} cadi_x509_issuers=${cadi_x509_issuers:-"${CADI_X509_ISSUERS}"} aaf_locate_url=${aaf_locate_url:-"https://${HOSTNAME}:8095"} -JAVA=/usr/bin/java +JAVA=${JAVA_HOME}/bin/java OSAAF=/opt/app/osaaf LOCAL=$OSAAF/local diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 1fa4ab59..079642a7 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index 38d50820..8f3c6a1d 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index aa50090b..bbf0d501 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> <relativePath>..</relativePath> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index efc32dd4..405649ca 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/cadi/pom.xml b/cadi/pom.xml index 9075385a..8a4fc44c 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> </parent> <artifactId>cadiparent</artifactId> <name>AAF CADI Parent (Code, Access, Data, Identity)</name> diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index 7ca8aa4b..2b41d92f 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> <relativePath>..</relativePath> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <name>CADI Servlet Sample (Test Only)</name> diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 360b920c..5bc0e0ec 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>miscparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 7bfc1bce..8d88852b 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>miscparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/misc/pom.xml b/misc/pom.xml index 68e3c4b1..173fa6c0 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> </parent> <artifactId>miscparent</artifactId> <name>AAF Misc Parent</name> diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 9c6d003a..bf11b795 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>miscparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -93,8 +93,23 @@ <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-misc-env</artifactId> - <version>${project.version}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.sun.istack</groupId> + <artifactId>istack-commons-runtime</artifactId> + <version>2.2</version> + <scope>runtime</scope> + </dependency> + </dependencies> diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 83153890..8d7e86ef 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>miscparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -22,14 +22,19 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <name>aaf-authz</name> <packaging>pom</packaging> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> + <!-- Official Released Version <version>2.1.0</version> + + Frankfurt working Version + --> + <version>3.0.0-SNAPSHOT</version> </parent> <properties> @@ -51,7 +56,8 @@ <project.interfaceVersion>${project.version}</project.interfaceVersion> <project.jettyVersion>9.4.12.v20180830</project.jettyVersion> <project.cassVersion>3.6.0</project.cassVersion> - + <project.jaxbVersion>2.3.1</project.jaxbVersion> + <project.glassfishJaxbVersion>3.0-b71</project.glassfishJaxbVersion> </properties> <build> <plugins> @@ -342,6 +348,23 @@ <scope>test</scope> </dependency> + <!-- Javax removed as of JDK 9 --> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${project.jaxbVersion}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>${project.jaxbVersion}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${project.jaxbVersion}</version> + </dependency> + </dependencies> </dependencyManagement> diff --git a/version.properties b/version.properties index 564f55f4..de52dc04 100644 --- a/version.properties +++ b/version.properties @@ -24,10 +24,10 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -# This TAG <version>2.1.16-SNAPSHOT</version> is here to help remember to change this file. Keep it up to date with the following "real" entries: +# This TAG <version>2.1.17-SNAPSHOT</version> is here to help remember to change this file. Keep it up to date with the following "real" entries: major=2 minor=1 -patch=16 +patch=17 base_version=${major}.${minor}.${patch} |