compilation fix (cherry picked from commit 95a4175)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70abaa36 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70abaa36 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70abaa36 Branch: refs/heads/ignite-2407 Commit: 70abaa36ad4a801d00a8e5088dd803b3dc9dbf25 Parents: a8d16bd Author: Anton Vinogradov <a...@apache.org> Authored: Thu Mar 10 11:11:56 2016 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Thu Mar 10 12:03:09 2016 +0300 ---------------------------------------------------------------------- modules/web/ignite-weblogic-test/pom.xml | 74 +++++++------------- .../src/main/webapp/WEB-INF/web.xml | 17 ----- .../src/main/webapp/index.jsp | 17 ----- 3 files changed, 25 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/70abaa36/modules/web/ignite-weblogic-test/pom.xml ---------------------------------------------------------------------- diff --git a/modules/web/ignite-weblogic-test/pom.xml b/modules/web/ignite-weblogic-test/pom.xml index 4746f1f..622b798 100644 --- a/modules/web/ignite-weblogic-test/pom.xml +++ b/modules/web/ignite-weblogic-test/pom.xml @@ -1,38 +1,4 @@ <!-- - ~ 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. - --> - -<!-- - ~ 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. - --> - -<!-- 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. @@ -55,46 +21,56 @@ <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ignite</groupId> + + <parent> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-parent</artifactId> + <version>1</version> + <relativePath>../../../parent</relativePath> + </parent> + <artifactId>ignite-weblogic-test</artifactId> <packaging>war</packaging> - <version>1.0-SNAPSHOT</version> - <name>ignite-weblogic-test Maven Webapp</name> - <url>http://maven.apache.org</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> + <version>1.6.0-SNAPSHOT</version> + <url>http://ignite.apache.org</url> + <dependencies> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-web</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-log4j</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-spring</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> <finalName>ignite-weblogic-test</finalName> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/ignite/blob/70abaa36/modules/web/ignite-weblogic-test/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/modules/web/ignite-weblogic-test/src/main/webapp/WEB-INF/web.xml b/modules/web/ignite-weblogic-test/src/main/webapp/WEB-INF/web.xml index 054eab4..6fe7358 100644 --- a/modules/web/ignite-weblogic-test/src/main/webapp/WEB-INF/web.xml +++ b/modules/web/ignite-weblogic-test/src/main/webapp/WEB-INF/web.xml @@ -15,23 +15,6 @@ ~ limitations under the License. --> -<!-- - ~ 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. - --> - <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd" > http://git-wip-us.apache.org/repos/asf/ignite/blob/70abaa36/modules/web/ignite-weblogic-test/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/modules/web/ignite-weblogic-test/src/main/webapp/index.jsp b/modules/web/ignite-weblogic-test/src/main/webapp/index.jsp index 0cc090d..4ca0be1 100644 --- a/modules/web/ignite-weblogic-test/src/main/webapp/index.jsp +++ b/modules/web/ignite-weblogic-test/src/main/webapp/index.jsp @@ -15,23 +15,6 @@ ~ limitations under the License. --%> -<%-- - ~ 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. - --%> - <%@ page import="org.apache.ignite.Ignition" %> <%@ page import="java.util.UUID" %> <html>