This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-apache-resources.git
The following commit(s) were added to refs/heads/master by this push:
new 4e904a7 [MASFRES-58] import apache-resource-bundles parent
4e904a7 is described below
commit 4e904a723cfa1ea0f7029e9f43766729a9bd78f4
Author: Hervé Boutemy <[email protected]>
AuthorDate: Sat Mar 11 16:50:44 2023 +0100
[MASFRES-58] import apache-resource-bundles parent
---
.../pom.xml | 1 -
apache-jar-resource-bundle/pom.xml | 1 -
apache-jar-txt-resource-bundle/pom.xml | 1 -
apache-license-header-resource-bundle/pom.xml | 1 -
apache-source-release-assembly-descriptor/pom.xml | 1 -
pom.xml | 47 +++++++++++++++-------
resources-bundles-sample/pom.xml | 10 ++---
.../main/java/org/apache/resources/sample/App.java | 11 ++---
8 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/apache-incubator-disclaimer-resource-bundle/pom.xml
b/apache-incubator-disclaimer-resource-bundle/pom.xml
index f69539c..36e9423 100644
--- a/apache-incubator-disclaimer-resource-bundle/pom.xml
+++ b/apache-incubator-disclaimer-resource-bundle/pom.xml
@@ -26,7 +26,6 @@
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-resource-bundles</artifactId>
<version>4</version>
- <relativePath>../apache-resource-bundles/pom.xml</relativePath>
</parent>
<artifactId>apache-incubator-disclaimer-resource-bundle</artifactId>
diff --git a/apache-jar-resource-bundle/pom.xml
b/apache-jar-resource-bundle/pom.xml
index ac8d751..35d79f6 100644
--- a/apache-jar-resource-bundle/pom.xml
+++ b/apache-jar-resource-bundle/pom.xml
@@ -26,7 +26,6 @@
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-resource-bundles</artifactId>
<version>4</version>
- <relativePath>../apache-resource-bundles/pom.xml</relativePath>
</parent>
<artifactId>apache-jar-resource-bundle</artifactId>
diff --git a/apache-jar-txt-resource-bundle/pom.xml
b/apache-jar-txt-resource-bundle/pom.xml
index fcacc8d..779301b 100644
--- a/apache-jar-txt-resource-bundle/pom.xml
+++ b/apache-jar-txt-resource-bundle/pom.xml
@@ -26,7 +26,6 @@
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-resource-bundles</artifactId>
<version>4</version>
- <relativePath>../apache-resource-bundles/pom.xml</relativePath>
</parent>
<artifactId>apache-jar-txt-resource-bundle</artifactId>
diff --git a/apache-license-header-resource-bundle/pom.xml
b/apache-license-header-resource-bundle/pom.xml
index 6c97876..2d16953 100644
--- a/apache-license-header-resource-bundle/pom.xml
+++ b/apache-license-header-resource-bundle/pom.xml
@@ -26,7 +26,6 @@
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-resource-bundles</artifactId>
<version>4</version>
- <relativePath>../apache-resource-bundles/pom.xml</relativePath>
</parent>
<artifactId>apache-license-header-resource-bundle</artifactId>
diff --git a/apache-source-release-assembly-descriptor/pom.xml
b/apache-source-release-assembly-descriptor/pom.xml
index fe070ff..18ef854 100644
--- a/apache-source-release-assembly-descriptor/pom.xml
+++ b/apache-source-release-assembly-descriptor/pom.xml
@@ -26,7 +26,6 @@ under the License.
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-resource-bundles</artifactId>
<version>5</version>
- <relativePath>../apache-resource-bundles/pom.xml</relativePath>
</parent>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
diff --git a/pom.xml b/pom.xml
index 692ec19..4f9e36d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,38 +23,55 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>24</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
+ <version>40-SNAPSHOT</version>
+ <relativePath>../maven/pom.xml</relativePath>
</parent>
<groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-resource-bundles-aggregator</artifactId>
- <version>1-SNAPSHOT</version>
+ <artifactId>apache-resource-bundles</artifactId>
<packaging>pom</packaging>
- <name>Apache Resource Bundles Aggregator</name>
- <inceptionYear>2012</inceptionYear>
+ <name>Apache Resource Bundles</name>
+ <inceptionYear>2006</inceptionYear>
<modules>
<module>apache-jar-resource-bundle</module>
<module>apache-jar-txt-resource-bundle</module>
<module>apache-license-header-resource-bundle</module>
- <module>apache-incubator-disclaimer-resource-bundle</module>
+ <module>apache-incubator-disclaimer-resource-bundle</module>
<module>apache-source-release-assembly-descriptor</module>
<module>resources-bundles-sample</module>
</modules>
+ <scm>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-apache-resources.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-apache-resources.git</developerConnection>
+ <tag>master</tag>
+
<url>https://github.com/apache/maven-apache-resources/tree/${project.scm.tag}</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/MASFRES</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>Jenkins</system>
+
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-project-resources/</url>
+ </ciManagement>
+
<build>
<plugins>
+ <!-- Turn this into a lifecycle -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <skip>true</skip>
- </configuration>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/resources-bundles-sample/pom.xml b/resources-bundles-sample/pom.xml
index 92dc9e4..c7994e1 100644
--- a/resources-bundles-sample/pom.xml
+++ b/resources-bundles-sample/pom.xml
@@ -17,15 +17,14 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<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
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-resource-bundles-aggregator</artifactId>
- <version>1-SNAPSHOT</version>
+ <artifactId>apache-resource-bundles</artifactId>
+ <version>40-SNAPSHOT</version>
</parent>
<groupId>org.apache.resources.sample</groupId>
@@ -40,6 +39,7 @@
<apache-incubator-disclaimer-resource-bundle-version>1.2-SNAPSHOT</apache-incubator-disclaimer-resource-bundle-version>
<apache-source-release-assembly-descriptor-version>1.0.7-SNAPSHOT</apache-source-release-assembly-descriptor-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
@@ -104,10 +104,10 @@
<executions>
<execution>
<id>source-release-assembly</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<!--
use this flag to generate source release assembly from the top
of a multi modules
diff --git
a/resources-bundles-sample/src/main/java/org/apache/resources/sample/App.java
b/resources-bundles-sample/src/main/java/org/apache/resources/sample/App.java
index f4d65ed..948e2c6 100644
---
a/resources-bundles-sample/src/main/java/org/apache/resources/sample/App.java
+++
b/resources-bundles-sample/src/main/java/org/apache/resources/sample/App.java
@@ -1,5 +1,3 @@
-package org.apache.resources.sample;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,15 +16,14 @@ package org.apache.resources.sample;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.resources.sample;
/**
* Hello world!
*
*/
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
+public class App {
+ public static void main(String[] args) {
+ System.out.println("Hello World!");
}
}
