Skip to content
This repository has been archived by the owner on Jul 8, 2020. It is now read-only.

Commit

Permalink
Set release version to 2.7-M15
Browse files Browse the repository at this point in the history
  • Loading branch information
gundalar committed Jul 29, 2014
1 parent 0d84509 commit fbd552b
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 55 deletions.
2 changes: 1 addition & 1 deletion caAERS/software/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ selenium.port=4444
# Frequently modified properties
#------------------------------------------------------------------------
ctms.version=1.1.1.RELEASE
caaers.version=2.7-M14
caaers.version=2.7-M15
14 changes: 7 additions & 7 deletions caAERS/software/caAERSInstaller/deploy.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
# ------------------------------------------------------------------

#Version of caAERS installer
CAAERS_INSTALLER_VERSION=2.7-M14
CAAERS_INSTALLER_VERSION=2.7-M15


#Version of caAERS being installed
CAAERS_VERSION=2.7-M14
CAAERS_VERSION=2.7-M15


#Location of caAERS WAR
Expand All @@ -27,8 +27,8 @@ SERVICEMIX_DOWNLOAD_URL_WINDOWS=https://ncisvn.nci.nih.gov/svn/caaersappdev/deli
SERVICEMIX_DOWNLOAD_URL_UNIX=https://ncisvn.nci.nih.gov/svn/caaersappdev/deliverables/Phase-3/servicemix/unix/apache-servicemix-3.3.2.zip

#Location of servicemix assembly files for caAERS-ADEERS integration
ADEERS_SA_DOWNLOAD_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M14/caaers-adeers-sa-2.7-M14.zip
ADEERS_SYNC_SA_DOWNLOAD_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M14/caaers-adeers-sync-sa-2.7-M14.zip
ADEERS_LOOKUP_XML_DOWNLOAD_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M14/lookup.xml
ADEERS_CAXCHANGE_PROPS_DOWNLOAD_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M14/caxchange.properties
ADEERS_CAXCHANGE_CONF_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M14/caXchangeConf.zip
ADEERS_SA_DOWNLOAD_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M15/caaers-adeers-sa-2.7-M15.zip
ADEERS_SYNC_SA_DOWNLOAD_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M15/caaers-adeers-sync-sa-2.7-M15.zip
ADEERS_LOOKUP_XML_DOWNLOAD_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M15/lookup.xml
ADEERS_CAXCHANGE_PROPS_DOWNLOAD_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M15/caxchange.properties
ADEERS_CAXCHANGE_CONF_URL=https://raw.github.com/NCIP/caaers-docs/master/archives/Phase-3/2.7-M15/caXchangeConf.zip
12 changes: 6 additions & 6 deletions caAERS/software/jbi/caaers-adeers-service-assembly/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<!--sa archive -->
<property name="caaers-adeers.sa.build.dir" value="${build.dir}/assembly"/>
<property name="caaers-adeers.sa.archive" value="caaers-adeers-sa-2.7-M14.zip"/>
<property name="caaers-adeers.sa.archive" value="caaers-adeers-sa-2.7-M15.zip"/>

<property name="src.resources.dir" value="src/main/resources"/>
<property name="src.java.dir" value="src/main/java"/>
Expand Down Expand Up @@ -132,7 +132,7 @@
<copy todir="${eip.comp.build.dir}/META-INF">
<fileset dir="caaers-adeers-eip-su" includes="*.xml"/>
</copy>
<zip destfile="${su.build.dir}/caaers-adeers-eip-su-2.7-M14.zip">
<zip destfile="${su.build.dir}/caaers-adeers-eip-su-2.7-M15.zip">
<fileset dir="${eip.comp.build.dir}"/>
</zip>

Expand All @@ -149,7 +149,7 @@
destdir="${webservice.comp.build.dir}" debug="on" source="1.5" target="1.5">
<classpath refid="build.classpath"/>
</javac>
<zip destfile="${su.build.dir}/caaers-adeers-webservice-su-2.7-M14.zip">
<zip destfile="${su.build.dir}/caaers-adeers-webservice-su-2.7-M15.zip">
<fileset dir="${webservice.comp.build.dir}"/>
</zip>

Expand All @@ -159,7 +159,7 @@
<copy todir="${http.comp.build.dir}/META-INF">
<fileset dir="caaers-adeers-http-su" includes="*.xml"/>
</copy>
<zip destfile="${su.build.dir}/caaers-adeers-http-su-2.7-M14.zip">
<zip destfile="${su.build.dir}/caaers-adeers-http-su-2.7-M15.zip">
<fileset dir="${http.comp.build.dir}"/>
</zip>

Expand All @@ -172,14 +172,14 @@
<copy todir="${xslt.comp.build.dir}/lib">
<fileset dir="caaers-adeers-xslt-su/lib" includes="*.*"/>
</copy>
<zip destfile="${su.build.dir}/caaers-adeers-xslt-su-2.7-M14.zip">
<zip destfile="${su.build.dir}/caaers-adeers-xslt-su-2.7-M15.zip">
<fileset dir="${xslt.comp.build.dir}"/>
</zip>

<copy todir="${jms.comp.build.dir}">
<fileset dir="caaers-adeers-jms-su/${src.resources.dir}"/>
</copy>
<zip destfile="${su.build.dir}/caaers-adeers-jms-su-2.7-M14.zip">
<zip destfile="${su.build.dir}/caaers-adeers-jms-su-2.7-M15.zip">
<fileset dir="${jms.comp.build.dir}"/>
</zip>
</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,51 +13,51 @@
</identification>
<!-- <service-unit>
<identification>
<name>caaers-adeers-http-su-2.7-M14</name>
<name>caaers-adeers-http-su-2.7-M15</name>
<description>Web Service Artifact</description>
</identification>
<target>
<artifacts-zip>caaers-adeers-http-su-2.7-M14.zip</artifacts-zip>
<artifacts-zip>caaers-adeers-http-su-2.7-M15.zip</artifacts-zip>
<component-name>servicemix-http</component-name>
</target>
</service-unit>-->
<service-unit>
<identification>
<name>caaers-adeers-eip-su-2.7-M14</name>
<name>caaers-adeers-eip-su-2.7-M15</name>
<description>Pipeline for caAERS to Adeers</description>
</identification>
<target>
<artifacts-zip>caaers-adeers-eip-su-2.7-M14.zip</artifacts-zip>
<artifacts-zip>caaers-adeers-eip-su-2.7-M15.zip</artifacts-zip>
<component-name>servicemix-eip</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>caaers-adeers-xslt-su-2.7-M14</name>
<name>caaers-adeers-xslt-su-2.7-M15</name>
<description>XSLT transformer to transform caaers xml to adeers xml</description>
</identification>
<target>
<artifacts-zip>caaers-adeers-xslt-su-2.7-M14.zip</artifacts-zip>
<artifacts-zip>caaers-adeers-xslt-su-2.7-M15.zip</artifacts-zip>
<component-name>servicemix-lwcontainer</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>caaers-adeers-webservice-su-2.7-M14</name>
<name>caaers-adeers-webservice-su-2.7-M15</name>
<description>JAVA code to call adeers web service</description>
</identification>
<target>
<artifacts-zip>caaers-adeers-webservice-su-2.7-M14.zip</artifacts-zip>
<artifacts-zip>caaers-adeers-webservice-su-2.7-M15.zip</artifacts-zip>
<component-name>servicemix-lwcontainer</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>caaers-adeers-jms-su-2.7-M14</name>
<name>caaers-adeers-jms-su-2.7-M15</name>
<description>JMS input and output queues for caAERS</description>
</identification>
<target>
<artifacts-zip>caaers-adeers-jms-su-2.7-M14.zip</artifacts-zip>
<artifacts-zip>caaers-adeers-jms-su-2.7-M15.zip</artifacts-zip>
<component-name>servicemix-jms</component-name>
</target>
</service-unit>
Expand Down
37 changes: 16 additions & 21 deletions caAERS/software/jbi/caaers2adeers-sync/adeers-wsbc-su/.project
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>adeers-wsbc-su</name>
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<name>adeers-wsbc-su</name>
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<version>2.7-M14</version>
<version>2.7-M15</version>
</parent>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<artifactId>adeers-wsbc-su</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions caAERS/software/jbi/caaers2adeers-sync/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<property name="caaers-adders.sa.build.dir" value="${build.dir}/sync"/>

<property name="caeers-adders.sa.archive" value="caaers-adders-sa-2.7-M14.zip"/>
<property name="caeers-adders.sa.archive" value="caaers-adders-sa-2.7-M15.zip"/>

<property name="src.resources.dir" value="src/main/resources"/>
<property name="src.java.dir" value="src/main/java"/>
Expand Down Expand Up @@ -89,21 +89,21 @@
<fileset dir="adeers-wsbc-su/${src.resources.dir}"/>
</copy>

<zip destfile="${su.build.dir}/caaers-adders-sa-2.7-M14.zip">
<zip destfile="${su.build.dir}/caaers-adders-sa-2.7-M15.zip">
<fileset dir="${adeers-wsbc.su.comp.build.dir}"/>
</zip>
<copy todir="${caaers-wsbc.su.comp.build.dir}">
<fileset dir="caaers-wsbc-su/${src.resources.dir}"/>
</copy>

<zip destfile="${su.build.dir}/caaers-adders-sa-2.7-M14.zip">
<zip destfile="${su.build.dir}/caaers-adders-sa-2.7-M15.zip">
<fileset dir="${caaers-wsbc.su.comp.build.dir}"/>
</zip>
<copy todir="${core-camel.su.comp.build.dir}">
<fileset dir="core-camel-su/${src.resources.dir}"/>
</copy>

<zip destfile="${su.build.dir}/caaers-adders-sa-2.7-M14.zip">
<zip destfile="${su.build.dir}/caaers-adders-sa-2.7-M15.zip">
<fileset dir="${core-camel.su.comp.build.dir}"/>
</zip>
</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<version>2.7-M14</version>
<version>2.7-M15</version>
</parent>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<artifactId>caaers-adeers-sync-sa</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<version>2.7-M14</version>
<version>2.7-M15</version>
</parent>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<artifactId>caaers-wsbc-su</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<version>2.7-M14</version>
<version>2.7-M15</version>
</parent>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<artifactId>core-camel-su</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions caAERS/software/jbi/caaers2adeers-sync/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>gov.nih.nci.cabig.caaers2adeers</groupId>
<artifactId>parent</artifactId>
<version>2.7-M14</version>
<version>2.7-M15</version>
<packaging>pom</packaging>
<name>caAERS to AdEERS Integration</name>
<url>http://servicemix.apache.org</url>
Expand All @@ -19,7 +19,7 @@
<cxfBCVersion>2010.01</cxfBCVersion>
<smLibVersion>2010.01</smLibVersion>
<smVersion>3.3.2</smVersion>
<c2aVersion>2.7-M14</c2aVersion>
<c2aVersion>2.7-M15</c2aVersion>
</properties>
<modules>
<module>core-camel-su</module>
Expand Down

0 comments on commit fbd552b

Please sign in to comment.