tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject incubator-tamaya git commit: Get Tamaya back to the compiling state.
Date Fri, 26 Dec 2014 15:57:18 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 95b54ec56 -> 702156cd9


Get Tamaya back to the compiling state.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/702156cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/702156cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/702156cd

Branch: refs/heads/master
Commit: 702156cd98fd32571b529888954c091f89292360
Parents: 95b54ec
Author: John D. Ament <johndament@apache.org>
Authored: Fri Dec 26 10:57:15 2014 -0500
Committer: John D. Ament <johndament@apache.org>
Committed: Fri Dec 26 10:57:15 2014 -0500

----------------------------------------------------------------------
 modules/integration/cdi/pom.xml        |  4 +-
 modules/integration/pom.xml            | 24 +++++++++-
 modules/integration/se/pom.xml         | 71 ++++++++++++++++++++++++++++
 modules/metamodels/environment/pom.xml | 73 +++++++++++++++++++++++++++++
 modules/pom.xml                        |  2 +-
 pom.xml                                |  6 ++-
 6 files changed, 173 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/modules/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/pom.xml b/modules/integration/cdi/pom.xml
index 8a8450b..1909bcc 100644
--- a/modules/integration/cdi/pom.xml
+++ b/modules/integration/cdi/pom.xml
@@ -21,8 +21,8 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>tamaya-ext-all</artifactId>
-        <groupId>org.apache.tamaya.ext</groupId>
+        <groupId>org.apache.tamaya.integration</groupId>
+        <artifactId>tamaya-integration-all</artifactId>
         <version>0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 95f2b07..33deee1 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -1,4 +1,22 @@
 <?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 current 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">
@@ -8,11 +26,13 @@
         <version>0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
+    <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>org.apache.tamaya.metamodels.environment</artifactId>
+    <groupId>org.apache.tamaya.integration</groupId>
+    <artifactId>tamaya-integration-all</artifactId>
 
     <modules>
+        <module>managed</module>
         <module>cdi</module>
         <module>se</module>
     </modules>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/modules/integration/se/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/se/pom.xml b/modules/integration/se/pom.xml
new file mode 100644
index 0000000..9958368
--- /dev/null
+++ b/modules/integration/se/pom.xml
@@ -0,0 +1,71 @@
+<!--
+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 current 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>
+
+    <parent>
+        <groupId>org.apache.tamaya.integration</groupId>
+        <artifactId>tamaya-integration-all</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>tamaya-integration-se</artifactId>
+    <name>Apache Tamaya Modules Integration - Java SE</name>
+    <packaging>jar</packaging>
+
+    <properties>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tamaya-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tamaya-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/modules/metamodels/environment/pom.xml
----------------------------------------------------------------------
diff --git a/modules/metamodels/environment/pom.xml b/modules/metamodels/environment/pom.xml
new file mode 100644
index 0000000..cf8fd91
--- /dev/null
+++ b/modules/metamodels/environment/pom.xml
@@ -0,0 +1,73 @@
+<!--
+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 current 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>
+
+    <parent>
+        <groupId>org.apache.tamaya.metamodels</groupId>
+        <artifactId>tamaya-metamodels-all</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>tamaya-metamodel-environment</artifactId>
+    <name>Apache Tamaya Modules Metamodels - environment</name>
+    <description>Environment Tamaya Metamodel</description>
+    <packaging>jar</packaging>
+
+    <properties>
+        <jdkVersion>1.8</jdkVersion>
+        <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
+        <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${maven.compile.sourceLevel}</source>
+                    <target>${maven.compile.targetLevel}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index 21b583d..e012023 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -54,7 +54,7 @@ under the License.
     <modules>
         <module>metamodels</module>
         <module>integration</module>
-        <module>environment</module>
+        <!-- <module>environment</module> -->
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/702156cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index da07666..329d20a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@ under the License.
         <maven.javadoc.skip>true</maven.javadoc.skip>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <rat.skip>true</rat.skip>
+        <rat.skip>false</rat.skip>
 		<junit.version>4.12</junit.version>
 
         <!-- Dependency and plugin relate version properties go here -->
@@ -217,7 +217,9 @@ under the License.
                     <version>${rat.version}</version>
                     <configuration>
                         <excludes>
-                            <exclude>**/target/**/*</exclude>
+                            <exclude>**/target</exclude>
+                            <exclude>*.iml</exclude>
+                            <exclude>**/.idea/**</exclude>
                         </excludes>
                     </configuration>
                     <executions>


Mime
View raw message