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 2014/09/02 08:15:40 UTC
git commit: ISIS-872: Minor tidy up of pom descriptions.
Repository: isis
Updated Branches:
refs/heads/master ae9f791da -> 764f379b2
ISIS-872: Minor tidy up of pom descriptions.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/764f379b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/764f379b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/764f379b
Branch: refs/heads/master
Commit: 764f379b2ccd66220f7bcec83df57a92e5e5171b
Parents: ae9f791
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 2 07:04:04 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 2 07:14:21 2014 +0100
----------------------------------------------------------------------
core/objectstore-jdo-datanucleus/pom.xml | 2 +-
core/objectstore-jdo-metamodel/pom.xml | 2 +-
core/pom-jdo-enhance-all.xml | 130 -------------------
core/security-shiro/pom.xml | 2 +-
core/tck/tck-viewer-restfulobjects/pom.xml | 6 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
.../webapp/src/main/webapp/css/application.css | 1 -
9 files changed, 7 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/core/objectstore-jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-datanucleus/pom.xml b/core/objectstore-jdo-datanucleus/pom.xml
index 651a221..9dc8424 100644
--- a/core/objectstore-jdo-datanucleus/pom.xml
+++ b/core/objectstore-jdo-datanucleus/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>isis-core-objectstore-jdo-datanucleus</artifactId>
- <name>Isis JDO ObjectStore DataNucleus impl</name>
+ <name>Isis Core JDO ObjectStore DataNucleus impl</name>
<properties>
<siteBaseDir>..</siteBaseDir>
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/core/objectstore-jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-jdo-metamodel/pom.xml b/core/objectstore-jdo-metamodel/pom.xml
index 0654bd5..ef26089 100644
--- a/core/objectstore-jdo-metamodel/pom.xml
+++ b/core/objectstore-jdo-metamodel/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>isis-core-objectstore-jdo-metamodel</artifactId>
- <name>Isis JDO ObjectStore MetaModel Support</name>
+ <name>Isis Core JDO ObjectStore MetaModel Support</name>
<properties>
<siteBaseDir>..</siteBaseDir>
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/core/pom-jdo-enhance-all.xml
----------------------------------------------------------------------
diff --git a/core/pom-jdo-enhance-all.xml b/core/pom-jdo-enhance-all.xml
deleted file mode 100644
index a1713a7..0000000
--- a/core/pom-jdo-enhance-all.xml
+++ /dev/null
@@ -1,130 +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</groupId>
- <artifactId>apache</artifactId>
- <version>13</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-jdo-enhance-all</artifactId>
- <version>1.7.0-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <name>Apache Isis JDO Enhance All</name>
-
- <description>
- Utility to enhance all JDO projects with a single command:
-
- mvn -f pom-jdo-enhance-all.xml datanucleus:enhance -o
- </description>
-
- <properties>
- <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
- </properties>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>false</fork>
- <verbose>true</verbose>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.datanucleus
- </groupId>
- <artifactId>
- datanucleus-maven-plugin
- </artifactId>
- <versionRange>
- [3.2.0-release,)
- </versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>core</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>module-audit-jdo</module>
- <module>module-command-jdo</module>
- <module>module-publishing-jdo</module>
- <module>module-settings/impl-jdo</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index fa25297..19cbdf5 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -30,7 +30,7 @@
<artifactId>isis-core-security-shiro</artifactId>
<version>1.7.0-SNAPSHOT</version>
- <name>Isis Shiro Security</name>
+ <name>Isis Core Shiro Security</name>
<properties>
<siteBaseDir>..</siteBaseDir>
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/core/tck/tck-viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-viewer-restfulobjects/pom.xml b/core/tck/tck-viewer-restfulobjects/pom.xml
index 2023b3b..c0d0f65 100644
--- a/core/tck/tck-viewer-restfulobjects/pom.xml
+++ b/core/tck/tck-viewer-restfulobjects/pom.xml
@@ -28,7 +28,7 @@
<artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
- <name>Isis RestfulObjects Viewer TCK tests</name>
+ <name>Isis Core RestfulObjects Viewer TCK tests</name>
<packaging>war</packaging>
@@ -88,10 +88,6 @@
<!-- isis runtime -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index a8cd530..9a790c2 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <name>Isis RestfulObjects Viewer AppLib</name>
+ <name>Isis Core RestfulObjects Viewer AppLib</name>
<properties>
<siteBaseDir>..</siteBaseDir>
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 5b3449e..26898e3 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -28,7 +28,7 @@
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <name>Isis RestfulObjects Viewer Rendering</name>
+ <name>Isis Core RestfulObjects Viewer Rendering</name>
<properties>
<siteBaseDir>..</siteBaseDir>
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 3d20560..29014c6 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -28,7 +28,7 @@
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <name>Isis RestfulObjects Viewer Server</name>
+ <name>Isis Core RestfulObjects Viewer Server</name>
<properties>
<siteBaseDir>..</siteBaseDir>
http://git-wip-us.apache.org/repos/asf/isis/blob/764f379b/example/application/simpleapp/webapp/src/main/webapp/css/application.css
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/css/application.css b/example/application/simpleapp/webapp/src/main/webapp/css/application.css
index 74d58c4..8aac50a 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/css/application.css
+++ b/example/application/simpleapp/webapp/src/main/webapp/css/application.css
@@ -69,4 +69,3 @@ li.x-highlight a {
div.x-key span.scalarName {
color: red;
}
-}
\ No newline at end of file