This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 2afc76f Remove juneau-releng project.
2afc76f is described below
commit 2afc76ff546c4a946e9012ad6cfddc443f290912
Author: JamesBognar <[email protected]>
AuthorDate: Mon Dec 21 14:12:53 2020 -0500
Remove juneau-releng project.
---
.../juneau-distrib => juneau-all}/.gitignore | 0
{juneau-releng/juneau-all => juneau-all}/pom.xml | 4 +--
.../juneau-all => juneau-all}/src/assembly/all.xml | 0
.../main/ConfigurablePropertyCodeGenerator.java | 0
.../src/java/main/FieldSorter.java | 0
.../juneau-all => juneau-distrib}/.gitignore | 0
.../juneau-distrib => juneau-distrib}/pom.xml | 4 +--
.../src/assembly/bin.xml | 0
.../src/assembly/src.xml | 0
juneau-releng/.gitignore | 6 ----
juneau-releng/pom.xml | 36 ----------------------
pom.xml | 3 +-
12 files changed, 6 insertions(+), 47 deletions(-)
diff --git a/juneau-releng/juneau-distrib/.gitignore b/juneau-all/.gitignore
similarity index 100%
rename from juneau-releng/juneau-distrib/.gitignore
rename to juneau-all/.gitignore
diff --git a/juneau-releng/juneau-all/pom.xml b/juneau-all/pom.xml
similarity index 98%
rename from juneau-releng/juneau-all/pom.xml
rename to juneau-all/pom.xml
index 95be782..3c6139a 100644
--- a/juneau-releng/juneau-all/pom.xml
+++ b/juneau-all/pom.xml
@@ -19,12 +19,12 @@
<parent>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-releng</artifactId>
+ <artifactId>juneau</artifactId>
<version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>juneau-all</artifactId>
- <name>juneau/releng/all</name>
+ <name>juneau/all</name>
<description>Apache Juneau UberJar</description>
<packaging>jar</packaging>
diff --git a/juneau-releng/juneau-all/src/assembly/all.xml
b/juneau-all/src/assembly/all.xml
similarity index 100%
rename from juneau-releng/juneau-all/src/assembly/all.xml
rename to juneau-all/src/assembly/all.xml
diff --git
a/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
b/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
similarity index 100%
rename from
juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
rename to juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
diff --git a/juneau-releng/juneau-all/src/java/main/FieldSorter.java
b/juneau-all/src/java/main/FieldSorter.java
similarity index 100%
rename from juneau-releng/juneau-all/src/java/main/FieldSorter.java
rename to juneau-all/src/java/main/FieldSorter.java
diff --git a/juneau-releng/juneau-all/.gitignore b/juneau-distrib/.gitignore
similarity index 100%
rename from juneau-releng/juneau-all/.gitignore
rename to juneau-distrib/.gitignore
diff --git a/juneau-releng/juneau-distrib/pom.xml b/juneau-distrib/pom.xml
similarity index 99%
rename from juneau-releng/juneau-distrib/pom.xml
rename to juneau-distrib/pom.xml
index b968984..cd66921 100644
--- a/juneau-releng/juneau-distrib/pom.xml
+++ b/juneau-distrib/pom.xml
@@ -19,13 +19,13 @@
<parent>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-releng</artifactId>
+ <artifactId>juneau</artifactId>
<version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>juneau-distrib</artifactId>
<packaging>pom</packaging>
- <name>juneau/releng/distrib</name>
+ <name>juneau/distrib</name>
<description>Apache Juneau Distribution</description>
<build>
diff --git a/juneau-releng/juneau-distrib/src/assembly/bin.xml
b/juneau-distrib/src/assembly/bin.xml
similarity index 100%
rename from juneau-releng/juneau-distrib/src/assembly/bin.xml
rename to juneau-distrib/src/assembly/bin.xml
diff --git a/juneau-releng/juneau-distrib/src/assembly/src.xml
b/juneau-distrib/src/assembly/src.xml
similarity index 100%
rename from juneau-releng/juneau-distrib/src/assembly/src.xml
rename to juneau-distrib/src/assembly/src.xml
diff --git a/juneau-releng/.gitignore b/juneau-releng/.gitignore
deleted file mode 100644
index 34acf88..0000000
--- a/juneau-releng/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/target/
-**/.DS_Store
-.classpath
-.project
-/.settings/
-/bin/
diff --git a/juneau-releng/pom.xml b/juneau-releng/pom.xml
deleted file mode 100644
index f9de54b..0000000
--- a/juneau-releng/pom.xml
+++ /dev/null
@@ -1,36 +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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-releng</artifactId>
- <packaging>pom</packaging>
- <name>juneau/releng</name>
- <description>Apache Juneau Release Engineering Projects</description>
-
- <modules>
- <module>juneau-all</module>
- <module>juneau-distrib</module>
- </modules>
-
-</project>
diff --git a/pom.xml b/pom.xml
index da1f040..a16219e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,8 @@
<module>juneau-microservice</module>
<module>juneau-sc</module>
<module>juneau-examples</module>
- <module>juneau-releng</module>
+ <module>juneau-all</module>
+ <module>juneau-distrib</module>
</modules>
<distributionManagement>
