[OLINGO-575] Removed V4 server code
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/f7a7b484 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/f7a7b484 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/f7a7b484 Branch: refs/heads/3.0.0-beta-01 Commit: f7a7b484abe5a970ae49859d386dc8a2d564f61b Parents: 6c89cf5 Author: Michael Bolz <[email protected]> Authored: Fri Feb 6 14:29:13 2015 +0100 Committer: Michael Bolz <[email protected]> Committed: Tue Feb 17 10:38:20 2015 +0100 ---------------------------------------------------------------------- dist/android-lib/pom.xml | 2 +- dist/client-lib/pom.xml | 2 +- dist/javadoc/pom.xml | 2 +- dist/pom.xml | 3 +- dist/server-lib/pom.xml | 114 - .../src/main/assembly/lib-assembly.xml | 47 - dist/server-lib/src/main/resources/LICENSE | 337 -- dist/server-lib/src/main/resources/NOTICE | 62 - ext/client-android/pom.xml | 2 +- ext/client-proxy/pom.xml | 2 +- ext/pojogen-maven-plugin/pom.xml | 2 +- .../src/it/exchangeMail/pom.xml | 14 + .../src/it/exchangeMailNoBasePkg/pom.xml | 14 + .../src/it/v3Sample/pom.xml | 14 + .../src/it/v4Sample/pom.xml | 14 + ext/pom.xml | 2 +- fit/pom.xml | 4 +- fit/src/it/actionOverloadingV3/pom.xml | 14 + fit/src/it/demoV4/pom.xml | 14 + fit/src/it/openTypeV3/pom.xml | 14 + fit/src/it/openTypeV4/pom.xml | 14 + fit/src/it/primitiveKeysServiceV3/pom.xml | 14 + fit/src/it/staticServiceV3/pom.xml | 14 + fit/src/it/staticServiceV4/pom.xml | 14 + .../olingo/fit/tecsvc/client/BasicITCase.java | 164 +- .../olingo/fit/tecsvc/client/MediaITCase.java | 10 +- lib/client-api/pom.xml | 2 +- lib/client-core/pom.xml | 2 +- lib/commons-api/pom.xml | 2 +- lib/commons-core/pom.xml | 2 +- lib/pom.xml | 6 +- lib/server-api/pom.xml | 55 - .../org/apache/olingo/server/api/OData.java | 103 - .../server/api/ODataApplicationException.java | 111 - .../olingo/server/api/ODataHttpHandler.java | 62 - .../apache/olingo/server/api/ODataRequest.java | 196 - .../apache/olingo/server/api/ODataResponse.java | 87 - .../olingo/server/api/ODataServerError.java | 138 - .../server/api/ODataTranslatedException.java | 157 - .../olingo/server/api/ServiceMetadata.java | 48 - .../olingo/server/api/batch/BatchFacade.java | 67 - .../exception/BatchDeserializerException.java | 65 - .../exception/BatchSerializerException.java | 46 - .../api/deserializer/DeserializerException.java | 83 - .../deserializer/FixedFormatDeserializer.java | 39 - .../api/deserializer/ODataDeserializer.java | 53 - .../api/deserializer/batch/BatchOptions.java | 114 - .../deserializer/batch/BatchRequestPart.java | 73 - .../deserializer/batch/ODataResponsePart.java | 85 - .../olingo/server/api/edm/provider/Action.java | 54 - .../server/api/edm/provider/ActionImport.java | 48 - .../server/api/edm/provider/AliasInfo.java | 45 - .../server/api/edm/provider/Annotation.java | 72 - .../server/api/edm/provider/BindingTarget.java | 60 - .../server/api/edm/provider/ComplexType.java | 62 - .../server/api/edm/provider/EdmProvider.java | 195 - .../api/edm/provider/EntityContainer.java | 93 - .../api/edm/provider/EntityContainerInfo.java | 47 - .../server/api/edm/provider/EntitySet.java | 55 - .../server/api/edm/provider/EntitySetPath.java | 45 - .../server/api/edm/provider/EntityType.java | 84 - .../server/api/edm/provider/EnumMember.java | 44 - .../server/api/edm/provider/EnumType.java | 73 - .../server/api/edm/provider/Expression.java | 24 - .../server/api/edm/provider/Function.java | 65 - .../server/api/edm/provider/FunctionImport.java | 64 - .../olingo/server/api/edm/provider/Mapping.java | 96 - .../api/edm/provider/NavigationProperty.java | 118 - .../edm/provider/NavigationPropertyBinding.java | 46 - .../server/api/edm/provider/Operation.java | 81 - .../api/edm/provider/OperationImport.java | 47 - .../server/api/edm/provider/Parameter.java | 113 - .../server/api/edm/provider/Property.java | 148 - .../server/api/edm/provider/PropertyRef.java | 55 - .../api/edm/provider/ReferentialConstraint.java | 46 - .../server/api/edm/provider/ReturnType.java | 91 - .../olingo/server/api/edm/provider/Schema.java | 135 - .../server/api/edm/provider/Singleton.java | 44 - .../server/api/edm/provider/StructuredType.java | 93 - .../olingo/server/api/edm/provider/Term.java | 150 - .../server/api/edm/provider/TypeDefinition.java | 94 - .../olingo/server/api/edmx/EdmxReference.java | 93 - .../server/api/edmx/EdmxReferenceInclude.java | 61 - .../edmx/EdmxReferenceIncludeAnnotation.java | 93 - .../ActionComplexCollectionProcessor.java | 48 - .../api/processor/ActionComplexProcessor.java | 48 - .../ActionEntityCollectionProcessor.java | 48 - .../api/processor/ActionEntityProcessor.java | 48 - .../ActionPrimitiveCollectionProcessor.java | 48 - .../api/processor/ActionPrimitiveProcessor.java | 48 - .../server/api/processor/BatchProcessor.java | 56 - .../processor/ComplexCollectionProcessor.java | 77 - .../server/api/processor/ComplexProcessor.java | 74 - .../CountComplexCollectionProcessor.java | 43 - .../CountEntityCollectionProcessor.java | 43 - .../CountPrimitiveCollectionProcessor.java | 43 - .../server/api/processor/DefaultProcessor.java | 91 - .../server/api/processor/DeltaProcessor.java | 39 - .../processor/EntityCollectionProcessor.java | 45 - .../server/api/processor/EntityProcessor.java | 85 - .../server/api/processor/ErrorProcessor.java | 41 - .../api/processor/MediaEntityProcessor.java | 75 - .../server/api/processor/MetadataProcessor.java | 44 - .../processor/PrimitiveCollectionProcessor.java | 78 - .../api/processor/PrimitiveProcessor.java | 76 - .../api/processor/PrimitiveValueProcessor.java | 46 - .../olingo/server/api/processor/Processor.java | 38 - .../processor/ReferenceCollectionProcessor.java | 46 - .../api/processor/ReferenceProcessor.java | 81 - .../api/processor/ServiceDocumentProcessor.java | 44 - .../serializer/ComplexSerializerOptions.java | 86 - .../serializer/CustomContentTypeSupport.java | 46 - .../EntityCollectionSerializerOptions.java | 97 - .../api/serializer/EntitySerializerOptions.java | 85 - .../api/serializer/FixedFormatSerializer.java | 55 - .../server/api/serializer/ODataSerializer.java | 112 - .../serializer/PrimitiveSerializerOptions.java | 131 - .../PrimitiveValueSerializerOptions.java | 118 - .../api/serializer/RepresentationType.java | 44 - .../api/serializer/SerializerException.java | 75 - .../apache/olingo/server/api/uri/UriHelper.java | 59 - .../apache/olingo/server/api/uri/UriInfo.java | 52 - .../olingo/server/api/uri/UriInfoAll.java | 27 - .../olingo/server/api/uri/UriInfoBatch.java | 27 - .../olingo/server/api/uri/UriInfoCrossjoin.java | 34 - .../olingo/server/api/uri/UriInfoEntityId.java | 68 - .../olingo/server/api/uri/UriInfoKind.java | 67 - .../olingo/server/api/uri/UriInfoMetadata.java | 39 - .../olingo/server/api/uri/UriInfoResource.java | 124 - .../olingo/server/api/uri/UriInfoService.java | 27 - .../olingo/server/api/uri/UriParameter.java | 53 - .../olingo/server/api/uri/UriResource.java | 35 - .../server/api/uri/UriResourceAction.java | 42 - .../api/uri/UriResourceComplexProperty.java | 41 - .../olingo/server/api/uri/UriResourceCount.java | 27 - .../server/api/uri/UriResourceEntitySet.java | 58 - .../server/api/uri/UriResourceFunction.java | 65 - .../olingo/server/api/uri/UriResourceIt.java | 38 - .../olingo/server/api/uri/UriResourceKind.java | 115 - .../server/api/uri/UriResourceLambdaAll.java | 39 - .../server/api/uri/UriResourceLambdaAny.java | 39 - .../api/uri/UriResourceLambdaVariable.java | 32 - .../server/api/uri/UriResourceNavigation.java | 51 - .../server/api/uri/UriResourcePartTyped.java | 43 - .../api/uri/UriResourcePrimitiveProperty.java | 27 - .../server/api/uri/UriResourceProperty.java | 33 - .../olingo/server/api/uri/UriResourceRef.java | 27 - .../olingo/server/api/uri/UriResourceRoot.java | 28 - .../server/api/uri/UriResourceSingleton.java | 45 - .../olingo/server/api/uri/UriResourceValue.java | 27 - .../api/uri/queryoption/AliasQueryOption.java | 35 - .../server/api/uri/queryoption/CountOption.java | 33 - .../api/uri/queryoption/CustomQueryOption.java | 28 - .../uri/queryoption/ExceptionVisitExpand.java | 25 - .../server/api/uri/queryoption/ExpandItem.java | 98 - .../api/uri/queryoption/ExpandOption.java | 34 - .../api/uri/queryoption/FilterOption.java | 33 - .../api/uri/queryoption/FormatOption.java | 29 - .../server/api/uri/queryoption/IdOption.java | 32 - .../api/uri/queryoption/LevelsExpandOption.java | 37 - .../server/api/uri/queryoption/OrderByItem.java | 40 - .../api/uri/queryoption/OrderByOption.java | 34 - .../server/api/uri/queryoption/QueryOption.java | 36 - .../api/uri/queryoption/SearchOption.java | 34 - .../server/api/uri/queryoption/SelectItem.java | 57 - .../api/uri/queryoption/SelectOption.java | 34 - .../server/api/uri/queryoption/SkipOption.java | 32 - .../api/uri/queryoption/SkipTokenOption.java | 32 - .../api/uri/queryoption/SystemQueryOption.java | 30 - .../uri/queryoption/SystemQueryOptionKind.java | 97 - .../server/api/uri/queryoption/TopOption.java | 32 - .../api/uri/queryoption/expression/Alias.java | 34 - .../api/uri/queryoption/expression/Binary.java | 45 - .../expression/BinaryOperatorKind.java | 129 - .../uri/queryoption/expression/Enumeration.java | 43 - .../uri/queryoption/expression/Expression.java | 26 - .../expression/ExpressionVisitException.java | 28 - .../expression/ExpressionVisitor.java | 137 - .../uri/queryoption/expression/LambdaRef.java | 31 - .../api/uri/queryoption/expression/Literal.java | 38 - .../api/uri/queryoption/expression/Member.java | 51 - .../api/uri/queryoption/expression/Method.java | 39 - .../uri/queryoption/expression/MethodKind.java | 90 - .../uri/queryoption/expression/TypeLiteral.java | 33 - .../api/uri/queryoption/expression/Unary.java | 40 - .../expression/UnaryOperatorKind.java | 69 - .../expression/VisitableExpression.java | 50 - .../uri/queryoption/search/SearchBinary.java | 29 - .../search/SearchBinaryOperatorKind.java | 45 - .../queryoption/search/SearchExpression.java | 23 - .../api/uri/queryoption/search/SearchTerm.java | 25 - .../api/uri/queryoption/search/SearchUnary.java | 25 - .../search/SearchUnaryOperatorKind.java | 43 - .../olingo/server/api/ODataRequestTest.java | 70 - .../server/api/TranslatedExceptionsTest.java | 159 - .../src/test/resources/i18n.properties | 21 - .../src/test/resources/i18n_de.properties | 20 - .../src/test/resources/i18n_en.properties | 23 - lib/server-core/pom.xml | 120 - .../olingo/server/core/uri/antlr/UriLexer.g4 | 409 -- .../olingo/server/core/uri/antlr/UriParser.g4 | 439 -- .../olingo/server/core/ContentNegotiator.java | 167 - .../server/core/ContentNegotiatorException.java | 57 - .../server/core/DefaultRedirectProcessor.java | 49 - .../server/core/ODataExceptionHelper.java | 136 - .../apache/olingo/server/core/ODataHandler.java | 699 --- .../server/core/ODataHandlerException.java | 51 - .../server/core/ODataHttpHandlerImpl.java | 245 - .../apache/olingo/server/core/ODataImpl.java | 109 - .../olingo/server/core/RedirectProcessor.java | 29 - .../olingo/server/core/ServiceMetadataImpl.java | 60 - .../core/batchhandler/BatchFascadeImpl.java | 53 - .../server/core/batchhandler/BatchHandler.java | 70 - .../core/batchhandler/BatchPartHandler.java | 87 - .../BatchReferenceRewriter.java | 109 - .../FixedFormatDeserializerImpl.java | 60 - .../core/deserializer/batch/BatchBodyPart.java | 139 - .../deserializer/batch/BatchChangeSetPart.java | 55 - .../core/deserializer/batch/BatchParser.java | 82 - .../deserializer/batch/BatchParserCommon.java | 229 - .../core/deserializer/batch/BatchPart.java | 25 - .../deserializer/batch/BatchQueryOperation.java | 82 - .../batch/BatchRequestTransformator.java | 184 - .../batch/BatchTransformatorCommon.java | 93 - .../BufferedReaderIncludingLineEndings.java | 233 - .../server/core/deserializer/batch/Header.java | 181 - .../core/deserializer/batch/HeaderField.java | 121 - .../batch/HttpRequestStatusLine.java | 194 - .../server/core/deserializer/batch/Line.java | 72 - .../json/ODataJsonDeserializer.java | 616 --- .../server/core/edm/provider/EdmActionImpl.java | 36 - .../core/edm/provider/EdmActionImportImpl.java | 47 - .../core/edm/provider/EdmBindingTargetImpl.java | 62 - .../core/edm/provider/EdmComplexTypeImpl.java | 81 - .../edm/provider/EdmEntityContainerImpl.java | 210 - .../core/edm/provider/EdmEntitySetImpl.java | 60 - .../core/edm/provider/EdmEntityTypeImpl.java | 112 - .../core/edm/provider/EdmEnumTypeImpl.java | 72 - .../core/edm/provider/EdmFunctionImpl.java | 56 - .../edm/provider/EdmFunctionImportImpl.java | 71 - .../edm/provider/EdmKeyPropertyRefImpl.java | 48 - .../server/core/edm/provider/EdmMemberImpl.java | 47 - .../edm/provider/EdmNavigationPropertyImpl.java | 119 - .../core/edm/provider/EdmOperationImpl.java | 100 - .../edm/provider/EdmOperationImportImpl.java | 48 - .../core/edm/provider/EdmParameterImpl.java | 86 - .../core/edm/provider/EdmPropertyImpl.java | 120 - .../core/edm/provider/EdmProviderImpl.java | 346 -- .../provider/EdmReferentialConstraintImpl.java | 44 - .../core/edm/provider/EdmReturnTypeImpl.java | 64 - .../server/core/edm/provider/EdmSchemaImpl.java | 174 - .../core/edm/provider/EdmSingletonImpl.java | 52 - .../provider/EdmStructuredTypeHelperImpl.java | 89 - .../edm/provider/EdmTypeDefinitionImpl.java | 97 - .../serializer/BatchResponseSerializer.java | 184 - .../serializer/FixedFormatSerializerImpl.java | 71 - .../serializer/json/ODataErrorSerializer.java | 77 - .../serializer/json/ODataJsonSerializer.java | 560 -- .../json/ServiceDocumentJsonSerializer.java | 108 - .../serializer/utils/CircleStreamBuffer.java | 327 -- .../serializer/utils/ContextURLBuilder.java | 78 - .../core/serializer/utils/ContextURLHelper.java | 168 - .../serializer/utils/ExpandSelectHelper.java | 155 - .../xml/MetadataDocumentXmlSerializer.java | 645 --- .../serializer/xml/ODataXmlSerializerImpl.java | 137 - .../olingo/server/core/uri/UriHelperImpl.java | 84 - .../olingo/server/core/uri/UriInfoImpl.java | 300 - .../server/core/uri/UriParameterImpl.java | 82 - .../server/core/uri/UriResourceActionImpl.java | 77 - .../uri/UriResourceComplexPropertyImpl.java | 70 - .../server/core/uri/UriResourceCountImpl.java | 35 - .../core/uri/UriResourceEntitySetImpl.java | 66 - .../core/uri/UriResourceFunctionImpl.java | 111 - .../olingo/server/core/uri/UriResourceImpl.java | 39 - .../server/core/uri/UriResourceItImpl.java | 65 - .../core/uri/UriResourceLambdaAllImpl.java | 81 - .../core/uri/UriResourceLambdaAnyImpl.java | 78 - .../core/uri/UriResourceLambdaVarImpl.java | 70 - .../uri/UriResourceNavigationPropertyImpl.java | 63 - .../uri/UriResourcePrimitivePropertyImpl.java | 59 - .../server/core/uri/UriResourceRefImpl.java | 36 - .../server/core/uri/UriResourceRootImpl.java | 62 - .../core/uri/UriResourceSingletonImpl.java | 71 - .../uri/UriResourceStartingTypeFilterImpl.java | 66 - .../server/core/uri/UriResourceTypedImpl.java | 60 - .../server/core/uri/UriResourceValueImpl.java | 36 - .../core/uri/UriResourceWithKeysImpl.java | 101 - .../uri/parser/CheckFullContextListener.java | 60 - .../olingo/server/core/uri/parser/Parser.java | 487 -- .../olingo/server/core/uri/parser/RawUri.java | 46 - .../server/core/uri/parser/UriContext.java | 97 - .../server/core/uri/parser/UriDecoder.java | 120 - .../core/uri/parser/UriParseTreeVisitor.java | 2204 -------- .../core/uri/parser/UriParserException.java | 40 - .../uri/parser/UriParserSemanticException.java | 71 - .../uri/parser/UriParserSyntaxException.java | 49 - .../uri/queryoption/AliasQueryOptionImpl.java | 38 - .../core/uri/queryoption/CountOptionImpl.java | 42 - .../uri/queryoption/CustomQueryOptionImpl.java | 25 - .../core/uri/queryoption/ExpandItemImpl.java | 173 - .../core/uri/queryoption/ExpandOptionImpl.java | 49 - .../core/uri/queryoption/FilterOptionImpl.java | 43 - .../core/uri/queryoption/FormatOptionImpl.java | 41 - .../core/uri/queryoption/IdOptionImpl.java | 40 - .../core/uri/queryoption/LevelsOptionImpl.java | 53 - .../core/uri/queryoption/OrderByItemImpl.java | 49 - .../core/uri/queryoption/OrderByOptionImpl.java | 50 - .../core/uri/queryoption/QueryOptionImpl.java | 47 - .../core/uri/queryoption/SearchOptionImpl.java | 37 - .../core/uri/queryoption/SelectItemImpl.java | 84 - .../core/uri/queryoption/SelectOptionImpl.java | 50 - .../core/uri/queryoption/SkipOptionImpl.java | 41 - .../uri/queryoption/SkipTokenOptionImpl.java | 41 - .../uri/queryoption/SystemQueryOptionImpl.java | 42 - .../core/uri/queryoption/TopOptionImpl.java | 41 - .../uri/queryoption/expression/AliasImpl.java | 44 - .../uri/queryoption/expression/BinaryImpl.java | 70 - .../queryoption/expression/EnumerationImpl.java | 60 - .../queryoption/expression/ExpressionImpl.java | 25 - .../queryoption/expression/LambdaRefImpl.java | 45 - .../uri/queryoption/expression/LiteralImpl.java | 57 - .../uri/queryoption/expression/MemberImpl.java | 98 - .../uri/queryoption/expression/MethodImpl.java | 69 - .../queryoption/expression/TypeLiteralImpl.java | 46 - .../uri/queryoption/expression/UnaryImpl.java | 57 - .../uri/validator/UriValidationException.java | 76 - .../server/core/uri/validator/UriValidator.java | 694 --- .../server-core-exceptions-i18n.properties | 140 - .../server/core/ContentNegotiatorTest.java | 212 - .../server/core/ODataHttpHandlerImplTest.java | 169 - .../core/TranslatedExceptionSubclassesTest.java | 103 - .../batchhandler/MockedBatchHandlerTest.java | 670 --- .../FixedFormatDeserializerTest.java | 53 - .../batch/BatchParserCommonTest.java | 229 - .../batch/BatchRequestParserTest.java | 1291 ----- .../BufferedReaderIncludingLineEndingsTest.java | 481 -- .../core/deserializer/batch/HeaderTest.java | 171 - .../batch/HttpRequestStatusLineTest.java | 108 - .../json/ODataJsonDeserializerBasicTest.java | 44 - .../core/edm/provider/EdmActionImplTest.java | 156 - .../edm/provider/EdmActionImportImplTest.java | 103 - .../edm/provider/EdmComplexTypeImplTest.java | 166 - .../provider/EdmEntityContainerImplTest.java | 339 -- .../core/edm/provider/EdmEntitySetImplTest.java | 81 - .../edm/provider/EdmEntityTypeImplTest.java | 383 -- .../server/core/edm/provider/EdmEnumTest.java | 236 - .../core/edm/provider/EdmFunctionImplTest.java | 75 - .../edm/provider/EdmFunctionImportImplTest.java | 85 - .../edm/provider/EdmKeyPropertyRefImplTest.java | 142 - .../core/edm/provider/EdmMemberImplTest.java | 39 - .../core/edm/provider/EdmNamedImplTest.java | 42 - .../provider/EdmNavigationPropertyImplTest.java | 144 - .../core/edm/provider/EdmParameterImplTest.java | 140 - .../core/edm/provider/EdmPropertyImplTest.java | 155 - .../EdmProviderImplOverloadingTest.java | 198 - .../core/edm/provider/EdmProviderImplTest.java | 224 - .../edm/provider/EdmReturnTypeImplTest.java | 130 - .../core/edm/provider/EdmSchemaImplTest.java | 357 -- .../core/edm/provider/EdmSingletonImplTest.java | 129 - .../edm/provider/EdmTypeDefinitionImplTest.java | 75 - .../core/edm/provider/EdmTypeImplTest.java | 45 - .../serializer/BatchResponseSerializerTest.java | 227 - .../serializer/FixedFormatSerializerTest.java | 57 - .../core/serializer/json/ComplexTypeHelper.java | 66 - .../json/ODataErrorSerializerTest.java | 136 - .../json/ODataJsonSerializerTest.java | 71 - .../serializer/utils/ContextURLBuilderTest.java | 201 - .../xml/MetadataDocumentXmlSerializerTest.java | 501 -- .../src/test/resources/batchLarge.batch | 2422 -------- .../src/test/resources/batchWithContent.batch | 1 - .../src/test/resources/batchWithPost.batch | 39 - .../src/test/resources/simplelogger.properties | 20 - lib/server-tecsvc/pom.xml | 159 - .../olingo/server/tecsvc/TechnicalServlet.java | 78 - .../olingo/server/tecsvc/data/DataProvider.java | 610 -- .../processor/TechnicalBatchProcessor.java | 126 - .../processor/TechnicalEntityProcessor.java | 300 - .../TechnicalPrimitiveComplexProcessor.java | 366 -- .../tecsvc/processor/TechnicalProcessor.java | 83 - .../server/tecsvc/provider/ActionProvider.java | 204 - .../tecsvc/provider/ComplexTypeProvider.java | 179 - .../tecsvc/provider/ContainerProvider.java | 464 -- .../server/tecsvc/provider/EdmTechProvider.java | 155 - .../tecsvc/provider/EntityTypeProvider.java | 441 -- .../tecsvc/provider/EnumTypeProvider.java | 47 - .../tecsvc/provider/FunctionProvider.java | 852 --- .../tecsvc/provider/PropertyProvider.java | 707 --- .../server/tecsvc/provider/SchemaProvider.java | 185 - .../tecsvc/provider/TypeDefinitionProvider.java | 37 - .../src/main/resources/META-INF/LICENSE | 331 -- .../src/main/resources/simplelogger.properties | 20 - lib/server-tecsvc/src/main/version/version.html | 37 - .../src/main/webapp/WEB-INF/web.xml | 42 - .../src/main/webapp/css/olingo.css | 91 - .../src/main/webapp/img/OlingoOrangeTM.png | Bin 113360 -> 0 bytes lib/server-tecsvc/src/main/webapp/index.jsp | 55 - .../cs02/vocabularies/Org.OData.Core.V1.xml | 134 - .../server/tecsvc/data/DataProviderTest.java | 177 - lib/server-test/pom.xml | 100 - .../olingo/server/core/ODataHandlerTest.java | 700 --- .../json/AbstractODataDeserializerTest.java | 42 - .../json/ODataDeserializerDeepInsertTest.java | 172 - .../ODataDeserializerEntityCollectionTest.java | 251 - .../json/ODataJsonDeserializerEntityTest.java | 1365 ----- .../core/serializer/ExpandSelectMock.java | 90 - .../json/ODataJsonSerializerTest.java | 681 --- .../serializer/json/ServiceDocumentTest.java | 133 - .../serializer/utils/ContextURLHelperTest.java | 215 - .../serializer/xml/MetadataDocumentTest.java | 158 - .../olingo/server/core/uri/RawUriTest.java | 151 - .../olingo/server/core/uri/UriHelperTest.java | 82 - .../olingo/server/core/uri/UriInfoImplTest.java | 209 - .../server/core/uri/UriResourceImplTest.java | 508 -- .../core/uri/antlr/TestFullResourcePath.java | 5204 ------------------ .../olingo/server/core/uri/antlr/TestLexer.java | 253 - .../core/uri/antlr/TestUriParserImpl.java | 1170 ---- .../core/uri/queryoption/QueryOptionTest.java | 303 - .../queryoption/expression/ExpressionTest.java | 239 - .../core/uri/testutil/EdmTechTestProvider.java | 100 - .../core/uri/testutil/ExpandValidator.java | 231 - .../core/uri/testutil/FilterTreeToText.java | 154 - .../core/uri/testutil/FilterValidator.java | 529 -- .../core/uri/testutil/ParseTreeToText.java | 82 - .../core/uri/testutil/ParserValidator.java | 162 - .../core/uri/testutil/ParserWithLogging.java | 56 - .../core/uri/testutil/ResourceValidator.java | 612 -- .../core/uri/testutil/TestErrorLogger.java | 105 - .../core/uri/testutil/TestUriValidator.java | 267 - .../server/core/uri/testutil/TestValidator.java | 23 - .../core/uri/testutil/TokenValidator.java | 194 - .../core/uri/testutil/UriLexerWithTrace.java | 85 - .../core/uri/validator/UriValidatorTest.java | 390 -- .../src/test/resources/ESAllPrim.json | 56 - .../ESAllPrimWithCustomAnnotations.json | 57 - .../test/resources/ESAllPrimWithDoubleKey.json | 57 - .../ESAllPrimWithODataAnnotations.json | 59 - .../src/test/resources/ESCompCollComp.json | 35 - ...AllPrimExpandedNavPropertyETTwoPrimMany.json | 24 - ...pertyETTwoPrimManyWithCustomAnnotations.json | 25 - ...opertyETTwoPrimManyWithODataAnnotations.json | 27 - ...SAllPrimExpandedNavPropertyETTwoPrimOne.json | 23 - ...opertyETTwoPrimOneWithCustomAnnotations.json | 24 - ...ropertyETTwoPrimOneWithODataAnnotations.json | 26 - .../resources/EntityETMixEnumDefCollComp.json | 24 - .../src/test/resources/simplelogger.properties | 20 - pom.xml | 4 +- samples/client/pom.xml | 2 +- samples/pom.xml | 6 +- samples/server/pom.xml | 76 - .../olingo/server/sample/CarsServlet.java | 67 - .../olingo/server/sample/data/DataProvider.java | 167 - .../sample/edmprovider/CarsEdmProvider.java | 183 - .../server/sample/processor/CarsProcessor.java | 353 -- .../server/src/main/resources/META-INF/LICENSE | 331 -- .../src/main/resources/simplelogger.properties | 20 - samples/server/src/main/version/version.html | 37 - samples/server/src/main/webapp/WEB-INF/web.xml | 42 - samples/server/src/main/webapp/css/olingo.css | 91 - .../src/main/webapp/img/OlingoOrangeTM.png | Bin 113360 -> 0 bytes samples/server/src/main/webapp/index.jsp | 56 - 460 files changed, 331 insertions(+), 61670 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/dist/android-lib/pom.xml ---------------------------------------------------------------------- diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml index 35fa368..423992c 100644 --- a/dist/android-lib/pom.xml +++ b/dist/android-lib/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-dist</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/dist/client-lib/pom.xml ---------------------------------------------------------------------- diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml index 2f119a1..8611aa9 100644 --- a/dist/client-lib/pom.xml +++ b/dist/client-lib/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-dist</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/dist/javadoc/pom.xml ---------------------------------------------------------------------- diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml index 71d6636..be92e78 100644 --- a/dist/javadoc/pom.xml +++ b/dist/javadoc/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-dist</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/dist/pom.xml ---------------------------------------------------------------------- diff --git a/dist/pom.xml b/dist/pom.xml index 727f493..20975e7 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -31,14 +31,13 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-parent</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <modules> <module>android-lib</module> <module>client-lib</module> - <module>server-lib</module> <module>javadoc</module> </modules> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/dist/server-lib/pom.xml ---------------------------------------------------------------------- diff --git a/dist/server-lib/pom.xml b/dist/server-lib/pom.xml deleted file mode 100644 index d0ebcb5..0000000 --- a/dist/server-lib/pom.xml +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <artifactId>odata-dist-server-lib</artifactId> - <packaging>pom</packaging> - - <name>Olingo-OData-Server-for-Java</name> - - <parent> - <groupId>org.apache.olingo</groupId> - <artifactId>odata-dist</artifactId> - <version>4.0.0-beta-02</version> - <relativePath>..</relativePath> - </parent> - - <build> - <finalName>${project.name}-${project.version}</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - - </build> - - <profiles> - <profile> - <id>apache-release</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>package-assemblies</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <attach>true</attach> - <appendAssemblyId>true</appendAssemblyId> - <descriptors> - <descriptor> - src/main/assembly/lib-assembly.xml - </descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>org.apache.olingo</groupId> - <artifactId>odata-commons-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.olingo</groupId> - <artifactId>odata-commons-core</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.olingo</groupId> - <artifactId>odata-server-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.olingo</groupId> - <artifactId>odata-server-core</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/dist/server-lib/src/main/assembly/lib-assembly.xml ---------------------------------------------------------------------- diff --git a/dist/server-lib/src/main/assembly/lib-assembly.xml b/dist/server-lib/src/main/assembly/lib-assembly.xml deleted file mode 100644 index 5de2340..0000000 --- a/dist/server-lib/src/main/assembly/lib-assembly.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under - the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may - obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to - in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF - ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under - the License. --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>lib</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <outputDirectory></outputDirectory> - <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> - <unpack>false</unpack> - <useTransitiveDependencies>true</useTransitiveDependencies> - <useTransitiveFiltering>true</useTransitiveFiltering> - <scope>compile</scope> - <includes> - <include>org.apache.olingo:odata-commons-api</include> - <include>org.apache.olingo:odata-commons-core</include> - <include>org.apache.olingo:odata-server-api</include> - <include>org.apache.olingo:odata-server-core</include> - </includes> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory> - <outputDirectory>/</outputDirectory> - <excludes> - <exclude>LICENSE</exclude> - <exclude>NOTICE</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/dist/server-lib/src/main/resources/LICENSE ---------------------------------------------------------------------- diff --git a/dist/server-lib/src/main/resources/LICENSE b/dist/server-lib/src/main/resources/LICENSE deleted file mode 100644 index 2ba3137..0000000 --- a/dist/server-lib/src/main/resources/LICENSE +++ /dev/null @@ -1,337 +0,0 @@ -licenses for server distribution - - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - - -From: 'abego Software GmbH, Germany' (http://abego-software.de) - abego -TreeLayout Core (http://code.google.com/p/treelayout/) -org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1 License: BSD 3-Clause -"New" or "Revised" License (BSD-3-Clause) -(http://treelayout.googlecode.com/files/LICENSE.TXT) - -[The "BSD license"] -Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -3. Neither the name of the abego Software GmbH nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - - - -From: 'ANTLR' (http://www.antlr.org) - ANTLR 4 Runtime -(http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:jar:4.1 License: -The BSD License (http://www.antlr.org/license.html) - -[The BSD License] -Copyright (c) 2012 Terence Parr and Sam Harwell -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. Redistributions in binary - form must reproduce the above copyright notice, this list of conditions and - the following disclaimer in the documentation and/or other materials - provided with the distribution. Neither the name of the author nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -From: 'fasterxml.com' (http://fasterxml.com) - Stax2 API -(http://wiki.fasterxml.com/WoodstoxStax2) -org.codehaus.woodstox:stax2-api:bundle:3.1.4 License: The BSD License -(http://www.opensource.org/licenses/bsd-license.php) - -Copyright (c) 2004-2010, Woodstox Project (http://woodstox.codehaus.org/) -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -3. Neither the name of the Woodstox XML Processor nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - -From: 'QOS.ch' (http://www.qos.ch) - - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.7 - License: MIT License (http://www.opensource.org/licenses/mit-license.php) - - SLF4J Simple Binding (http://www.slf4j.org) org.slf4j:slf4j-simple:jar:1.7.7 - License: MIT License (http://www.opensource.org/licenses/mit-license.php) - - -Copyright (c) 2004-2013 QOS.ch - -All rights reserved. Permission is hereby granted, free of charge, to any -person obtaining a copy of this software and associated documentation files -(the "Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, distribute, -sublicense, and/or sell copies of the Software, and to permit persons to whom -the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - - - http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/dist/server-lib/src/main/resources/NOTICE ---------------------------------------------------------------------- diff --git a/dist/server-lib/src/main/resources/NOTICE b/dist/server-lib/src/main/resources/NOTICE deleted file mode 100644 index 32a4536..0000000 --- a/dist/server-lib/src/main/resources/NOTICE +++ /dev/null @@ -1,62 +0,0 @@ -Apache Olingo -Copyright 2013-2014 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This distribution includes the Jackson JSON processor -Jackson is a high-performance, Free/Open Source JSON processing library. -It was originally written by Tatu Saloranta ([email protected]), and has -been in development since 2007. -It is currently developed by a community of developers, as well as supported -commercially by FasterXML.com. -## Licensing -Jackson core and extension components may licensed under different licenses. -To find the details that apply to this artifact see the accompanying LICENSE file. -For more information, including possible other licensing options, contact -FasterXML.com (http://fasterxml.com). -## Credits -A list of contributors may be found from CREDITS file, which is included -in some artifacts (usually source distributions); but is always available -from the source code management (SCM) system project uses. - -This distribution includes SLF4J -Copyright (c) 2004-2013 QOS.ch - All rights reserved. - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions. - http://slf4j.org/license.html - -This distribution includes TreeLayout Core (http://code.google.com/p/treelayout/) -Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -3. Neither the name of the abego Software GmbH nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. -(http://treelayout.googlecode.com/files/LICENSE.TXT) - -This distribution includes ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) -Copyright (c) 2012 Terence Parr and Sam Harwell -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. -Neither the name of the author nor the names of its contributors may be used to -endorse or promote products derived from this software without specific prior written permission. -(http://www.antlr.org/license.html) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/ext/client-android/pom.xml ---------------------------------------------------------------------- diff --git a/ext/client-android/pom.xml b/ext/client-android/pom.xml index a274bfd..76ddf5f 100644 --- a/ext/client-android/pom.xml +++ b/ext/client-android/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-ext</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/ext/client-proxy/pom.xml ---------------------------------------------------------------------- diff --git a/ext/client-proxy/pom.xml b/ext/client-proxy/pom.xml index 4a06c35..6b831ae 100644 --- a/ext/client-proxy/pom.xml +++ b/ext/client-proxy/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-ext</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/ext/pojogen-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pojogen-maven-plugin/pom.xml b/ext/pojogen-maven-plugin/pom.xml index e2bc8de..ad02c1b 100644 --- a/ext/pojogen-maven-plugin/pom.xml +++ b/ext/pojogen-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-ext</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml b/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml index 8955597..d2a988c 100644 --- a/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml +++ b/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml index b5441e9..0fcb69a 100644 --- a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml +++ b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml b/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml index 14a2f07..156168a 100644 --- a/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml +++ b/ext/pojogen-maven-plugin/src/it/v3Sample/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml b/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml index 8955597..d2a988c 100644 --- a/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml +++ b/ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/ext/pom.xml ---------------------------------------------------------------------- diff --git a/ext/pom.xml b/ext/pom.xml index d1e51ec..72c0d08 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-parent</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/fit/pom.xml ---------------------------------------------------------------------- diff --git a/fit/pom.xml b/fit/pom.xml index c606721..f558880 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>odata-parent</artifactId> - <version>4.0.0-beta-02</version> + <version>3.0.0-beta-01-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -125,7 +125,7 @@ <dependency> <groupId>org.apache.olingo</groupId> <artifactId>odata-server-tecsvc</artifactId> - <version>${project.version}</version> + <version>4.0.0-beta-02</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/fit/src/it/actionOverloadingV3/pom.xml ---------------------------------------------------------------------- diff --git a/fit/src/it/actionOverloadingV3/pom.xml b/fit/src/it/actionOverloadingV3/pom.xml index baaefd9..be62bd8 100644 --- a/fit/src/it/actionOverloadingV3/pom.xml +++ b/fit/src/it/actionOverloadingV3/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/fit/src/it/demoV4/pom.xml ---------------------------------------------------------------------- diff --git a/fit/src/it/demoV4/pom.xml b/fit/src/it/demoV4/pom.xml index 1b1b1c2..0cfa319 100644 --- a/fit/src/it/demoV4/pom.xml +++ b/fit/src/it/demoV4/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/fit/src/it/openTypeV3/pom.xml ---------------------------------------------------------------------- diff --git a/fit/src/it/openTypeV3/pom.xml b/fit/src/it/openTypeV3/pom.xml index a554c4e..75d49d5 100644 --- a/fit/src/it/openTypeV3/pom.xml +++ b/fit/src/it/openTypeV3/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/fit/src/it/openTypeV4/pom.xml ---------------------------------------------------------------------- diff --git a/fit/src/it/openTypeV4/pom.xml b/fit/src/it/openTypeV4/pom.xml index 151b5db..3ae5c84 100644 --- a/fit/src/it/openTypeV4/pom.xml +++ b/fit/src/it/openTypeV4/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/fit/src/it/primitiveKeysServiceV3/pom.xml ---------------------------------------------------------------------- diff --git a/fit/src/it/primitiveKeysServiceV3/pom.xml b/fit/src/it/primitiveKeysServiceV3/pom.xml index c5b4479..47df1d9 100644 --- a/fit/src/it/primitiveKeysServiceV3/pom.xml +++ b/fit/src/it/primitiveKeysServiceV3/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/fit/src/it/staticServiceV3/pom.xml ---------------------------------------------------------------------- diff --git a/fit/src/it/staticServiceV3/pom.xml b/fit/src/it/staticServiceV3/pom.xml index a95fe6b..528d94c 100644 --- a/fit/src/it/staticServiceV3/pom.xml +++ b/fit/src/it/staticServiceV3/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/fit/src/it/staticServiceV4/pom.xml ---------------------------------------------------------------------- diff --git a/fit/src/it/staticServiceV4/pom.xml b/fit/src/it/staticServiceV4/pom.xml index f18a5eb..424a17f 100644 --- a/fit/src/it/staticServiceV4/pom.xml +++ b/fit/src/it/staticServiceV4/pom.xml @@ -30,6 +30,8 @@ <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description> <properties> + <project.source>1.6</project.source> + <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -51,6 +53,18 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.plugin.version}</version> + <configuration> + <source>${project.source}</source> + <target>${project.source}</target> + <showWarnings>true</showWarnings> + <showDeprecation>true</showDeprecation> + <compilerArgument>-Xlint:unchecked</compilerArgument> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version>
