honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump library versions

This commit is contained in:
James Agnew 2015-10-14 18:11:52 -04:00
parent 0430eb1626
commit e9d18af5d9
7 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java
View File

@ -150,7 +150,7 @@ public class RuntimeChildChoiceDefinition extends BaseRuntimeDeclaredChildDefini
if (myDatatypeToElementName.containsKey(next)) { if (myDatatypeToElementName.containsKey(next)) {
String existing = myDatatypeToElementName.get(next); String existing = myDatatypeToElementName.get(next);
if (!existing.equals(elementName)) { if (!existing.equals(elementName)) {
throw new ConfigurationException("Already have element name " + existing + " for datatype " + next.getClass().getSimpleName() + " in " + getElementName() + ", cannot add " + elementName); throw new ConfigurationException("Already have element name " + existing + " for datatype " + next.getSimpleName() + " in " + getElementName() + ", cannot add " + elementName);
} }
} else { } else {
myDatatypeToElementName.put(next, elementName); myDatatypeToElementName.put(next, elementName);

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseBinder.java
View File

@ -47,7 +47,7 @@ class BaseBinder<T> {
try { try {
Class<?>[] types = new Class<?>[myCompositeTypes.size()]; Class<?>[] types = new Class<?>[myCompositeTypes.size()];
for (int i = 0; i < myCompositeTypes.size(); i++) { for (int i = 0; i < myCompositeTypes.size(); i++) {
types[i] = myCompositeTypes.get(i).getClass(); types[i] = Class.class;
} }
myConstructor = myType.getConstructor(types); myConstructor = myType.getConstructor(types);
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {

11
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/ResourceTable.java
View File

@ -38,6 +38,7 @@ import javax.persistence.Index;
import javax.persistence.Lob; import javax.persistence.Lob;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Indexed;
@ -86,16 +87,18 @@ public class ResourceTable extends BaseHasResource implements Serializable {
/** /**
* Holds the narrative text only - Used for Fulltext searching but not directly stored in the DB * Holds the narrative text only - Used for Fulltext searching but not directly stored in the DB
*/ */
@Column(name = "SP_NARRATIVE_TEXT", length = Integer.MAX_VALUE - 1, nullable=true) // @Column(name = "SP_NARRATIVE_TEXT", length = Integer.MAX_VALUE - 1, nullable=true)
@Lob // @Lob
@Transient
@Field() @Field()
private String myNarrativeText; private String myNarrativeText;
/** /**
* Holds the narrative text only - Used for Fulltext searching but not directly stored in the DB * Holds the narrative text only - Used for Fulltext searching but not directly stored in the DB
*/ */
@Column(name = "SP_CONTENT_TEXT", length = Integer.MAX_VALUE - 1, nullable=true) // @Column(name = "SP_CONTENT_TEXT", length = Integer.MAX_VALUE - 1, nullable=true)
@Lob // @Lob
@Transient
@Field() @Field()
private String myContentText; private String myContentText;

8
hapi-fhir-osgi-core/pom.xml
View File

@ -59,14 +59,12 @@
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
<Export-Package>ca.uhn.fhir</Export-Package> <!--<Export-Package>ca.uhn.fhir</Export-Package> <Export-Package>org.hl7.fhir</Export-Package> -->
<Export-Package>org.hl7.fhir</Export-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;scope=!provided|test</Embed-Dependency> <!--<Embed-Dependency>*;scope=!provided|test</Embed-Dependency> <Embed-Directory>lib</Embed-Directory> <Embed-Transitive>true</Embed-Transitive> -->
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>true</Embed-Transitive>
<_removeheaders>Built-By, Include-Resource, Private-Package</_removeheaders> <_removeheaders>Built-By, Include-Resource, Private-Package</_removeheaders>
<!-- <Private-Package>org.foo.myproject.*</Private-Package> <Bundle-Activator>org.foo.myproject.impl1.Activator</Bundle-Activator> --> <!-- <Private-Package>org.foo.myproject.*</Private-Package> <Bundle-Activator>org.foo.myproject.impl1.Activator</Bundle-Activator> -->
<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=hapi-fhir-*</Embed-Dependency>
</instructions> </instructions>
</configuration> </configuration>
<executions> <executions>

3
hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/QuestionnaireResponseValidator.java
View File

@ -53,7 +53,8 @@ public class QuestionnaireResponseValidator extends BaseValidator {
// @formatter:off // @formatter:off
/* /*
* ***************************************************************** Note to anyone working on this class - * *****************************************************************
* Note to anyone working on this class -
* *
* This class has unit tests which run within the HAPI project build. Please sync any changes here to HAPI and ensure that unit tests are run. * This class has unit tests which run within the HAPI project build. Please sync any changes here to HAPI and ensure that unit tests are run.
* **************************************************************** * ****************************************************************

10
pom.xml
View File

@ -215,13 +215,13 @@
<!-- Dependency Versions --> <!-- Dependency Versions -->
<apache_httpclient_version>4.4</apache_httpclient_version> <apache_httpclient_version>4.4</apache_httpclient_version>
<apache_httpcore_version>4.4</apache_httpcore_version> <apache_httpcore_version>4.4</apache_httpcore_version>
<derby_version>10.11.1.1</derby_version> <derby_version>10.12.1.1</derby_version>
<!-- Note on Hibernate versions: Hibernate 4.3+ uses JPA 2.1, which is too new for a number of platforms including JBoss EAP 6.x and Glassfish 3.0. Upgrade this <!-- Note on Hibernate versions: Hibernate 4.3+ uses JPA 2.1, which is too new for a number of platforms including JBoss EAP 6.x and Glassfish 3.0. Upgrade this
version with caution! Also note that if you change this, you may get a failure in hibernate4-maven-plugin. See the note in hapi-fhir-jpaserver-base/pom.xml's configuration version with caution! Also note that if you change this, you may get a failure in hibernate4-maven-plugin. See the note in hapi-fhir-jpaserver-base/pom.xml's configuration
for that plugin... --> for that plugin... -->
<hibernate_version>5.0.2.Final</hibernate_version> <hibernate_version>5.0.2.Final</hibernate_version>
<hibernate_validator_version>5.2.1.Final</hibernate_validator_version> <hibernate_validator_version>5.2.1.Final</hibernate_validator_version>
<jetty_version>9.2.6.v20141205</jetty_version> <jetty_version>9.3.4.v20151007</jetty_version>
<maven_build_helper_plugin_version>1.9.1</maven_build_helper_plugin_version> <maven_build_helper_plugin_version>1.9.1</maven_build_helper_plugin_version>
<maven_assembly_plugin_version>2.5.3</maven_assembly_plugin_version> <maven_assembly_plugin_version>2.5.3</maven_assembly_plugin_version>
<maven_failsafe_plugin_version>2.18.1</maven_failsafe_plugin_version> <maven_failsafe_plugin_version>2.18.1</maven_failsafe_plugin_version>
@ -594,7 +594,7 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>2.5.4</version> <version>3.0.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -616,12 +616,12 @@
<dependency> <dependency>
<groupId>com.google.errorprone</groupId> <groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId> <artifactId>error_prone_core</artifactId>
<version>2.0.1</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac</artifactId> <artifactId>plexus-compiler-javac</artifactId>
<version>2.5</version> <version>2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>

7
src/changes/changes.xml
View File

@ -12,8 +12,11 @@
latest versions (dependent HAPI modules listed in brackets): latest versions (dependent HAPI modules listed in brackets):
<![CDATA[ <![CDATA[
<ul> <ul>
<li>Springframework (JPA, Web Tester): 4.1.5 -> 4.2.1</li> <li>Springframework (JPA, Web Tester): 4.1.5 -&gt; 4.2.1</li>
<li>Hibernate (JPA, Web Tester): 4.2.17 -> 5.0.1</li> <li>Hibernate (JPA, Web Tester): 4.2.17 -&gt; 5.0.2</li>
<li>Hibernate Validator (JPA, Web Tester): 5.2.1 -&gt; 5.2.2</li>
<li>Derby (JPA, CLI, Public Server): 10.11.1.1 -&gt; 10.12.1.1 </li>
<li>Jetty (JPA, CLI, Public Server): 9.2.6.v20141205 -&gt; 9.3.4.v20151007 </li>
</ul> </ul>
]]> ]]>
</action> </action>