You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/10/21 23:45:28 UTC
[1/3] git commit: ISIS-437: updating restful objects viewer pom
parents...
Updated Branches:
refs/heads/prepare/isis-1.3.0-RC1 e82c8c3f0 -> a1b7b76d6
ISIS-437: updating restful objects viewer pom parents...
... to be isis-core-1.3.0.
Also:
- removing jaxrs/pom.xml (not a module)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/68a71a33
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/68a71a33
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/68a71a33
Branch: refs/heads/prepare/isis-1.3.0-RC1
Commit: 68a71a33cb681ff4c4ac9153af5895b5a3ac98a2
Parents: e82c8c3
Author: Dan Haywood <da...@apache.org>
Authored: Mon Oct 21 22:13:18 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Oct 21 22:15:53 2013 +0100
----------------------------------------------------------------------
component/viewer/restfulobjects/jaxrs/pom.xml | 85 ----------------------
component/viewer/restfulobjects/pom.xml | 2 +-
component/viewer/restfulobjects/tck/pom.xml | 2 +-
3 files changed, 2 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/68a71a33/component/viewer/restfulobjects/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/jaxrs/pom.xml b/component/viewer/restfulobjects/jaxrs/pom.xml
deleted file mode 100644
index e3b5e8d..0000000
--- a/component/viewer/restfulobjects/jaxrs/pom.xml
+++ /dev/null
@@ -1,85 +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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-viewer-restfulobjects-jaxrs</artifactId>
- <name>Isis RestfulObjects Viewer jax-rs Resources</name>
-
- <properties>
- <siteBaseDir>..</siteBaseDir>
- <relativeUrl>applib/</relativeUrl>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://isis.apache.org/${relativeUrl}</url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-restfulobjects-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-
- <repositories>
- <!-- The artifact in the maven repository has been moved and causes a build failure. Using this setting gets the artifact allowing the build to work. This fix should hopefully be temporary -->
- <repository>
- <id>java.net</id>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/68a71a33/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index 139879f..72d65c4 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/68a71a33/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 32e24bf..457c1b4 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
[2/3] git commit: [maven-release-plugin] prepare release
isis-viewer-restfulobjects-2.1.0
Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-viewer-restfulobjects-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/80617e28
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/80617e28
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/80617e28
Branch: refs/heads/prepare/isis-1.3.0-RC1
Commit: 80617e2837cde39cc0710cbd750d4f1a33ddc928
Parents: 68a71a3
Author: Dan Haywood <da...@apache.org>
Authored: Mon Oct 21 22:28:27 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Oct 21 22:28:27 2013 +0100
----------------------------------------------------------------------
component/viewer/restfulobjects/applib/pom.xml | 2 +-
component/viewer/restfulobjects/pom.xml | 18 +++++++++++-------
component/viewer/restfulobjects/rendering/pom.xml | 2 +-
component/viewer/restfulobjects/server/pom.xml | 2 +-
component/viewer/restfulobjects/tck/pom.xml | 8 ++++++--
5 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/80617e28/component/viewer/restfulobjects/applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/pom.xml b/component/viewer/restfulobjects/applib/pom.xml
index f613aed..9530344 100644
--- a/component/viewer/restfulobjects/applib/pom.xml
+++ b/component/viewer/restfulobjects/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/80617e28/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index 72d65c4..d622460 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<name>Isis RestfulObjects Viewer</name>
@@ -119,36 +119,36 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -172,4 +172,8 @@
<module>server</module>
<module>tck</module>
</modules>
+
+ <scm>
+ <tag>isis-viewer-restfulobjects-2.1.0</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/80617e28/component/viewer/restfulobjects/rendering/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/rendering/pom.xml b/component/viewer/restfulobjects/rendering/pom.xml
index 2afa4be..7d64d3d 100644
--- a/component/viewer/restfulobjects/rendering/pom.xml
+++ b/component/viewer/restfulobjects/rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/80617e28/component/viewer/restfulobjects/server/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/server/pom.xml b/component/viewer/restfulobjects/server/pom.xml
index c8fbca3..3a6eceb 100644
--- a/component/viewer/restfulobjects/server/pom.xml
+++ b/component/viewer/restfulobjects/server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>isis-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/80617e28/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 457c1b4..b5ae400 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-tck</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<name>Isis RestfulObjects Viewer TCK tests</name>
@@ -37,7 +37,7 @@
<properties>
<maven.test.skip>true</maven.test.skip>
- <isis-viewer-restfulobjects.version>2.1.0-SNAPSHOT</isis-viewer-restfulobjects.version>
+ <isis-viewer-restfulobjects.version>2.1.0</isis-viewer-restfulobjects.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>restfulobjects-tck/</relativeUrl>
@@ -124,4 +124,8 @@
</dependency>
</dependencies>
+
+ <scm>
+ <tag>isis-viewer-restfulobjects-2.1.0</tag>
+ </scm>
</project>
[3/3] git commit: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a1b7b76d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a1b7b76d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a1b7b76d
Branch: refs/heads/prepare/isis-1.3.0-RC1
Commit: a1b7b76d6400d1501415827479d7eb00368022b1
Parents: 80617e2
Author: Dan Haywood <da...@apache.org>
Authored: Mon Oct 21 22:28:35 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Oct 21 22:28:35 2013 +0100
----------------------------------------------------------------------
component/viewer/restfulobjects/applib/pom.xml | 2 +-
component/viewer/restfulobjects/pom.xml | 18 +++++++-----------
component/viewer/restfulobjects/rendering/pom.xml | 2 +-
component/viewer/restfulobjects/server/pom.xml | 2 +-
component/viewer/restfulobjects/tck/pom.xml | 8 ++------
5 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a1b7b76d/component/viewer/restfulobjects/applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/pom.xml b/component/viewer/restfulobjects/applib/pom.xml
index 9530344..b9528ec 100644
--- a/component/viewer/restfulobjects/applib/pom.xml
+++ b/component/viewer/restfulobjects/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a1b7b76d/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index d622460..14f5f79 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>Isis RestfulObjects Viewer</name>
@@ -119,36 +119,36 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-server</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-server</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -172,8 +172,4 @@
<module>server</module>
<module>tck</module>
</modules>
-
- <scm>
- <tag>isis-viewer-restfulobjects-2.1.0</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/a1b7b76d/component/viewer/restfulobjects/rendering/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/rendering/pom.xml b/component/viewer/restfulobjects/rendering/pom.xml
index 7d64d3d..205612d 100644
--- a/component/viewer/restfulobjects/rendering/pom.xml
+++ b/component/viewer/restfulobjects/rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a1b7b76d/component/viewer/restfulobjects/server/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/server/pom.xml b/component/viewer/restfulobjects/server/pom.xml
index 3a6eceb..c1d8c28 100644
--- a/component/viewer/restfulobjects/server/pom.xml
+++ b/component/viewer/restfulobjects/server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a1b7b76d/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index b5ae400..4811740 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-tck</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>Isis RestfulObjects Viewer TCK tests</name>
@@ -37,7 +37,7 @@
<properties>
<maven.test.skip>true</maven.test.skip>
- <isis-viewer-restfulobjects.version>2.1.0</isis-viewer-restfulobjects.version>
+ <isis-viewer-restfulobjects.version>2.2.0-SNAPSHOT</isis-viewer-restfulobjects.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>restfulobjects-tck/</relativeUrl>
@@ -124,8 +124,4 @@
</dependency>
</dependencies>
-
- <scm>
- <tag>isis-viewer-restfulobjects-2.1.0</tag>
- </scm>
</project>