You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/08/15 11:39:31 UTC
[cayenne] branch master updated: CAY-2753 Remove VPP support in the ant task
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 9ae9903f3 CAY-2753 Remove VPP support in the ant task
9ae9903f3 is described below
commit 9ae9903f3470e361a4654d0be06b1f9a4c974288
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Mon Aug 15 14:39:14 2022 +0300
CAY-2753 Remove VPP support in the ant task
---
RELEASE-NOTES.txt | 1 +
.../main/resources/META-INF/cayenne/LICENSE.txt.vm | 35 ----------------------
.../main/resources/META-INF/cayenne/NOTICE.txt.vm | 7 +----
cayenne-ant/pom.xml | 4 ---
.../apache/cayenne/tools/CayenneGeneratorTask.java | 27 +----------------
.../asciidoc/_cayenne-guide/part6/ant-tasks.adoc | 1 -
maven-plugins/cayenne-modeler-maven-plugin/pom.xml | 6 ----
pom.xml | 17 -----------
8 files changed, 3 insertions(+), 95 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 21a413d41..fc3bb27a9 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -21,6 +21,7 @@ CAY-2742 Switch minimum required Java version to 11
CAY-2747 Update project XML version to 11
CAY-2751 Simplify DataNode configuration
CAY-2752 Rename queryTemplate to dataMapTemplate in the cgen config
+CAY-2753 Remove VPP support in the ant task
Bug Fixes:
diff --git a/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt.vm b/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt.vm
index 4007b13c1..102b5c7f0 100644
--- a/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt.vm
+++ b/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/LICENSE.txt.vm
@@ -438,42 +438,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// DAMAGE.
=====================================================================
-VPP License
-Copyright (c) 2003, FoundryLogic, LLC
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the name of FoundryLogic, LLC nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This product includes software developed by the
-Apache Software Foundation (http://www.apache.org/).
-
-=====================================================================
jEdit Syntax License
The MIT License
diff --git a/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt.vm b/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt.vm
index af6a8a8ac..d3a56d3f4 100644
--- a/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt.vm
+++ b/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt.vm
@@ -1,5 +1,5 @@
Apache Cayenne
-Copyright 2001-2017 The Apache Software Foundation
+Copyright 2001-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -14,11 +14,6 @@ originally developed at The ObjectStyle Group and donated to the ASF by its auth
* This software includes Ashwood graph library developed by Andriy Shapochka.
(http://objectstyle.org/ashwood/)
-#if($binary == "true")
-
-* This software includes VPP library developed by FoundryLogic, LLC.
-(http://vpp.sourceforge.net/)
-#end
* This software includes concurrentlinkedhashmap library developed by Google Inc.
(http://code.google.com/p/concurrentlinkedhashmap/)
diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml
index f44ac436c..ce6f78340 100644
--- a/cayenne-ant/pom.xml
+++ b/cayenne-ant/pom.xml
@@ -50,10 +50,6 @@
<artifactId>cayenne-dbsync</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- </dependency>
<!-- Test Dependencies -->
<dependency>
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
index e720c66de..f9d316f18 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
@@ -20,7 +20,6 @@ package org.apache.cayenne.tools;
import java.io.File;
-import foundrylogic.vpp.VPPConfig;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.dbsync.filter.NamePatternMatcher;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
@@ -32,7 +31,6 @@ import org.apache.cayenne.gen.ClassGenerationActionFactory;
import org.apache.cayenne.map.DataMap;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.Path;
-import org.apache.velocity.VelocityContext;
import org.slf4j.LoggerFactory;
/**
@@ -50,7 +48,6 @@ public class CayenneGeneratorTask extends CayenneTask {
* @since 4.1
*/
protected String excludeEmbeddablesPattern;
- protected VPPConfig vppConfig;
protected File map;
protected File additionalMaps[];
@@ -95,11 +92,6 @@ public class CayenneGeneratorTask extends CayenneTask {
public CayenneGeneratorTask() {
}
- protected VelocityContext getVppContext() {
- initializeVppConfig();
- return vppConfig.getVelocityContext();
- }
-
/**
* Executes the task. It will be called by ant framework.
*/
@@ -250,7 +242,7 @@ public class CayenneGeneratorTask extends CayenneTask {
* @param additionalMapsPath The additional DataMaps to set
*/
public void setAdditionalMaps(Path additionalMapsPath) {
- String additionalMapFilenames[] = additionalMapsPath.list();
+ String[] additionalMapFilenames = additionalMapsPath.list();
this.additionalMaps = new File[additionalMapFilenames.length];
for (int i = 0; i < additionalMapFilenames.length; i++) {
@@ -398,22 +390,5 @@ public class CayenneGeneratorTask extends CayenneTask {
public void setExternaltoolconfig(String externaltoolconfig) {
this.externaltoolconfig = externaltoolconfig;
}
-
- /**
- * Provides a <code>VPPConfig</code> object to configure. (Written with createConfig()
- * instead of addConfig() to avoid run-time dependency on VPP).
- */
- public Object createConfig() {
- this.vppConfig = new VPPConfig();
- return this.vppConfig;
- }
- /**
- * If no VppConfig element specified, use the default one.
- */
- private void initializeVppConfig() {
- if (vppConfig == null) {
- vppConfig = VPPConfig.getDefaultConfig(getProject());
- }
- }
}
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc
index 94ad75260..a54209f02 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part6/ant-tasks.adoc
@@ -34,7 +34,6 @@ in the project, use the following Antlib:
<include name="commons-lang-*.jar" />
<include name="slf4j-api-*.jar" />
<include name="velocity-*.jar" />
- <include name="vpp-2.2.1.jar" />
</fileset>
</classpath>
</typedef>
diff --git a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
index c3c3cc5e8..4017ae9f3 100644
--- a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
+++ b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
@@ -55,12 +55,6 @@
<groupId>org.apache.cayenne.modeler</groupId>
<artifactId>cayenne-modeler</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4db0e91a0..0ed530f0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -364,11 +364,6 @@
<artifactId>velocity-tools-generic</artifactId>
<version>3.1</version>
</dependency>
- <dependency>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- <version>2.2.1</version>
- </dependency>
<dependency>
<groupId>jgraph</groupId>
<artifactId>jgraph</artifactId>
@@ -467,18 +462,6 @@
</dependencyManagement>
<repositories>
- <repository>
- <id>objectstyle</id>
- <name>ObjectStyle Repository</name>
- <url>https://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>